-up to 3.6.2

diff --git a/desktop.patch b/desktop.patch
new file mode 100644 (file)
index 0000000..0da8c8b
--- /dev/null
+++ b/desktop.patch
@@ -0,0 +1,14 @@
+--- MuseScore-3.6.2/build/Linux+BSD/mscore.desktop.in~ 2021-02-08 12:16:37.000000000 +0000
++++ MuseScore-3.6.2/build/Linux+BSD/mscore.desktop.in  2021-03-03 21:45:47.808517532 +0000
+@@ -4,9 +4,11 @@
+ GenericName=Music notation
+ GenericName[de]=Notensatz
+ GenericName[fr]=Notation musicale
++GenericName[pl]=Zapis nutowy
+ Comment=Create, play and print sheet music
+ Comment[ru]=Визуальный редактор нотных партитур
+ Comment[fr]=Gravure de partitions musicales
++Comment[pl]=Twórz, odtwarzaj i drukuj partytury
+ Exec=mscore@MSCORE_INSTALL_SUFFIX@ %F
+ Icon=mscore@MSCORE_INSTALL_SUFFIX@
+ StartupNotify=true

diff --git a/do_not_bundle_qtwebengine.patch b/do_not_bundle_qtwebengine.patch
index 2c11b4b5119ba163f0a5690983c56c80d140a9dd..cb8f1112a3ebf27133ee57d9298c96ee8e6fdd2c 100644 (file)
--- a/do_not_bundle_qtwebengine.patch
+++ b/do_not_bundle_qtwebengine.patch
@@ -1,13 +1,12 @@
-diff -dur MuseScore-3.0.4.orig/mscore/CMakeLists.txt MuseScore-3.0.4/mscore/CMakeLists.txt
---- MuseScore-3.0.4.orig/mscore/CMakeLists.txt 2019-02-28 12:31:10.000000000 +0100
-+++ MuseScore-3.0.4/mscore/CMakeLists.txt      2019-03-10 16:43:03.375054036 +0100
-@@ -699,21 +699,6 @@
+--- MuseScore-3.6.2/main/CMakeLists.txt~       2021-02-08 12:16:37.000000000 +0000
++++ MuseScore-3.6.2/main/CMakeLists.txt        2021-03-03 21:33:31.167705900 +0000
+@@ -226,22 +226,6 @@
  else (MINGW)
  
     if ( NOT MSVC )
--## install qwebengine core
+-      ## install qwebengine core
 -      if (NOT APPLE AND USE_WEBENGINE)
--         install(FILES
+-         install(PROGRAMS
 -            ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
 -            DESTINATION bin
 -            )
@@ -20,6 +19,7 @@ diff -dur MuseScore-3.0.4.orig/mscore/CMakeLists.txt MuseScore-3.0.4/mscore/CMak
 -            DESTINATION lib/qt5/translations
 -            )
 -      endif(NOT APPLE AND USE_WEBENGINE)
