Merge '2.3.2+dfsg2-7' and the *buntu branch; identical to 2.3.2+dfsg2-7ubuntu1
authormirabilos <tg@debian.org>
Tue, 2 Jul 2019 19:56:01 +0000 (21:56 +0200)
committermirabilos <mirabilos@evolvis.org>
Tue, 2 Jul 2019 19:56:01 +0000 (21:56 +0200)
http://archive.ubuntu.com/ubuntu/pool/universe/m/musescore/musescore_2.3.2+dfsg2-7ubuntu1.dsc

1  2 
debian/changelog
debian/patches/ff014657939f30c0052a1d2d66d87d13833c5255.patch

@@@ -1,10 -1,9 +1,23 @@@
++musescore (2.3.2+dfsg2-7ubuntu1) eoan; urgency=low
++
++  * Merge from Debian unstable.  Remaining changes:
++    - debian/patches/ff014657939f30c0052a1d2d66d87d13833c5255.patch:
++
++ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 25 Jun 2019 09:36:32 +0200
++
+ musescore (2.3.2+dfsg2-7) unstable; urgency=high
+   * Disable webkit functionality (Closes: #931021)
+  -- Thorsten Glaser <tg@mirbsd.de>  Mon, 24 Jun 2019 18:07:46 +0200
 +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
index 6e076a4,0000000..d1bd20e
mode 100644,000000..100644
--- /dev/null
@@@ -1,48 -1,0 +1,45 @@@
- ## 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>