Accepting request 749298 from multimedia:apps

- Update to 3.3.2:
  * "Save online" failed in some cases
- Add patches to make qtwebengine work: use-qtmake-qt5.patch and
  use-system-qtwebengine-files.patch

OBS-URL: https://build.opensuse.org/request/show/749298
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/musescore?expand=0&rev=14

MuseScore-3.3.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb010f4e0657a1bc647587007dafe2d372ae0da1119f7208bf47b3b6f6d498e4
-size 62806745

MuseScore-3.3.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34c856a32ed1d2e725866e63fa0cedda033bfef0a915e2f0b0d83b63a79b2ee4
+size 62806003

correct-revision.patch

@@ -2,4 +2,4 @@
 +++ b/mscore/revision.h
 @@ -1 +1 @@
 -3543170
-+824af4c
++492d7ef

musescore.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov 15 11:27:34 UTC 2019 - Cor Blom <cornelis@solcon.nl>
+
+- Update to 3.3.2:
+  * "Save online" failed in some cases
+- Add patches to make qtwebengine work: use-qtmake-qt5.patch and
+  use-system-qtwebengine-files.patch
+
 -------------------------------------------------------------------
 Wed Nov 13 14:26:14 UTC 2019 - Cor Blom <cornelis@solcon.nl>
 

musescore.spec

@@ -21,7 +21,7 @@
 %define fontdir %{_datadir}/fonts/%{name}
 %define docdir  %{_docdir}/%{name}
 Name:           musescore
-Version:        3.3.1
+Version:        3.3.2
 Release:        0
 Summary:        A WYSIWYG music score typesetter
 # Musescore code license is GPL-2.0
@@ -34,6 +34,10 @@ Source0:        https://github.com/musescore/MuseScore/archive/v%{version}/MuseS
 Source1:        %{rname}.desktop
 # PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases
 Patch0:         correct-revision.patch
+# PATCH-FIX-OPENSUSE: really use qmake-qt5
+Patch1:         use-qtmake-qt5.patch
+# PATC-FIX-OPENSUSE: don't install qtwebengine files, they are not needed
+Patch2:         use-system-qtwebengine-files.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -58,9 +62,9 @@ BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5UiTools)
 # TODO: why does it fail with qtwebengine?
-#BuildRequires:  pkgconfig(Qt5WebEngine)
-#BuildRequires:  pkgconfig(Qt5WebEngineCore)
-#BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
+BuildRequires:  pkgconfig(Qt5WebEngine)
+BuildRequires:  pkgconfig(Qt5WebEngineCore)
+BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
@@ -96,7 +100,7 @@ Additional fonts for use by the MuseScore music notation program.
 
 %prep
 %setup -q -n MuseScore-%{version}
-%patch0 -p1
+%autopatch -p1
 
 # fix EOL encoding
 sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile
@@ -119,7 +123,7 @@ chmod -x fonts/gootville/readme.txt
 %cmake \
        -DCMAKE_BUILD_TYPE=RELEASE \
        -DUSE_SYSTEM_FREETYPE="ON" \
-       -DBUILD_WEBENGINE="OFF"
+       -DBUILD_WEBENGINE="ON"
 %make_jobs lrelease all
 
 # Put the desktop file in place for the packaging

use-qtmake-qt5.patch

@@ -0,0 +1,12 @@
+diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake
+--- a/build/FindQt5.cmake	2019-11-14 08:45:52.000000000 +0100
++++ b/build/FindQt5.cmake	2019-11-15 10:58:45.208000000 +0100
+@@ -37,7 +37,7 @@
+ 
+ include_directories(${QT_INCLUDES})
+ 
+-find_program(QT_QMAKE_EXECUTABLE qmake)
++find_program(QT_QMAKE_EXECUTABLE qmake-qt5)
+ set(_qmake_vars
+     QT_INSTALL_ARCHDATA
+     QT_INSTALL_BINS

use-system-qtwebengine-files.patch

@@ -0,0 +1,25 @@
+diff -ur a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+--- a/mscore/CMakeLists.txt	2019-11-14 08:45:52.000000000 +0100
++++ b/mscore/CMakeLists.txt	2019-11-15 14:27:31.268000000 +0100
+@@ -738,21 +738,6 @@
+ else (MINGW)
+ 
+    if ( NOT MSVC )
+-## install qwebengine core
+-      if (NOT APPLE AND USE_WEBENGINE)
+-         install(PROGRAMS
+-            ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
+-            DESTINATION bin
+-            )
+-         install(DIRECTORY
+-            ${QT_INSTALL_DATA}/resources
+-            DESTINATION lib/qt5
+-            )
+-         install(DIRECTORY
+-            ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
+-            DESTINATION lib/qt5/translations
+-            )
+-      endif(NOT APPLE AND USE_WEBENGINE)
+ 
+       target_link_libraries(mscore
+          ${ALSA_LIB}