[SCM] musescore/master: Apply upstream patch to fix FTBFS on arm*
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Fri Oct 23 13:00:13 UTC 2015
The following commit has been merged in the master branch:
commit d208d28bbc8e938d9aa42deaeb09c8443647a753
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date: Fri Oct 23 12:37:07 2015 +0200
Apply upstream patch to fix FTBFS on arm*
Closes: #802705
diff --git a/debian/patches/03-fix-when-char-defaults-to-unsigned.patch b/debian/patches/03-fix-when-char-defaults-to-unsigned.patch
new file mode 100644
index 0000000..038f4d3
--- /dev/null
+++ b/debian/patches/03-fix-when-char-defaults-to-unsigned.patch
@@ -0,0 +1,41 @@
+Description: fix for arm, where char by default is unsigned
+Origin: upstream,
+ https://github.com/musescore/MuseScore/commit/78605d6aefe45f44
+Bug-Debian: https://bugs.debian.org/802705
+Last-Update: 2015-10-23
+
+diff --git a/libmscore/clef.h b/libmscore/clef.h
+index 2e0b157..00161fa 100644
+--- a/libmscore/clef.h
++++ b/libmscore/clef.h
+@@ -92,7 +92,7 @@ class ClefInfo {
+ int _line; ///< Line for musicXml.
+ int _octChng; ///< Octave change for musicXml.
+ int _pitchOffset; ///< Pitch offset for line 0.
+- char _lines[14];
++ signed char _lines[14];
+ const char* _name;
+ StaffGroup _staffGroup;
+
+@@ -102,7 +102,7 @@ class ClefInfo {
+ static int line(ClefType t) { return clefTable[int(t)]._line; }
+ static int octChng(ClefType t) { return clefTable[int(t)]._octChng; }
+ static int pitchOffset(ClefType t) { return clefTable[int(t)]._pitchOffset; }
+- static const char* lines(ClefType t) { return clefTable[int(t)]._lines; }
++ static const signed char* lines(ClefType t) { return clefTable[int(t)]._lines; }
+ static const char* name(ClefType t) { return clefTable[int(t)]._name; }
+ static StaffGroup staffGroup(ClefType t) { return clefTable[int(t)]._staffGroup; }
+ static ClefType tag2type(const QString&);
+diff --git a/libmscore/keysig.cpp b/libmscore/keysig.cpp
+index 3a51b03..778e95f 100644
+--- a/libmscore/keysig.cpp
++++ b/libmscore/keysig.cpp
+@@ -180,7 +180,7 @@ void KeySig::layout()
+ // naturals should go AFTER accidentals if they should not go before!
+ bool suffixNaturals = naturalsOn && !prefixNaturals;
+
+- const char* lines = ClefInfo::lines(clef);
++ const signed char* lines = ClefInfo::lines(clef);
+
+ // add prefixed naturals, if any
+
diff --git a/debian/patches/series b/debian/patches/series
index ffb4b0d..25c0c86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-do-not-install-manual-pdf.patch
02-do-not-update-mime-during-build.patch
+03-fix-when-char-defaults-to-unsigned.patch
--
musescore packaging
More information about the pkg-multimedia-commits
mailing list