http://archive.ubuntu.com/ubuntu/pool/universe/m/musescore/musescore_2.3.2+dfsg2... 2.3.2+dfsg2-6ubuntu1
authormirabilos <tg@debian.org>
Fri, 3 May 2019 22:18:28 +0000 (00:18 +0200)
committermirabilos <mirabilos@evolvis.org>
Fri, 3 May 2019 22:18:28 +0000 (00:18 +0200)
debian/changelog
debian/patches/ff014657939f30c0052a1d2d66d87d13833c5255.patch [new file with mode: 0644]
debian/patches/series

index b89863a..5aec5c3 100644 (file)
@@ -1,3 +1,10 @@
+musescore (2.3.2+dfsg2-6ubuntu1) eoan; urgency=medium
+
+  * debian/patches/ff014657939f30c0052a1d2d66d87d13833c5255.patch:
+    - upstream build fix for new qt
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 May 2019 11:01:36 +0200
+
 musescore (2.3.2+dfsg2-6) unstable; urgency=medium
 
   * Workaround for DEPĀ 5 syntax in a complex case
diff --git a/debian/patches/ff014657939f30c0052a1d2d66d87d13833c5255.patch b/debian/patches/ff014657939f30c0052a1d2d66d87d13833c5255.patch
new file mode 100644 (file)
index 0000000..6e076a4
--- /dev/null
@@ -0,0 +1,48 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+commit ff014657939f30c0052a1d2d66d87d13833c5255
+Author: Joachim Schmitz <jojo@schmitz-digital.de>
+Date:   Tue Sep 18 14:42:43 2018 +0200
+
+    changes needed for MuseScore to build with Qt 5.12 (Alpha)
+    
+    One needed for MSVC only (and only since Alpha, not with the previous
+    preview), the other needed for MSVC and MinGW.
+    Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
+    prove)
+
+Index: musescore-2.3.2+dfsg2/mscore/editstringdata.cpp
+===================================================================
+--- musescore-2.3.2+dfsg2.orig/mscore/editstringdata.cpp
++++ musescore-2.3.2+dfsg2/mscore/editstringdata.cpp
+@@ -52,7 +52,7 @@
+                   strg = (*_strings)[numOfStrings - i - 1];
+                   _stringsLoc.append(strg);
+                   QTableWidgetItem *newCheck = new QTableWidgetItem();
+-                  newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++                  newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+                   newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+                   stringList->setItem(i, 0, newCheck);
+                   QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
+@@ -168,7 +168,7 @@
+             _stringsLoc.insert(i, strg);
+             stringList->insertRow(i);
+             QTableWidgetItem *newCheck = new QTableWidgetItem();
+-            newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++            newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+             newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+             stringList->setItem(i, 0, newCheck);
+             QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
+Index: musescore-2.3.2+dfsg2/mscore/prefsdialog.ui
+===================================================================
+--- musescore-2.3.2+dfsg2.orig/mscore/prefsdialog.ui
++++ musescore-2.3.2+dfsg2/mscore/prefsdialog.ui
+@@ -4214,7 +4214,6 @@
+    </item>
+   </layout>
+  </widget>
+- <pixmapfunction>getPixmap</pixmapfunction>
+  <customwidgets>
+   <customwidget>
+    <class>Awl::ColorLabel</class>
index b7fd6a1..2173c54 100644 (file)
@@ -11,3 +11,4 @@ experiments/lyrics-hyphen-max-8sp.diff
 experiments/mtest-fix-freetype-includes.diff
 experiments/new-manpage.diff
 #experiments/revert-restriking-patch.diff
+ff014657939f30c0052a1d2d66d87d13833c5255.patch