diff --git a/mscore-3.2.3-separate-commonfiles.patch b/mscore-3.2.3-separate-commonfiles.patch deleted file mode 100644 index c4d5c57..0000000 --- a/mscore-3.2.3-separate-commonfiles.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- MuseScore-3.2.3/libmscore/figuredbass.cpp.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/libmscore/figuredbass.cpp 2019-07-14 16:39:57.736196229 -0600 -@@ -1626,7 +1626,7 @@ bool FiguredBass::readConfigFile(const Q - path = rpath + QString("/fonts_figuredbass.xml"); - } - #else -- path = ":/fonts/fonts_figuredbass.xml"; -+ path = "/usr/share/fonts/mscore/fonts_figuredbass.xml"; - #endif - g_FBFonts.clear(); - } ---- MuseScore-3.2.3/libmscore/mscore.cpp.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/libmscore/mscore.cpp 2019-07-14 16:44:07.920062686 -0600 -@@ -346,17 +346,17 @@ void MScore::init() - // - #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS) - static const char* fonts[] = { -- ":/fonts/musejazz/MuseJazzText.otf", -- ":/fonts/FreeSans.ttf", -- ":/fonts/FreeSerif.ttf", -- ":/fonts/FreeSerifBold.ttf", -- ":/fonts/FreeSerifItalic.ttf", -- ":/fonts/FreeSerifBoldItalic.ttf", -- ":/fonts/mscoreTab.ttf", -- ":/fonts/mscore-BC.ttf", -- ":/fonts/bravura/BravuraText.otf", -- ":/fonts/gootville/GootvilleText.otf", -- ":/fonts/mscore/MScoreText.ttf", -+ "/usr/share/fonts/mscore/musejazz/MuseJazzText.otf", -+ "/usr/share/fonts/gnu-free/FreeSans.ttf", -+ "/usr/share/fonts/gnu-free/FreeSerif.ttf", -+ "/usr/share/fonts/gnu-free/FreeSerifBold.ttf", -+ "/usr/share/fonts/gnu-free/FreeSerifItalic.ttf", -+ "/usr/share/fonts/gnu-free/FreeSerifBoldItalic.ttf", -+ "/usr/share/fonts/mscore/mscoreTab.ttf", -+ "/usr/share/fonts/mscore/mscore-BC.ttf", -+ "/usr/share/fonts/mscore/bravura/BravuraText.otf", -+ "/usr/share/fonts/mscore/gootville/GootvilleText.otf", -+ "/usr/share/fonts/mscore/MScoreText.ttf", - }; - - for (unsigned i = 0; i < sizeof(fonts)/sizeof(*fonts); ++i) { ---- MuseScore-3.2.3/libmscore/stafftype.cpp.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/libmscore/stafftype.cpp 2019-07-14 16:44:38.720046249 -0600 -@@ -1188,7 +1188,7 @@ bool StaffType::readConfigFile(const QSt - path = rpath + QString("/fonts_tablature.xml"); - } - #else -- path = ":/fonts/fonts_tablature.xml"; -+ path = "/usr/share/fonts/mscore/fonts_tablature.xml"; - #endif - _durationFonts.clear(); - _fretFonts.clear(); ---- MuseScore-3.2.3/libmscore/sym.cpp.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/libmscore/sym.cpp 2019-07-14 16:46:11.593996684 -0600 -@@ -34,10 +34,10 @@ namespace Ms { - static const int FALLBACK_FONT = 0; // Bravura - - QVector ScoreFont::_scoreFonts { -- ScoreFont("Bravura", "Bravura", ":/fonts/bravura/", "Bravura.otf" ), -- ScoreFont("Emmentaler", "MScore", ":/fonts/mscore/", "mscore.ttf" ), -- ScoreFont("Gonville", "Gootville", ":/fonts/gootville/", "Gootville.otf" ), -- ScoreFont("MuseJazz", "MuseJazz", ":/fonts/musejazz/", "MuseJazz.otf" ), -+ ScoreFont("Bravura", "Bravura", INSTPREFIX "/share/fonts/mscore/bravura/", "Bravura.otf" ), -+ ScoreFont("Emmentaler", "MScore", INSTPREFIX "/share/fonts/mscore/", "mscore.ttf" ), -+ ScoreFont("Gonville", "Gootville", INSTPREFIX "/share/fonts/mscore/gootville/", "Gootville.otf" ), -+ ScoreFont("MuseJazz", "MuseJazz", INSTPREFIX "/share/fonts/mscore/musejazz/", "MuseJazz.otf" ), - }; - - std::array ScoreFont::_mainSymCodeTable { 0 }; diff --git a/mscore-3.2.3-unbundle.patch b/mscore-3.2.3-unbundle.patch deleted file mode 100644 index aab320e..0000000 --- a/mscore-3.2.3-unbundle.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- MuseScore-3.2.3/CMakeLists.txt.orig 2019-07-06 03:46:43.000000000 -0600 -+++ MuseScore-3.2.3/CMakeLists.txt 2019-07-15 16:03:39.715263360 -0600 -@@ -740,7 +740,7 @@ endif (NOT MSVC) - subdirs( - awl bww2mxml share midi audiofile fluid libmscore synthesizer - effects thirdparty/rtf2html thirdparty/beatroot -- thirdparty/qzip thirdparty/kQOAuth -+ thirdparty/qzip - ) - - if (BUILD_CRASH_REPORTER) ---- MuseScore-3.2.3/mscore/CMakeLists.txt.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/mscore/CMakeLists.txt 2019-07-15 16:14:57.173784359 -0600 -@@ -207,8 +207,6 @@ else (APPLE) - musescorefonts-Gootville.qrc - musescorefonts-Bravura.qrc - musescorefonts-MuseJazz.qrc -- musescorefonts-FreeSerif.qrc -- musescorefonts-Free.qrc - shortcut.qrc) - endif (APPLE) - -@@ -1020,11 +1018,6 @@ if (APPLE) - ../fonts/gootville/GootvilleText.otf - ../fonts/mscore/MScoreText.ttf - ../fonts/musejazz/MuseJazzText.otf -- ../fonts/FreeSerif.ttf -- ../fonts/FreeSerifBold.ttf -- ../fonts/FreeSerifItalic.ttf -- ../fonts/FreeSerifBoldItalic.ttf -- ../fonts/FreeSans.ttf - ../fonts/mscoreTab.ttf - ../fonts/mscore-BC.ttf - ../fonts/bravura/BravuraText.otf ---- MuseScore-3.2.3/mscore/logindialog.cpp.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/mscore/logindialog.cpp 2019-07-15 16:05:45.309949865 -0600 -@@ -13,7 +13,7 @@ - #include "musescore.h" - #include "logindialog.h" - #include "network/loginmanager.h" --#include "kQOAuth/kqoauthrequest_xauth.h" -+#include - - namespace Ms { - ---- MuseScore-3.2.3/mscore/musescore.h.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/mscore/musescore.h 2019-07-16 08:53:17.233212691 -0600 -@@ -26,7 +26,7 @@ - #include "ui_insertmeasuresdialog.h" - #include "ui_aboutbox.h" - #include "ui_aboutmusicxmlbox.h" --#include "singleapp/src/QtSingleApplication" -+#include - #include "updatechecker.h" - #include "libmscore/musescoreCore.h" - #include "libmscore/score.h" ---- MuseScore-3.2.3/mscore/network/loginmanager.cpp.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/mscore/network/loginmanager.cpp 2019-07-15 16:06:49.391769462 -0600 -@@ -15,8 +15,8 @@ - #include "musescore.h" - #include "libmscore/score.h" - #include "preferences.h" --#include "kQOAuth/kqoauthrequest.h" --#include "kQOAuth/kqoauthrequest_xauth.h" -+#include -+#include - - #ifdef USE_WEBENGINE - #include ---- MuseScore-3.2.3/mtest/CMakeLists.txt.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/mtest/CMakeLists.txt 2019-07-15 16:15:15.821440869 -0600 -@@ -37,8 +37,6 @@ QT5_ADD_RESOURCES(qrc_files ${PROJECT_SO - ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Gootville.qrc - ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Bravura.qrc - ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MuseJazz.qrc -- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Free.qrc -- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-FreeSerif.qrc - ) - - add_library (testResources STATIC diff --git a/mscore-3.3.0-separate-commonfiles.patch b/mscore-3.3.0-separate-commonfiles.patch new file mode 100644 index 0000000..6201174 --- /dev/null +++ b/mscore-3.3.0-separate-commonfiles.patch @@ -0,0 +1,72 @@ +--- MuseScore-3.3.0/libmscore/figuredbass.cpp.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/libmscore/figuredbass.cpp 2019-11-01 10:22:42.741381006 -0600 +@@ -1626,7 +1626,7 @@ bool FiguredBass::readConfigFile(const Q + path = rpath + QString("/fonts_figuredbass.xml"); + } + #else +- path = ":/fonts/fonts_figuredbass.xml"; ++ path = "/usr/share/fonts/mscore/fonts_figuredbass.xml"; + #endif + g_FBFonts.clear(); + } +--- MuseScore-3.3.0/libmscore/mscore.cpp.orig 2019-11-01 10:22:42.743380972 -0600 ++++ MuseScore-3.3.0/libmscore/mscore.cpp 2019-11-01 10:52:45.109176452 -0600 +@@ -346,18 +346,18 @@ void MScore::init() + // + #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS) + static const char* fonts[] = { +- ":/fonts/musejazz/MuseJazzText.otf", +- ":/fonts/campania/Campania.otf", +- ":/fonts/FreeSans.ttf", +- ":/fonts/FreeSerif.ttf", +- ":/fonts/FreeSerifBold.ttf", +- ":/fonts/FreeSerifItalic.ttf", +- ":/fonts/FreeSerifBoldItalic.ttf", +- ":/fonts/mscoreTab.ttf", +- ":/fonts/mscore-BC.ttf", +- ":/fonts/bravura/BravuraText.otf", +- ":/fonts/gootville/GootvilleText.otf", +- ":/fonts/mscore/MScoreText.ttf", ++ "/usr/share/fonts/mscore/musejazz/MuseJazzText.otf", ++ "/usr/share/fonts/mscore/campania/Campania.otf", ++ "/usr/share/fonts/gnu-free/FreeSans.ttf", ++ "/usr/share/fonts/gnu-free/FreeSerif.ttf", ++ "/usr/share/fonts/gnu-free/FreeSerifBold.ttf", ++ "/usr/share/fonts/gnu-free/FreeSerifItalic.ttf", ++ "/usr/share/fonts/gnu-free/FreeSerifBoldItalic.ttf", ++ "/usr/share/fonts/mscore/mscoreTab.ttf", ++ "/usr/share/fonts/mscore/mscore-BC.ttf", ++ "/usr/share/fonts/bravura/BravuraText.otf", ++ "/usr/share/fonts/mscore/gootville/GootvilleText.otf", ++ "/usr/share/fonts/mscore/MScoreText.ttf", + }; + + for (unsigned i = 0; i < sizeof(fonts)/sizeof(*fonts); ++i) { +--- MuseScore-3.3.0/libmscore/stafftype.cpp.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/libmscore/stafftype.cpp 2019-11-01 10:22:42.745380938 -0600 +@@ -1199,7 +1199,7 @@ bool StaffType::readConfigFile(const QSt + path = rpath + QString("/fonts_tablature.xml"); + } + #else +- path = ":/fonts/fonts_tablature.xml"; ++ path = "/usr/share/fonts/mscore/fonts_tablature.xml"; + #endif + _durationFonts.clear(); + _fretFonts.clear(); +--- MuseScore-3.3.0/libmscore/sym.cpp.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/libmscore/sym.cpp 2019-11-01 10:51:42.395237445 -0600 +@@ -34,10 +34,10 @@ namespace Ms { + static const int FALLBACK_FONT = 0; // Bravura + + QVector ScoreFont::_scoreFonts { +- ScoreFont("Bravura", "Bravura", ":/fonts/bravura/", "Bravura.otf" ), +- ScoreFont("Emmentaler", "MScore", ":/fonts/mscore/", "mscore.ttf" ), +- ScoreFont("Gonville", "Gootville", ":/fonts/gootville/", "Gootville.otf" ), +- ScoreFont("MuseJazz", "MuseJazz", ":/fonts/musejazz/", "MuseJazz.otf" ), ++ ScoreFont("Bravura", "Bravura", INSTPREFIX "/share/fonts/bravura/", "Bravura.otf" ), ++ ScoreFont("Emmentaler", "MScore", INSTPREFIX "/share/fonts/mscore/", "mscore.ttf" ), ++ ScoreFont("Gonville", "Gootville", INSTPREFIX "/share/fonts/mscore/gootville/", "Gootville.otf" ), ++ ScoreFont("MuseJazz", "MuseJazz", INSTPREFIX "/share/fonts/mscore/musejazz/", "MuseJazz.otf" ), + }; + + std::array ScoreFont::_mainSymCodeTable { {0} }; diff --git a/mscore-3.3.0-unbundle.patch b/mscore-3.3.0-unbundle.patch new file mode 100644 index 0000000..959fcf6 --- /dev/null +++ b/mscore-3.3.0-unbundle.patch @@ -0,0 +1,95 @@ +--- MuseScore-3.3.0/CMakeLists.txt.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/CMakeLists.txt 2019-11-01 11:01:32.149167861 -0600 +@@ -744,7 +744,7 @@ endif (NOT MSVC) + subdirs( + awl bww2mxml share midi audiofile fluid libmscore synthesizer + effects thirdparty/rtf2html thirdparty/beatroot +- thirdparty/qzip thirdparty/kQOAuth ++ thirdparty/qzip + ) + + if (BUILD_CRASH_REPORTER) +--- MuseScore-3.3.0/mscore/CMakeLists.txt.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/mscore/CMakeLists.txt 2019-11-01 12:17:44.329842172 -0600 +@@ -217,11 +217,8 @@ else (APPLE) + qml.qrc # TODO: replace with qtquick_compiler_add_resources on Qt >= 5.11 + musescorefonts-MScore.qrc + musescorefonts-Gootville.qrc +- musescorefonts-Bravura.qrc + musescorefonts-MuseJazz.qrc + musescorefonts-Campania.qrc +- musescorefonts-FreeSerif.qrc +- musescorefonts-Free.qrc + shortcut.qrc) + endif (APPLE) + +--- MuseScore-3.3.0/mscore/logindialog.cpp.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/mscore/logindialog.cpp 2019-11-01 11:01:32.151167826 -0600 +@@ -13,7 +13,7 @@ + #include "musescore.h" + #include "logindialog.h" + #include "network/loginmanager.h" +-#include "kQOAuth/kqoauthrequest_xauth.h" ++#include + + namespace Ms { + +--- MuseScore-3.3.0/mscore/musescore.h.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/mscore/musescore.h 2019-11-01 11:01:32.152167809 -0600 +@@ -26,7 +26,7 @@ + #include "ui_insertmeasuresdialog.h" + #include "ui_aboutbox.h" + #include "ui_aboutmusicxmlbox.h" +-#include "singleapp/src/QtSingleApplication" ++#include + #include "updatechecker.h" + #include "libmscore/musescoreCore.h" + #include "libmscore/score.h" +--- MuseScore-3.3.0/mscore/musescore.qrc.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/mscore/musescore.qrc 2019-11-01 12:58:07.552428375 -0600 +@@ -3,7 +3,7 @@ + data/icons/edit.svg + ../fonts/mscore/metadata.json + ../fonts/gootville/metadata.json +- ../fonts/bravura/metadata.json ++ /usr/share/SMuFL/Fonts/bravura/bravura_metadata.json + ../fonts/musejazz/metadata.json + ../fonts/smufl/classes.json + ../fonts/smufl/ranges.json +--- MuseScore-3.3.0/mscore/network/loginmanager.cpp.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/mscore/network/loginmanager.cpp 2019-11-01 11:01:32.152167809 -0600 +@@ -15,8 +15,8 @@ + #include "musescore.h" + #include "libmscore/score.h" + #include "preferences.h" +-#include "kQOAuth/kqoauthrequest.h" +-#include "kQOAuth/kqoauthrequest_xauth.h" ++#include ++#include + + #ifdef USE_WEBENGINE + #include +--- MuseScore-3.3.0/mtest/CMakeLists.txt.orig 2019-10-31 04:29:57.000000000 -0600 ++++ MuseScore-3.3.0/mtest/CMakeLists.txt 2019-11-01 11:06:52.686632610 -0600 +@@ -35,10 +35,7 @@ endif (MSVC) + QT5_ADD_RESOURCES(qrc_files ${PROJECT_SOURCE_DIR}/mtest/mtest.qrc + ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MScore.qrc + ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Gootville.qrc +- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Bravura.qrc + ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MuseJazz.qrc +- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Free.qrc +- ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-FreeSerif.qrc + ) + + add_library (testResources STATIC +--- MuseScore-3.3.0/mtest/mtest.qrc.orig 2019-10-31 04:29:58.000000000 -0600 ++++ MuseScore-3.3.0/mtest/mtest.qrc 2019-11-01 12:59:37.086895184 -0600 +@@ -3,7 +3,7 @@ + + ../fonts/mscore/metadata.json + ../fonts/gootville/metadata.json +- ../fonts/bravura/metadata.json ++ /usr/share/SMuFL/Fonts/bravura/bravura_metadata.json + ../fonts/musejazz/metadata.json + ../fonts/smufl/glyphnames.json + ../fonts/fonts_tablature.xml diff --git a/mscore.rpmlintrc b/mscore.rpmlintrc new file mode 100644 index 0000000..4ce0578 --- /dev/null +++ b/mscore.rpmlintrc @@ -0,0 +1,15 @@ +# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors + +# The documentation is in the -doc subpackage +addFilter(r'mscore-fonts\.noarch: W: no-documentation') + +# The font macros create this file; it is not under our control +addFilter(r'mscore-fonts\.noarch: W: hidden-file-or-dir .*\.uuid') +addFilter(r'mscore-fonts\.noarch: E: non-readable .*\.uuid') + +# The bundled intervaltree code does not give a version number +addFilter(r'W: unversioned-explicit-provides bundled\(intervaltree\)') + +# We have to reference this path to unbundle qt5-qtwebengine +addFilter(r'E: hardcoded-library-path in %{_prefix}/lib') diff --git a/mscore.spec b/mscore.spec index 3eb0640..080be1d 100644 --- a/mscore.spec +++ b/mscore.spec @@ -1,17 +1,17 @@ %global fontfamilyname %{name} -%global shortver 3.2 +%global shortver 3.3 Name: mscore Summary: Music Composition & Notation Software -Version: %{shortver}.3 -Release: 3%{?dist} +Version: %{shortver}.0 +Release: 1%{?dist} # rtf2html is LGPLv2+ # paper4.png paper5.png are LGPLv3 # the rest is GPLv2 # Soundfont is MIT License: GPLv2 and LGPLv2+ and LGPLv3 and MIT URL: https://musescore.org/ -Source0: https://github.com/musescore/MuseScore/releases/download/v%{version}/MuseScore-%{version}.zip +Source0: https://github.com/musescore/MuseScore/releases/download/v%{shortver}/MuseScore-%{version}.zip # For mime types Source1: %{name}.xml @@ -23,44 +23,47 @@ Patch0: mscore-3.2.3-use-default-soundfont.patch # list) into the binary executable to reduce its size. This is also useful to # inform the users about the existence of different choices for common files. # The font files need to be separated due to the font packaging guidelines. -Patch1: mscore-3.2.3-separate-commonfiles.patch +Patch1: mscore-3.3.0-separate-commonfiles.patch # Ensure CMake will use qmake-qt5 Patch2: mscore-3.2.3-fix-qmake-path.patch -# Unbundle gnu-free-{sans,serif}-fonts, kqoauth, and QtSingleApplication -Patch3: mscore-3.2.3-unbundle.patch +# Unbundle gnu-free-{sans,serif}-fonts, kqoauth, QtSingleApplication, and +# steinberg-bravura{,-text}-fonts +Patch3: mscore-3.3.0-unbundle.patch # Fix some glitches in the aeolus code Patch4: mscore-3.2.3-aeolus.patch -BuildRequires: alsa-lib-devel BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fontforge BuildRequires: fontpackages-devel BuildRequires: gcc-c++ -BuildRequires: jack-audio-connection-kit-devel -BuildRequires: kqoauth-qt5-devel BuildRequires: lame-devel -BuildRequires: libsndfile-devel -BuildRequires: libvorbis-devel BuildRequires: perl(Pod::Usage) -BuildRequires: pkgconfig(freetype2) >= 2.5.2 -BuildRequires: poppler-qt5-devel -BuildRequires: portaudio-devel -BuildRequires: portmidi-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-qtdeclarative-devel -BuildRequires: qt5-qtscript-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qttools-static +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(kqoauth) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(poppler-qt5) +BuildRequires: pkgconfig(portaudiocpp) +BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(Qt5Designer) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5UiTools) %ifarch %{qt5_qtwebengine_arches} -BuildRequires: qt5-qtwebengine-devel +BuildRequires: pkgconfig(Qt5WebEngine) %endif -BuildRequires: qt5-qtwebkit-devel -BuildRequires: qt5-qtxmlpatterns-devel +BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: pkgconfig(Qt5XmlPatterns) +BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(vorbis) +BuildRequires: portmidi-devel +BuildRequires: qt5-qtbase-private-devel BuildRequires: qtsingleapplication-qt5-devel +BuildRequires: steinberg-bravura-fonts +BuildRequires: steinberg-bravura-text-fonts Requires: %{name}-fonts = %{version}-%{release} Requires: gnu-free-sans-fonts @@ -68,6 +71,8 @@ Requires: gnu-free-serif-fonts Requires: hicolor-icon-theme Requires: soundfont2 Requires: soundfont2-default +Requires: steinberg-bravura-fonts +Requires: steinberg-bravura-text-fonts %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} # For scripting Requires: qt5-qtquickcontrols%{?_isa} = %{_qt5_version} @@ -119,15 +124,12 @@ This package contains the musical notation fonts for use of MuseScore. %prep %autosetup -p1 -c -# porttime is part of portmidi in our distribution -sed -i 's| -lporttime||' mscore/CMakeLists.txt - # Remove the precompiled binary rm thirdparty/rtf2html/rtf2html # Remove bundled stuff rm -vrf thirdparty/{freetype,kQOAuth,openssl,poppler,portmidi,singleapp} -rm -vf fonts/FreeS* +rm -vrf fonts/{bravura,FreeS*} # Force Fedora specific flags: find . -name CMakeLists.txt -exec sed -i -e 's|-O3|%{optflags}|' {} \+ @@ -178,12 +180,12 @@ cp -a build/mscore.desktop %{buildroot}/%{_datadir}/applications # Install fonts mkdir -p %{buildroot}/%{_fontdir} mkdir -p %{buildroot}/%{_fontdir}/bravura +mkdir -p %{buildroot}/%{_fontdir}/campania mkdir -p %{buildroot}/%{_fontdir}/gootville mkdir -p %{buildroot}/%{_fontdir}/musejazz cp -a fonts/smufl %{buildroot}%{_fontdir} install -pm 644 fonts/*.{sfd,ttf} %{buildroot}/%{_fontdir} -install -pm 644 fonts/bravura/*.otf %{buildroot}/%{_fontdir} -install -pm 644 fonts/bravura/*.json %{buildroot}/%{_fontdir}/bravura +install -pm 644 fonts/campania/*.otf %{buildroot}/%{_fontdir}/campania/ install -pm 644 fonts/gootville/*.otf %{buildroot}/%{_fontdir} install -pm 644 fonts/gootville/*.json %{buildroot}/%{_fontdir}/gootville/ install -pm 644 fonts/mscore/*.{sfd,ttf} %{buildroot}/%{_fontdir} @@ -202,10 +204,7 @@ done popd pushd %{buildroot}/%{_fontdir} -cd bravura -ln -s ../Bravura.otf . -ln -s ../BravuraText.otf . -cd ../gootville +cd gootville ln -s ../Gootville.otf . ln -s ../GootvilleText.otf . cd ../musejazz @@ -255,7 +254,7 @@ mv thirdparty/rtf2html/README.mscore README.mscore.rtf2html mv thirdparty/rtf2html/README.ru README.ru.rtf2html mv share/wallpaper/COPYRIGHT COPYING.wallpaper mv %{buildroot}%{_datadir}/soundfonts/MuseScore_General_License.md COPYING.MuseScore_General -mv fonts/bravura/OFL.txt COPYING.OFL +mv fonts/campania/LICENSE COPYING.OFL # Add AppStream metadata install -Dm 0644 -p %{SOURCE2} \ @@ -288,16 +287,20 @@ rm -fr %{buildroot}%{_prefix}/lib %doc %{_datadir}/%{name}-%{shortver}/manual/ %_font_pkg %{fontfamilyname}*.ttf MScoreText.ttf *.otf -%{_datadir}/fonts/mscore/bravura/ -%{_datadir}/fonts/mscore/gootville/ -%{_datadir}/fonts/mscore/musejazz/ -%{_datadir}/fonts/mscore/smufl/ -%{_datadir}/fonts/mscore/*.json -%{_datadir}/fonts/mscore/*.sfd -%{_datadir}/fonts/mscore/*.xml +%{_fontdir}/campania/ +%{_fontdir}/gootville/ +%{_fontdir}/musejazz/ +%{_fontdir}/smufl/ +%{_fontdir}/*.json +%{_fontdir}/*.sfd +%{_fontdir}/*.xml %{_datadir}/appdata/%{fontfamilyname}.metainfo.xml %changelog +* Fri Nov 1 2019 Jerry James - 3.3.0-1 +- Version 3.3.0 +- Unbundle the bravura fonts + * Wed Sep 25 2019 Jan Grulich - 3.2.3-3 - rebuild (qt5) diff --git a/sources b/sources index 16b9a1c..7ffbe6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (MuseScore-3.2.3.zip) = abd56b3a7075ca1a6e2da922a129056b8795657e426f724050b217ff299cd4924f4a44ba9ceb2dc54c3398386fa3fbdc1a61303454771a4a3f723b14e17f140d +SHA512 (MuseScore-3.3.0.zip) = 0d8a0c43be1a8a1a3a3436101d383c55faab1cbcf587bcdf8eed9b35194c99afc72463860bff5159f93c4f6a5f7b58d02d9f6259fb326b9e5b39cd33dce5ee63