From 75a1fd01dc7fa8b6128c412fbed989a9f37232b43b3ad62566fc4ff33acc7ac9 Mon Sep 17 00:00:00 2001
From: Cor Blom <cornelis@solcon.nl>
Date: Fri, 15 Nov 2019 11:31:17 +0000
Subject: [PATCH] - 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/package/show/multimedia:apps/musescore?expand=0&rev=63
---
 musescore.changes                  |  8 ++++++++
 musescore.spec                     | 14 +++-----------
 use-system-qtwebengine-files.patch | 25 +++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 use-system-qtwebengine-files.patch

diff --git a/musescore.changes b/musescore.changes
index 8d0a0ba..6cc4cb8 100644
--- a/musescore.changes
+++ b/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>
 
diff --git a/musescore.spec b/musescore.spec
index 2b8839f..b07cf68 100644
--- a/musescore.spec
+++ b/musescore.spec
@@ -35,8 +35,9 @@ Source1:        %{rname}.desktop
 # PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases
 Patch0:         correct-revision.patch
 # PATCH-FIX-OPENSUSE: really use qmake-qt5
-# This is necessary to build QtWebEngineProcess
 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++
@@ -99,8 +100,7 @@ Additional fonts for use by the MuseScore music notation program.
 
 %prep
 %setup -q -n MuseScore-%{version}
-%patch0 -p1
-%patch1 -p1
+%autopatch -p1
 
 # fix EOL encoding
 sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile
@@ -199,14 +199,6 @@ install -p -m 644 zerberus/README                     %{buildroot}%docdir/README
 %files
 %{_bindir}/%{name}
 %{_bindir}/%{rname}
-%{_bindir}/QtWebEngineProcess
-%dir /usr/lib/qt5
-%dir /usr/lib/qt5/resources
-%dir /usr/lib/qt5/translations
-%dir /usr/lib/qt5/translations/qtwebengine_locales
-#/usr/lib/qt5/resources/icudtl.dat
-/usr/lib/qt5/resources/qtwebengine*.pak
-/usr/lib/qt5/translations/qtwebengine_locales/*.pak
 %{_datadir}/metainfo/org.musescore.MuseScore.appdata.xml
 %{_datadir}/applications/%{rname}.desktop
 %{_datadir}/mime/packages/*
diff --git a/use-system-qtwebengine-files.patch b/use-system-qtwebengine-files.patch
new file mode 100644
index 0000000..e11259b
--- /dev/null
+++ b/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 12:22:12.728000000 +0100
+@@ -738,20 +738,7 @@
+ 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