From 6ac3b46c66da8a00a2b91ea57ba514f88372785469830bd9bf41599b1e81e3cc Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Nov 2019 08:32:54 +0000 Subject: [PATCH 1/6] test update OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=59 --- MuseScore-3.3.1.tar.gz | 3 --- MuseScore-3.3.2.tar.gz | 3 +++ correct-revision.patch | 2 +- musescore.spec | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 MuseScore-3.3.1.tar.gz create mode 100644 MuseScore-3.3.2.tar.gz diff --git a/MuseScore-3.3.1.tar.gz b/MuseScore-3.3.1.tar.gz deleted file mode 100644 index b065f55..0000000 --- a/MuseScore-3.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb010f4e0657a1bc647587007dafe2d372ae0da1119f7208bf47b3b6f6d498e4 -size 62806745 diff --git a/MuseScore-3.3.2.tar.gz b/MuseScore-3.3.2.tar.gz new file mode 100644 index 0000000..a389697 --- /dev/null +++ b/MuseScore-3.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34c856a32ed1d2e725866e63fa0cedda033bfef0a915e2f0b0d83b63a79b2ee4 +size 62806003 diff --git a/correct-revision.patch b/correct-revision.patch index b58f099..c95be8c 100644 --- a/correct-revision.patch +++ b/correct-revision.patch @@ -2,4 +2,4 @@ +++ b/mscore/revision.h @@ -1 +1 @@ -3543170 -+824af4c ++492d7ef diff --git a/musescore.spec b/musescore.spec index e5eed5e..cb1c3ca 100644 --- a/musescore.spec +++ b/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 @@ -58,9 +58,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) @@ -119,7 +119,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 From 27aa83599c74580a85eeba603db180ca805581d4a2ced536e3c6097c023c68ea Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Nov 2019 10:00:37 +0000 Subject: [PATCH 2/6] test update 2 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=60 --- musescore.spec | 3 +++ use-qtmake-qt5.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 use-qtmake-qt5.patch diff --git a/musescore.spec b/musescore.spec index cb1c3ca..5c1aea5 100644 --- a/musescore.spec +++ b/musescore.spec @@ -34,6 +34,8 @@ 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 BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -97,6 +99,7 @@ Additional fonts for use by the MuseScore music notation program. %prep %setup -q -n MuseScore-%{version} %patch0 -p1 +%patch1 -p1 # fix EOL encoding sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile diff --git a/use-qtmake-qt5.patch b/use-qtmake-qt5.patch new file mode 100644 index 0000000..f591080 --- /dev/null +++ b/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 From ad99850329c76a4c07a7fd878aff7f47f727eee479c9690f25147e96dd477d68 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Nov 2019 10:37:24 +0000 Subject: [PATCH 3/6] test update 3 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=61 --- musescore.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/musescore.spec b/musescore.spec index 5c1aea5..ed171bc 100644 --- a/musescore.spec +++ b/musescore.spec @@ -35,6 +35,7 @@ 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 BuildRequires: cmake BuildRequires: fdupes @@ -198,6 +199,14 @@ 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/* From 5b2fbe726ffa2c71c4ad150fd5b76e3f4ee35f9648a8d9814b5b2f3f81dd9a42 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Nov 2019 11:00:44 +0000 Subject: [PATCH 4/6] test update 4 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=62 --- musescore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.spec b/musescore.spec index ed171bc..2b8839f 100644 --- a/musescore.spec +++ b/musescore.spec @@ -204,7 +204,7 @@ install -p -m 644 zerberus/README %{buildroot}%docdir/README %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/icudtl.dat /usr/lib/qt5/resources/qtwebengine*.pak /usr/lib/qt5/translations/qtwebengine_locales/*.pak %{_datadir}/metainfo/org.musescore.MuseScore.appdata.xml From 75a1fd01dc7fa8b6128c412fbed989a9f37232b43b3ad62566fc4ff33acc7ac9 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Nov 2019 11:31:17 +0000 Subject: [PATCH 5/6] - 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 + +- 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 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 From 97e11e07fa65866b2f59be6a58b68305876d4c5c4fbd263a83b38f40cdc072e2 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 15 Nov 2019 13:28:27 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=64 --- use-system-qtwebengine-files.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/use-system-qtwebengine-files.patch b/use-system-qtwebengine-files.patch index e11259b..565e2bb 100644 --- a/use-system-qtwebengine-files.patch +++ b/use-system-qtwebengine-files.patch @@ -1,7 +1,7 @@ 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 @@ ++++ b/mscore/CMakeLists.txt 2019-11-15 14:27:31.268000000 +0100 +@@ -738,21 +738,6 @@ else (MINGW) if ( NOT MSVC ) @@ -19,7 +19,7 @@ diff -ur a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt - ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales - DESTINATION lib/qt5/translations - ) -+ - endif(NOT APPLE AND USE_WEBENGINE) +- endif(NOT APPLE AND USE_WEBENGINE) target_link_libraries(mscore + ${ALSA_LIB}