- 
-       target_link_libraries(mscore
-          ${ALSA_LIB}
+-
+       set_target_properties (
+          mscore
+          PROPERTIES

diff --git a/musescore.spec b/musescore.spec
index 83e5f147d4ea84c3109bb14afbb934d27921d006..541f1c38ecaa5567edd2a760b5d7962d929a276e 100644 (file)
--- a/musescore.spec
+++ b/musescore.spec
@@ -1,18 +1,20 @@
 #
 
-%define min_qt_version 5.8.0
+%define min_qt_version 5.15.0
 
 Summary:       MuseScore - music notation software
 Summary(pl.UTF-8):     MuseScore - oprogramowanie do notacji muzycznej
 Name:          musescore
-Version:       3.2.0
+Version:       3.6.2
 Release:       1
 License:       GPL v2
 Group:         Applications
-Source0:       https://github.com/musescore/MuseScore/releases/download/v3.2/MuseScore-%{version}.zip
-# Source0-md5: aa5a646019d6e964c697406913998bb0
+Source0:       https://github.com/musescore/MuseScore/archive/v%{version}.tar.gz
+# Source0-md5: 682c4a38b8b39d246d196c392ae08ab7
 Patch0:                do_not_bundle_qtwebengine.patch
-Patch1:                soundfont-install.patch
+Patch1:                desktop.patch
+Patch2:                use-qtmake-qt5.patch
+Patch3:                set_as_stable.patch
 URL:           https://musescore.org/
 BuildRequires: Qt5Concurrent-devel >= %{min_qt_version}
 BuildRequires: Qt5Core-devel >= %{min_qt_version}
@@ -31,6 +33,7 @@ BuildRequires:        Qt5UiTools-devel >= %{min_qt_version}
 %ifnarch x32
 BuildRequires: Qt5WebEngine-devel >= %{min_qt_version}
 %endif
+BuildRequires: Qt5Quick-controls2-devel
 BuildRequires: Qt5Widgets-devel >= %{min_qt_version}
 BuildRequires: Qt5Xml-devel >= %{min_qt_version}
 BuildRequires: Qt5XmlPatterns-devel >= %{min_qt_version}
@@ -46,6 +49,7 @@ BuildRequires:        pulseaudio-devel
 BuildRequires: qt5-assistant
 BuildRequires: qt5-build
 BuildRequires: qt5-linguist
+BuildRequires: qt5-qmake
 BuildRequires: texlive-latex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,10 +75,12 @@ Features:
 - print or create pdf files
 
 %prep
-%setup -q -c -n MuseScore-%{version}
+%setup -q -n MuseScore-%{version}
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -86,6 +92,7 @@ cd build.release
 CFLAGS="%{rpmcflags} -DNDEBUG -DQT_NO_DEBUG -fPIC" \
 CXXFLAGS="%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG -fPIC" \
 %cmake  \
+       -DCMAKE_BUILD_TYPE=RELEASE \
        -DMSCORE_INSTALL_SUFFIX="" \
        -DMUSESCORE_LABEL="" \
        -DBUILD_LAME="TRUE" \
@@ -130,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md Compatibility
 %attr(755,root,root) %{_bindir}/mscore
 %attr(755,root,root) %{_bindir}/musescore
-%{_datadir}/mscore-3.2
+%{_datadir}/mscore-3.6
 %{_desktopdir}/mscore.desktop
 %{_iconsdir}/*/*/apps/*
 %{_iconsdir}/*/*/mimetypes/*

diff --git a/set_as_stable.patch b/set_as_stable.patch
new file mode 100644 (file)
index 0000000..74c9fb8
--- /dev/null
+++ b/set_as_stable.patch
@@ -0,0 +1,11 @@
+--- MuseScore-3.6.2/CMakeLists.txt~    2021-03-03 22:52:43.929082684 +0000
++++ MuseScore-3.6.2/CMakeLists.txt     2021-03-03 23:14:24.952219985 +0000
+@@ -108,7 +108,7 @@
+ add_definitions(-DMUSESCORE_REVISION="${MUSESCORE_REVISION}")
+ 
+ # Setup version number and general build settings
+-SET(MUSESCORE_BUILD_CONFIG "dev" CACHE STRING "Build config")
++SET(MUSESCORE_BUILD_CONFIG "release" CACHE STRING "Build config")
+ # Possible MUSESCORE_BUILD_CONFIG values:
+ # - dev     - for development/nightly builds
+ # - testing - for testing versions (alpha, beta, RC)

diff --git a/soundfont-install.patch b/soundfont-install.patch
deleted file mode 100644 (file)
index 2ecb0c9..0000000
--- a/soundfont-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -dur -x '*~' MuseScore-3.1.0.orig/share/sound/CMakeLists.txt MuseScore-3.1.0/share/sound/CMakeLists.txt
---- MuseScore-3.1.0.orig/share/sound/CMakeLists.txt    2019-05-28 09:33:38.000000000 +0200
-+++ MuseScore-3.1.0/share/sound/CMakeLists.txt 2019-06-04 09:44:21.000000000 +0200
-@@ -29,13 +29,13 @@
-       )
- endif ()
- 
--if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/MuseScore_General-License.md)
-+if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/MuseScore_General_License.md)
-   install (FILES FluidR3Mono_License.md
-       DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}sound
--      RENAME MuseScore_General-License.md)
-+      RENAME MuseScore_General_License.md)
- else ()
-   install(FILES
--      MuseScore_General-License.md
-+      MuseScore_General_License.md
-       DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}sound
-       )
- endif ()

diff --git a/use-qtmake-qt5.patch b/use-qtmake-qt5.patch
new file mode 100644 (file)
index 0000000..2635092
--- /dev/null
+++ b/use-qtmake-qt5.patch
@@ -0,0 +1,22 @@
+--- MuseScore-3.6.2/build/FindQt5.cmake~       2021-02-08 12:16:37.000000000 +0000
++++ MuseScore-3.6.2/build/FindQt5.cmake        2021-03-03 22:35:06.449357445 +0000
+@@ -47,7 +47,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
+--- MuseScore-3.6.2/CMakeLists.txt~    2021-02-08 12:16:37.000000000 +0000
++++ MuseScore-3.6.2/CMakeLists.txt     2021-03-03 22:36:02.887616621 +0000
+@@ -25,7 +25,7 @@
+ include(build/functions.cmake) # library of CMake functions ("fn__" namespace)
+ 
+ # Print Qt version or fail the build if Qt (qmake) is not in PATH.
+-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)
+ 
+ # Libraries linked via full path no longer produce linker search paths.
+ cmake_policy(SET CMP0003 NEW)