diff --git a/MuseScore-3.5.2.tar.gz b/MuseScore-3.5.2.tar.gz deleted file mode 100644 index f725401..0000000 --- a/MuseScore-3.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068 -size 66326638 diff --git a/MuseScore-3.6.tar.gz b/MuseScore-3.6.tar.gz new file mode 100644 index 0000000..9240917 --- /dev/null +++ b/MuseScore-3.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75cd1d78aa71ffc8eed95d59367f945b2e38e7df1b9de8bf439ac046b27e05ff +size 67827521 diff --git a/correct-revision.patch b/correct-revision.patch deleted file mode 100644 index f80d598..0000000 --- a/correct-revision.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/mscore/revision.h -+++ b/mscore/revision.h -@@ -1 +1 @@ --3543170 -+cfb429a diff --git a/enable-build-with-qt515.patch b/enable-build-with-qt515.patch new file mode 100644 index 0000000..d0b1117 --- /dev/null +++ b/enable-build-with-qt515.patch @@ -0,0 +1,18 @@ +diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake +--- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100 ++++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100 +@@ -36,14 +36,6 @@ + ) + endif(WIN32) + +-# For Windows, because of these lines, for some unknown reason, the build of the .msi package fails. +-if(NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows") +- find_package(Qt5Core 5.15.0 QUIET) +- if (Qt5Core_FOUND) +- message(FATAL_ERROR "MuseScore 3 does not support Qt 5.15: 5.15.0 shows empty palettes panel, 5.15.1 and later crash when opening pre-3.6 scores due to QTBUG-77337") +- endif() +-endif() +- + find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED) + + foreach(_component ${_components}) diff --git a/musescore.changes b/musescore.changes index 54f124c..7048236 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 15 12:11:09 UTC 2021 - Cor Blom + +- Update to 3.6 +- Remove correct-revision.patch +- Add enable-build-with-qt515.patch to enable build with Qt 5.15 + ------------------------------------------------------------------- Sat Oct 17 11:01:12 UTC 2020 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 53d7651..cc8c390 100644 --- a/musescore.spec +++ b/musescore.spec @@ -1,7 +1,7 @@ # # spec file for package musescore # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,11 @@ %define rname mscore -%define version_lesser 3.5 +%define version_lesser 3.6 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore -Version: 3.5.2 +Version: 3.6 Release: 0 Summary: A WYSIWYG music score typesetter # Musescore code license is GPL-2.0 @@ -32,9 +32,10 @@ Group: Productivity/Multimedia/Sound/Editors and Convertors URL: https://musescore.org Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseScore-%{version}.tar.gz Source1: %{rname}.desktop -# PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases -Patch0: correct-revision.patch -# PATCH-FIX-OPENSUSE: really use qmake-qt5 +# Force build with Qt 5.15, despite reported problems. +# See: https://github.com/musescore/MuseScore/pull/7119 +Patch0: enable-build-with-qt515.patch +# PATCH-FIX-OPENSUSE: openSUSE has qmake-qt5 qmake was reserved for qt4, which is no longer present Patch1: use-qtmake-qt5.patch # PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed Patch2: use-system-qtwebengine-files.patch diff --git a/use-qtmake-qt5.patch b/use-qtmake-qt5.patch index a29dd81..2655351 100644 --- a/use-qtmake-qt5.patch +++ b/use-qtmake-qt5.patch @@ -1,7 +1,7 @@ diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake ---- a/build/FindQt5.cmake 2020-10-07 16:33:23.000000000 +0200 -+++ b/build/FindQt5.cmake 2020-10-08 00:36:33.765299122 +0200 -@@ -45,7 +45,7 @@ +--- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100 ++++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100 +@@ -55,7 +47,7 @@ include_directories(${QT_INCLUDES}) @@ -11,8 +11,8 @@ diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake QT_INSTALL_ARCHDATA QT_INSTALL_BINS diff -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-10-07 16:33:23.000000000 +0200 -+++ b/CMakeLists.txt 2020-10-08 00:35:59.616698386 +0200 +--- a/CMakeLists.txt 2021-01-14 14:33:11.000000000 +0100 ++++ b/CMakeLists.txt 2021-01-15 13:24:07.140841485 +0100 @@ -25,7 +25,7 @@ include(build/functions.cmake) # library of CMake functions ("fn__" namespace) @@ -20,5 +20,5 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt -fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake) +fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5) - set (CI $ENV{CI}) - if (CI) + # Libraries linked via full path no longer produce linker search paths. + cmake_policy(SET CMP0003 NEW)