pool/musescore
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test update 2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=60
This commit is contained in:
Cor Blom 2019-11-15 10:00:37 +00:00 committed by Git OBS Bridge
parent 6ac3b46c66
commit 27aa83599c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
musescore.spec
View File

@ -34,6 +34,8 @@ Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseS
Source1: %{rname}.desktop Source1: %{rname}.desktop
# PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases # PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases
Patch0: correct-revision.patch Patch0: correct-revision.patch
# PATCH-FIX-OPENSUSE: really use qmake-qt5
Patch1: use-qtmake-qt5.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -97,6 +99,7 @@ Additional fonts for use by the MuseScore music notation program.
%prep %prep
%setup -q -n MuseScore-%{version} %setup -q -n MuseScore-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
# fix EOL encoding # fix EOL encoding
sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile

12
use-qtmake-qt5.patch Normal file
View File

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