Hello community, here is the log from the commit of package musescore for openSUSE:Factory checked in at 2019-11-18 20:11:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/musescore (Old) and /work/SRC/openSUSE:Factory/.musescore.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "musescore" Mon Nov 18 20:11:41 2019 rev:14 rq:749298 version:3.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/musescore/musescore.changes 2019-11-14 23:52:18.228543445 +0100 +++ /work/SRC/openSUSE:Factory/.musescore.new.26869/musescore.changes 2019-11-18 20:11:58.621543481 +0100 @@ -1,0 +2,8 @@ +Fri Nov 15 11:27:34 UTC 2019 - Cor Blom <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- MuseScore-3.3.1.tar.gz New: ---- MuseScore-3.3.2.tar.gz use-qtmake-qt5.patch use-system-qtwebengine-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ musescore.spec ++++++ --- /var/tmp/diff_new_pack.ErTNOR/_old 2019-11-18 20:12:02.665541419 +0100 +++ /var/tmp/diff_new_pack.ErTNOR/_new 2019-11-18 20:12:02.669541416 +0100 @@ -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 @@ 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(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 @@ %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 @@ %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 ++++++ MuseScore-3.3.1.tar.gz -> MuseScore-3.3.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/musescore/MuseScore-3.3.1.tar.gz /work/SRC/openSUSE:Factory/.musescore.new.26869/MuseScore-3.3.2.tar.gz differ: char 13, line 1 ++++++ correct-revision.patch ++++++ --- /var/tmp/diff_new_pack.ErTNOR/_old 2019-11-18 20:12:02.709541396 +0100 +++ /var/tmp/diff_new_pack.ErTNOR/_new 2019-11-18 20:12:02.729541386 +0100 @@ -2,4 +2,4 @@ +++ b/mscore/revision.h @@ -1 +1 @@ -3543170 -+824af4c ++492d7ef ++++++ use-qtmake-qt5.patch ++++++ 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 ++++++ 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}
