- Add fix-build-qt512.patch to fix build with Qt 5.12

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=5

fix-build-qt512.patch

@@ -0,0 +1,48 @@
+From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Tue, 18 Sep 2018 14:42:43 +0200
+Subject: [PATCH] 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)
+---
+ mscore/editstringdata.cpp | 4 ++--
+ mscore/prefsdialog.ui     | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
+index 21a621bac0..a86207e5db 100644
+--- a/mscore/editstringdata.cpp
++++ b/mscore/editstringdata.cpp
+@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
+                   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 @@ void EditStringData::newStringClicked()
+             _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));
+diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
+index 5dd493fdc7..21af750846 100644
+--- a/mscore/prefsdialog.ui
++++ b/mscore/prefsdialog.ui
+@@ -4276,7 +4276,6 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
+    </item>
+   </layout>
+  </widget>
+- <pixmapfunction>getPixmap</pixmapfunction>
+  <customwidgets>
+   <customwidget>
+    <class>Awl::ColorLabel</class>

musescore.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 27 00:03:00 UTC 2018 - Cor Blom <cornelis@solcon.nl>
+
+- Add fix-build-qt512.patch to fix build with Qt 5.12
+
 -------------------------------------------------------------------
 Mon Oct  1 09:22:01 UTC 2018 - cornelis@solcon.nl
 

musescore.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -26,7 +26,10 @@ Name:           musescore
 Version:        2.3.2
 Release:        0
 Summary:        A WYSIWYG music score typesetter
-License:        GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT
+# Musescore code license is GPL-2.0
+# Software in thirdparty is licensed under their own license
+# Documentation is CC-SA
+License:        GPL-2.0-only AND AND GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND MIT
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 URL:            https://musescore.org
 Source0:        %{name}-%{version}.tar.gz
@@ -35,26 +38,28 @@ Source1:        %{rname}.desktop
 # which is not actually used.
 # See https://sourceforge.net/p/mscore/mailman/message/36429212/
 Patch0:         remove_diff_match_patch.diff
-BuildRequires:  gcc-c++
+# PATCH-FIX-UPSTREAM: fix build with Qt 5.12
-BuildRequires:  cmake >= 3.0
+Patch1:         fix-build-qt512.patch
 BuildRequires:  alsa-devel
+BuildRequires:  cmake >= 3.0
+BuildRequires:  gcc-c++
 BuildRequires:  jack-devel
+BuildRequires:  libQt5WebKitWidgets-devel
 BuildRequires:  libpulse-devel
+BuildRequires:  libqt5-linguist-devel
+BuildRequires:  libqt5-qtbase-devel
+BuildRequires:  libqt5-qtsvg-devel
+BuildRequires:  libqt5-qttools-devel
+BuildRequires:  libqt5-qtxmlpatterns-devel
 BuildRequires:  portaudio-devel
 BuildRequires:  portmidi-devel
-BuildRequires:  libqt5-qtbase-devel
-BuildRequires:  libqt5-qttools-devel
-BuildRequires:  libqt5-qtsvg-devel
-BuildRequires:  libqt5-qtxmlpatterns-devel
-BuildRequires:  libqt5-linguist-devel
-BuildRequires:  libQt5WebKitWidgets-devel
 #BuildRequires:  qtsingleapplication-devel
+BuildRequires:  fdupes
+BuildRequires:  freetype2-devel
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  libvorbis-devel
-BuildRequires:  freetype2-devel
-BuildRequires:  fdupes
-BuildRequires:  hicolor-icon-theme
 BuildRequires:  update-desktop-files
 Requires:       %{name}-fonts = %{version}-%{release}
 
@@ -75,6 +80,7 @@ Additional fonts for use by the MuseScore music notation program.
 %prep
 %setup -q -n MuseScore-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # remove precompiled binary
 rm thirdparty/rtf2html/rtf2html
@@ -95,7 +101,6 @@ mv -f tmpfile thirdparty/rtf2html/README.ru
 # remove executable bit
 chmod -x fonts/gootville/readme.txt
 
-
 %build
 %define __builddir build.release
 %cmake \
@@ -105,7 +110,6 @@ chmod -x fonts/gootville/readme.txt
 # Put the desktop file in place for the packaging
 cp %{SOURCE1} .
 
-
 %install
 %cmake_install