rpm/musescore
SHA256
1
0
Fork 0
forked from pool/musescore
Code Pull Requests Activity

first version of update to 3.6. Needs additional work.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=83
This commit is contained in:
Cor Blom 2021-01-16 11:46:26 +00:00 committed by Git OBS Bridge
parent ab2e0c9b9d
commit 0f89493c59
7 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MuseScore-3.5.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
size 66326638

3
MuseScore-3.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75cd1d78aa71ffc8eed95d59367f945b2e38e7df1b9de8bf439ac046b27e05ff
size 67827521

5
correct-revision.patch
View File

@ -1,5 +0,0 @@
--- a/mscore/revision.h
+++ b/mscore/revision.h
@@ -1 +1 @@
-3543170
+cfb429a

18
enable-build-with-qt515.patch Normal file
View File

@ -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})

7
musescore.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 15 12:11:09 UTC 2021 - Cor Blom <cornelis@solcon.nl>
- 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 <cornelis@solcon.nl> Sat Oct 17 11:01:12 UTC 2020 - Cor Blom <cornelis@solcon.nl>

13
musescore.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package musescore # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,11 +17,11 @@
%define rname mscore %define rname mscore
%define version_lesser 3.5 %define version_lesser 3.6
%define fontdir %{_datadir}/fonts/%{name} %define fontdir %{_datadir}/fonts/%{name}
%define docdir %{_docdir}/%{name} %define docdir %{_docdir}/%{name}
Name: musescore Name: musescore
Version: 3.5.2 Version: 3.6
Release: 0 Release: 0
Summary: A WYSIWYG music score typesetter Summary: A WYSIWYG music score typesetter
# Musescore code license is GPL-2.0 # Musescore code license is GPL-2.0
@ -32,9 +32,10 @@ Group: Productivity/Multimedia/Sound/Editors and Convertors
URL: https://musescore.org URL: https://musescore.org
Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseScore-%{version}.tar.gz Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseScore-%{version}.tar.gz
Source1: %{rname}.desktop Source1: %{rname}.desktop
# PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases # Force build with Qt 5.15, despite reported problems.
Patch0: correct-revision.patch # See: https://github.com/musescore/MuseScore/pull/7119
# PATCH-FIX-OPENSUSE: really use qmake-qt5 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 Patch1: use-qtmake-qt5.patch
# PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed # PATCH-FIX-OPENSUSE: don't install qtwebengine files, they are not needed
Patch2: use-system-qtwebengine-files.patch Patch2: use-system-qtwebengine-files.patch

14
use-qtmake-qt5.patch
View File

@ -1,7 +1,7 @@
diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake
--- a/build/FindQt5.cmake 2020-10-07 16:33:23.000000000 +0200 --- a/build/FindQt5.cmake 2021-01-14 14:33:11.000000000 +0100
+++ b/build/FindQt5.cmake 2020-10-08 00:36:33.765299122 +0200 +++ b/build/FindQt5.cmake 2021-01-15 13:28:45.346084556 +0100
@@ -45,7 +45,7 @@ @@ -55,7 +47,7 @@
include_directories(${QT_INCLUDES}) include_directories(${QT_INCLUDES})
@ -11,8 +11,8 @@ diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake
QT_INSTALL_ARCHDATA QT_INSTALL_ARCHDATA
QT_INSTALL_BINS QT_INSTALL_BINS
diff -ur a/CMakeLists.txt b/CMakeLists.txt diff -ur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2020-10-07 16:33:23.000000000 +0200 --- a/CMakeLists.txt 2021-01-14 14:33:11.000000000 +0100
+++ b/CMakeLists.txt 2020-10-08 00:35:59.616698386 +0200 +++ b/CMakeLists.txt 2021-01-15 13:24:07.140841485 +0100
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
include(build/functions.cmake) # library of CMake functions ("fn__" namespace) 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)
+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5) +fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5)
set (CI $ENV{CI}) # Libraries linked via full path no longer produce linker search paths.
if (CI) cmake_policy(SET CMP0003 NEW)