From 024e313c3f4113551b414d6583584c5ae7d67949 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 17 2020 22:43:50 +0000 Subject: Version 3.4.2. Also: - Drop the -user-default-soundfont patch; use a symlink instead. - R both qt5-qtquickcontrols and qt5-qtquickcontrols2; both seem to be used. - kQOAuth is no longer used, so drop unbundling. --- diff --git a/mscore-3.2.3-fix-qmake-path.patch b/mscore-3.2.3-fix-qmake-path.patch deleted file mode 100644 index fd72011..0000000 --- a/mscore-3.2.3-fix-qmake-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- MuseScore-3.2.3/build/FindQt5.cmake.orig 2019-07-06 03:46:43.000000000 -0600 -+++ MuseScore-3.2.3/build/FindQt5.cmake 2019-07-14 17:52:52.518276021 -0600 -@@ -37,7 +37,7 @@ endforeach() - - 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 diff --git a/mscore-3.2.3-use-default-soundfont.patch b/mscore-3.2.3-use-default-soundfont.patch deleted file mode 100644 index 4d9cac8..0000000 --- a/mscore-3.2.3-use-default-soundfont.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- MuseScore-3.2.3/mscore/preferences.cpp.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/mscore/preferences.cpp 2019-07-14 16:36:55.143293700 -0600 -@@ -89,7 +89,7 @@ void Preferences::init(bool storeInMemor - {PREF_APP_PATHS_MYIMAGES, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("images_directory", "Images"))).absoluteFilePath(), false)}, - {PREF_APP_PATHS_MYPLUGINS, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("plugins_directory", "Plugins"))).absoluteFilePath(), false)}, - {PREF_APP_PATHS_MYSCORES, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("scores_directory", "Scores"))).absoluteFilePath(), false)}, -- {PREF_APP_PATHS_MYSOUNDFONTS, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("soundfonts_directory", "SoundFonts"))).absoluteFilePath(), false)}, -+ {PREF_APP_PATHS_MYSOUNDFONTS, new StringPreference(QFileInfo(QString("/usr/share/soundfonts")).absoluteFilePath(), false)}, - {PREF_APP_PATHS_MYSHORTCUTS, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("shortcuts_directory", "Shortcuts"))).absoluteFilePath(), false)}, - {PREF_APP_PATHS_MYSTYLES, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("styles_directory", "Styles"))).absoluteFilePath(), false)}, - {PREF_APP_PATHS_MYTEMPLATES, new StringPreference(QFileInfo(QString("%1/%2").arg(wd).arg(QCoreApplication::translate("templates_directory", "Templates"))).absoluteFilePath(), false)}, ---- MuseScore-3.2.3/share/sound/CMakeLists.txt.orig 2019-07-06 03:46:44.000000000 -0600 -+++ MuseScore-3.2.3/share/sound/CMakeLists.txt 2019-07-14 16:37:41.056269189 -0600 -@@ -25,7 +25,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DI - else () - install(FILES - MuseScore_General.sf3 -- DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}sound -+ DESTINATION ${Mscore_SHARE_NAME}/soundfonts - ) - endif () - -@@ -36,7 +36,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DI - else () - install(FILES - MuseScore_General_License.md -- DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}sound -+ DESTINATION ${Mscore_SHARE_NAME}/soundfonts - ) - endif () - diff --git a/mscore-3.3.0-aeolus.patch b/mscore-3.3.0-aeolus.patch deleted file mode 100644 index 429cd82..0000000 --- a/mscore-3.3.0-aeolus.patch +++ /dev/null @@ -1,168 +0,0 @@ ---- MuseScore-3.3.2/aeolus/aeolus.cpp.orig 2019-11-14 00:56:37.000000000 -0700 -+++ MuseScore-3.3.2/aeolus/aeolus.cpp 2019-11-21 12:41:43.437378783 -0700 -@@ -52,32 +52,46 @@ Synthesizer* createAeolus() - // Aeolus - //--------------------------------------------------------- - --Aeolus::Aeolus() -+Aeolus::Aeolus() : Synthesizer() - { -- model = 0; -+ model = nullptr; - patchList.append(new MidiPatch { false, "Aeolus", 0, 0, 0, "Aeolus" }); - - _sc_cmode = 0; - _sc_group = 0; - _running = false; -+ _hold = 0; - _nplay = 0; -- _fsamp = 0; - _nasect = 0; - _ndivis = 0; -+ _revsize = 0.0f; -+ _revtime = 0.0f; - nout = 0; -- _ifc_init = 0; -- for (int i = 0; i < NGROUP; i++) -- _ifelms [i] = 0; -+ _fsamp = 0.0f; -+ _fsize = 0; -+ _ifc_init = nullptr; -+ memset(_midimap, 0, sizeof(_midimap)); -+ memset(_asectp, 0, sizeof(_asectp)); -+ memset(_divisp, 0, sizeof(_divisp)); - memset(_keymap, 0, sizeof(_keymap)); -+ memset(_audiopar, 0, sizeof(_audiopar)); -+ memset(routb, 0, sizeof(routb)); -+ memset(loutb, 0, sizeof(loutb)); -+ memset(_asectpar, 0, sizeof(_asectpar)); -+ memset(_ifelms, 0, sizeof(_ifelms)); -+ memset(_tempstr, 0, sizeof(_tempstr)); - } - - Aeolus::~Aeolus() - { -- delete model; -+ if (model != nullptr) -+ delete model; - for (int i = 0; i < _nasect; i++) -- delete _asectp [i]; -+ if (_asectp [i] != nullptr) -+ delete _asectp [i]; - for (int i = 0; i < _ndivis; i++) -- delete _divisp [i]; -+ if (_divisp [i] != nullptr) -+ delete _divisp [i]; - } - - //--------------------------------------------------------- -@@ -257,10 +271,11 @@ SynthesizerGroup Aeolus::state() const - // setState - //--------------------------------------------------------- - --void Aeolus::setState(const SynthesizerGroup& g) -+bool Aeolus::setState(const SynthesizerGroup& g) - { - for (const IdValue& v : g) - setValue(v.id, v.data.toDouble()); -+ return true; - } - - //--------------------------------------------------------- ---- MuseScore-3.3.2/aeolus/aeolus.h.orig 2019-11-14 00:56:37.000000000 -0700 -+++ MuseScore-3.3.2/aeolus/aeolus.h 2019-11-21 12:18:54.840326983 -0700 -@@ -109,7 +109,7 @@ class Aeolus : public Synthesizer { - virtual double masterTuning() const; - - virtual bool loadSoundFonts(const QStringList&) { return true; } -- virtual QStringList soundFonts() const { return QStringList(); } -+ virtual std::vector soundFontsInfo() const { std::vector sl; return sl; } - - virtual void process(unsigned, float*, float*, float*); - virtual void play(const PlayEvent&); -@@ -118,7 +118,7 @@ class Aeolus : public Synthesizer { - - // get/set synthesizer state - virtual SynthesizerGroup state() const; -- virtual void setState(const SynthesizerGroup&); -+ virtual bool setState(const SynthesizerGroup&); - - virtual void allSoundsOff(int channel) { allNotesOff(channel); } - virtual void allNotesOff(int /*channel*/); ---- MuseScore-3.3.2/aeolus/model.cpp.orig 2019-11-14 00:56:37.000000000 -0700 -+++ MuseScore-3.3.2/aeolus/model.cpp 2019-11-21 12:18:54.841326969 -0700 -@@ -745,7 +745,7 @@ int Model::write_instr() - Ifelm *I; - Addsynth *A; - -- sprintf (buff, "%s/definition", _instr); -+ snprintf (buff, sizeof(buff), "%s/definition", _instr); - if (! (F = fopen (buff, "w"))) - { - fprintf (stderr, "Can't open '%s' for writing\n", buff); -@@ -963,7 +963,7 @@ bool Model::writePresets() - uchar data [256]; - FILE *F; - -- sprintf (name, "%s/presets", _instr); -+ snprintf (name, sizeof(name), "%s/presets", _instr); - if (! (F = fopen (name, "w"))) { - fprintf (stderr, "Can't open '%s' for writing\n", name); - return 1; ---- MuseScore-3.3.2/aeolus/sparm.cpp.orig 2019-11-14 00:56:37.000000000 -0700 -+++ MuseScore-3.3.2/aeolus/sparm.cpp 2019-11-21 12:18:54.841326969 -0700 -@@ -110,12 +110,12 @@ bool SyntiParameterData::operator==(cons - // write - //--------------------------------------------------------- - --void SyntiParameterData::write(Xml& xml) const -+void SyntiParameterData::write(XmlWriter& xml) const - { - if (_type == SP_FLOAT) - xml.tagE(QString("f name=\"%1\" val=\"%3\"").arg(_name).arg(_fval)); - else if (_type == SP_STRING) -- xml.tagE(QString("s name=\"%1\" val=\"%3\"").arg(_name).arg(Xml::xmlString(_sval))); -+ xml.tagE(QString("s name=\"%1\" val=\"%3\"").arg(_name).arg(XmlWriter::xmlString(_sval))); - } - - //--------------------------------------------------------- -@@ -189,7 +189,7 @@ SyntiParameterType SyntiParameter::type( - // write - //--------------------------------------------------------- - --void SyntiParameter::write(Xml& xml) const -+void SyntiParameter::write(XmlWriter& xml) const - { - d->write(xml); - } ---- MuseScore-3.3.2/aeolus/sparm.h.orig 2019-11-14 00:56:37.000000000 -0700 -+++ MuseScore-3.3.2/aeolus/sparm.h 2019-11-21 12:18:54.841326969 -0700 -@@ -21,7 +21,7 @@ - #define __SPARM_H__ - - namespace Ms { -- class Xml; -+ class XmlWriter; - class Synth; - } - -@@ -54,7 +54,7 @@ class SyntiParameter { - - SyntiParameterType type() const; - -- void write(Ms::Xml&) const; -+ void write(Ms::XmlWriter&) const; - - const QString& name() const; - void setName(const QString& s); ---- MuseScore-3.3.2/aeolus/sparm_p.h.orig 2019-11-14 00:56:37.000000000 -0700 -+++ MuseScore-3.3.2/aeolus/sparm_p.h 2019-11-21 12:18:54.841326969 -0700 -@@ -70,7 +70,7 @@ class SyntiParameterData : public QShare - SyntiParameterData(int id, const QString& name, const QString& val); - SyntiParameterData(const SyntiParameterData& pd); - -- virtual void write(Ms::Xml&) const; -+ virtual void write(Ms::XmlWriter&) const; - virtual bool operator==(const SyntiParameterData&) const; - virtual void print() const; - diff --git a/mscore-3.3.0-separate-commonfiles.patch b/mscore-3.3.0-separate-commonfiles.patch deleted file mode 100644 index 6201174..0000000 --- a/mscore-3.3.0-separate-commonfiles.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 deleted file mode 100644 index 959fcf6..0000000 --- a/mscore-3.3.0-unbundle.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- 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-3.4.2-aeolus.patch b/mscore-3.4.2-aeolus.patch new file mode 100644 index 0000000..f752c25 --- /dev/null +++ b/mscore-3.4.2-aeolus.patch @@ -0,0 +1,153 @@ +--- MuseScore-3.4.2/aeolus/aeolus.cpp.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/aeolus/aeolus.cpp 2020-02-07 14:45:03.708820576 -0700 +@@ -52,23 +52,34 @@ Synthesizer* createAeolus() + // Aeolus + //--------------------------------------------------------- + +-Aeolus::Aeolus() ++Aeolus::Aeolus() : Synthesizer() + { +- model = 0; ++ model = nullptr; + patchList.append(new MidiPatch { false, "Aeolus", 0, 0, 0, "Aeolus" }); + + _sc_cmode = 0; + _sc_group = 0; + _running = false; ++ _hold = 0; + _nplay = 0; +- _fsamp = 0; + _nasect = 0; + _ndivis = 0; ++ _revsize = 0.0f; ++ _revtime = 0.0f; + nout = 0; +- _ifc_init = 0; +- for (int i = 0; i < NGROUP; i++) +- _ifelms [i] = 0; ++ _fsamp = 0.0f; ++ _fsize = 0; ++ _ifc_init = nullptr; ++ memset(_midimap, 0, sizeof(_midimap)); ++ memset(_asectp, 0, sizeof(_asectp)); ++ memset(_divisp, 0, sizeof(_divisp)); + memset(_keymap, 0, sizeof(_keymap)); ++ memset(_audiopar, 0, sizeof(_audiopar)); ++ memset(routb, 0, sizeof(routb)); ++ memset(loutb, 0, sizeof(loutb)); ++ memset(_asectpar, 0, sizeof(_asectpar)); ++ memset(_ifelms, 0, sizeof(_ifelms)); ++ memset(_tempstr, 0, sizeof(_tempstr)); + } + + Aeolus::~Aeolus() +@@ -257,10 +268,11 @@ SynthesizerGroup Aeolus::state() const + // setState + //--------------------------------------------------------- + +-void Aeolus::setState(const SynthesizerGroup& g) ++bool Aeolus::setState(const SynthesizerGroup& g) + { + for (const IdValue& v : g) + setValue(v.id, v.data.toDouble()); ++ return true; + } + + //--------------------------------------------------------- +--- MuseScore-3.4.2/aeolus/aeolus.h.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/aeolus/aeolus.h 2020-02-07 14:45:03.708820576 -0700 +@@ -109,7 +109,7 @@ class Aeolus : public Synthesizer { + virtual double masterTuning() const; + + virtual bool loadSoundFonts(const QStringList&) { return true; } +- virtual QStringList soundFonts() const { return QStringList(); } ++ virtual std::vector soundFontsInfo() const { std::vector sl; return sl; } + + virtual void process(unsigned, float*, float*, float*); + virtual void play(const PlayEvent&); +@@ -118,7 +118,7 @@ class Aeolus : public Synthesizer { + + // get/set synthesizer state + virtual SynthesizerGroup state() const; +- virtual void setState(const SynthesizerGroup&); ++ virtual bool setState(const SynthesizerGroup&); + + virtual void allSoundsOff(int channel) { allNotesOff(channel); } + virtual void allNotesOff(int /*channel*/); +--- MuseScore-3.4.2/aeolus/model.cpp.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/aeolus/model.cpp 2020-02-07 14:45:03.709820560 -0700 +@@ -745,7 +745,7 @@ int Model::write_instr() + Ifelm *I; + Addsynth *A; + +- sprintf (buff, "%s/definition", _instr); ++ snprintf (buff, sizeof(buff), "%s/definition", _instr); + if (! (F = fopen (buff, "w"))) + { + fprintf (stderr, "Can't open '%s' for writing\n", buff); +@@ -963,7 +963,7 @@ bool Model::writePresets() + uchar data [256]; + FILE *F; + +- sprintf (name, "%s/presets", _instr); ++ snprintf (name, sizeof(name), "%s/presets", _instr); + if (! (F = fopen (name, "w"))) { + fprintf (stderr, "Can't open '%s' for writing\n", name); + return 1; +--- MuseScore-3.4.2/aeolus/sparm.cpp.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/aeolus/sparm.cpp 2020-02-07 14:45:03.709820560 -0700 +@@ -110,12 +110,12 @@ bool SyntiParameterData::operator==(cons + // write + //--------------------------------------------------------- + +-void SyntiParameterData::write(Xml& xml) const ++void SyntiParameterData::write(XmlWriter& xml) const + { + if (_type == SP_FLOAT) + xml.tagE(QString("f name=\"%1\" val=\"%3\"").arg(_name).arg(_fval)); + else if (_type == SP_STRING) +- xml.tagE(QString("s name=\"%1\" val=\"%3\"").arg(_name).arg(Xml::xmlString(_sval))); ++ xml.tagE(QString("s name=\"%1\" val=\"%3\"").arg(_name).arg(XmlWriter::xmlString(_sval))); + } + + //--------------------------------------------------------- +@@ -189,7 +189,7 @@ SyntiParameterType SyntiParameter::type( + // write + //--------------------------------------------------------- + +-void SyntiParameter::write(Xml& xml) const ++void SyntiParameter::write(XmlWriter& xml) const + { + d->write(xml); + } +--- MuseScore-3.4.2/aeolus/sparm.h.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/aeolus/sparm.h 2020-02-07 14:45:03.710820543 -0700 +@@ -21,7 +21,7 @@ + #define __SPARM_H__ + + namespace Ms { +- class Xml; ++ class XmlWriter; + class Synth; + } + +@@ -54,7 +54,7 @@ class SyntiParameter { + + SyntiParameterType type() const; + +- void write(Ms::Xml&) const; ++ void write(Ms::XmlWriter&) const; + + const QString& name() const; + void setName(const QString& s); +--- MuseScore-3.4.2/aeolus/sparm_p.h.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/aeolus/sparm_p.h 2020-02-07 14:45:03.710820543 -0700 +@@ -70,7 +70,7 @@ class SyntiParameterData : public QShare + SyntiParameterData(int id, const QString& name, const QString& val); + SyntiParameterData(const SyntiParameterData& pd); + +- virtual void write(Ms::Xml&) const; ++ virtual void write(Ms::XmlWriter&) const; + virtual bool operator==(const SyntiParameterData&) const; + virtual void print() const; + diff --git a/mscore-3.4.2-fix-qmake-path.patch b/mscore-3.4.2-fix-qmake-path.patch new file mode 100644 index 0000000..8ed1eae --- /dev/null +++ b/mscore-3.4.2-fix-qmake-path.patch @@ -0,0 +1,11 @@ +--- MuseScore-3.4.2/build/FindQt5.cmake.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/build/FindQt5.cmake 2020-02-07 14:43:53.032977808 -0700 +@@ -37,7 +37,7 @@ endforeach() + + 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 diff --git a/mscore-3.4.2-separate-commonfiles.patch b/mscore-3.4.2-separate-commonfiles.patch new file mode 100644 index 0000000..51b08de --- /dev/null +++ b/mscore-3.4.2-separate-commonfiles.patch @@ -0,0 +1,50 @@ +--- MuseScore-3.4.2/libmscore/figuredbass.cpp.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/libmscore/figuredbass.cpp 2020-02-07 14:32:46.893838253 -0700 +@@ -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.4.2/libmscore/mscore.cpp.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/libmscore/mscore.cpp 2020-02-11 19:31:51.855823910 -0700 +@@ -348,7 +348,7 @@ void MScore::init() + // do not load application specific fonts + // for MAC, they are in Resources/fonts + // +-#if !defined(Q_OS_MAC) && !defined(Q_OS_IOS) ++#if 0 + static const char* fonts[] = { + ":/fonts/musejazz/MuseJazzText.otf", + ":/fonts/campania/Campania.otf", +--- MuseScore-3.4.2/libmscore/stafftype.cpp.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/libmscore/stafftype.cpp 2020-02-07 14:32:46.895838221 -0700 +@@ -1203,7 +1203,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.4.2/libmscore/sym.cpp.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/libmscore/sym.cpp 2020-02-07 14:32:46.896838204 -0700 +@@ -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.4.2-unbundle.patch b/mscore-3.4.2-unbundle.patch new file mode 100644 index 0000000..2c24bec --- /dev/null +++ b/mscore-3.4.2-unbundle.patch @@ -0,0 +1,68 @@ +--- MuseScore-3.4.2/mscore/musescorefonts-Bravura.qrc.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/mscore/musescorefonts-Bravura.qrc 2020-02-07 14:44:34.119305068 -0700 +@@ -1,6 +1,6 @@ + + +- ../fonts/bravura/Bravura.otf +- ../fonts/bravura/BravuraText.otf ++ /usr/share/fonts/bravura/Bravura.otf ++ /usr/share/fonts/bravura/BravuraText.otf + + +--- MuseScore-3.4.2/mscore/musescorefonts-Free.qrc.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/mscore/musescorefonts-Free.qrc 2020-02-07 14:44:34.120305051 -0700 +@@ -1,8 +1,8 @@ + + +- ../fonts/FreeSerifBold.ttf +- ../fonts/FreeSerifItalic.ttf +- ../fonts/FreeSerifBoldItalic.ttf +- ../fonts/FreeSans.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/gnu-free/FreeSans.ttf + + +--- MuseScore-3.4.2/mscore/musescorefonts-FreeSerif.qrc.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/mscore/musescorefonts-FreeSerif.qrc 2020-02-07 14:44:34.120305051 -0700 +@@ -1,5 +1,5 @@ + + +- ../fonts/FreeSerif.ttf ++ /usr/share/fonts/gnu-free/FreeSerif.ttf + + +--- MuseScore-3.4.2/mscore/musescore.h.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/mscore/musescore.h 2020-02-07 14:44:34.120305051 -0700 +@@ -22,7 +22,7 @@ + + #include "config.h" + #include "globals.h" +-#include "singleapp/src/QtSingleApplication" ++#include + #include "updatechecker.h" + #include "libmscore/musescoreCore.h" + #include "libmscore/score.h" +--- MuseScore-3.4.2/mscore/musescore.qrc.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/mscore/musescore.qrc 2020-02-07 14:44:34.121305035 -0700 +@@ -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.4.2/mtest/mtest.qrc.orig 2020-02-06 14:13:07.000000000 -0700 ++++ MuseScore-3.4.2/mtest/mtest.qrc 2020-02-07 14:44:34.121305035 -0700 +@@ -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.spec b/mscore.spec index 4a7e34b..63e189b 100644 --- a/mscore.spec +++ b/mscore.spec @@ -1,10 +1,10 @@ %global fontfamilyname %{name} -%global shortver 3.3 +%global shortver 3.4 Name: mscore Summary: Music Composition & Notation Software -Version: %{shortver}.4 -Release: 5%{?dist} +Version: %{shortver}.2 +Release: 1%{?dist} # rtf2html is LGPLv2+ # paper4.png paper5.png are LGPLv3 # the rest is GPLv2 @@ -12,37 +12,35 @@ Release: 5%{?dist} 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 - # For mime types Source1: %{name}.xml # Add metainfo file for font to show in gnome-software Source2: %{fontfamilyname}.metainfo.xml -# Use Fedora's default soundfont directory instead of the custom location -Patch0: mscore-3.2.3-use-default-soundfont.patch # We don't build the common files (font files, wallpapers, demo song, instrument # 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.3.0-separate-commonfiles.patch +Patch0: mscore-3.4.2-separate-commonfiles.patch # Ensure CMake will use qmake-qt5 -Patch2: mscore-3.2.3-fix-qmake-path.patch +Patch1: mscore-3.4.2-fix-qmake-path.patch # Unbundle gnu-free-{sans,serif}-fonts, kqoauth, QtSingleApplication, and # steinberg-bravura{,-text}-fonts -Patch3: mscore-3.3.0-unbundle.patch +Patch2: mscore-3.4.2-unbundle.patch # Fix some glitches in the aeolus code -Patch4: mscore-3.3.0-aeolus.patch +Patch3: mscore-3.4.2-aeolus.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fontforge BuildRequires: fontpackages-devel BuildRequires: gcc-c++ +BuildRequires: gnu-free-sans-fonts +BuildRequires: gnu-free-serif-fonts BuildRequires: lame-devel BuildRequires: perl(Pod::Usage) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(jack) -BuildRequires: pkgconfig(kqoauth) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(poppler-qt5) BuildRequires: pkgconfig(portaudiocpp) @@ -76,6 +74,7 @@ Requires: steinberg-bravura-fonts Requires: steinberg-bravura-text-fonts %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} # For scripting +Requires: qt5-qtquickcontrols%{?_isa} = %{_qt5_version} Requires: qt5-qtquickcontrols2%{?_isa} = %{_qt5_version} # Doxygen documentation is huge and it is for musescore development only. @@ -99,24 +98,24 @@ highlights: * Import and export of MusicXML and Standard MIDI Files (SMF) * Translated in 26 languages -%package doc +%package doc Summary: MuseScore documentation License: CC-BY Requires: %{name} = %{version}-%{release} BuildArch: noarch -%description doc +%description doc MuseScore is a free cross platform WYSIWYG music notation program. This package contains the user manual of MuseScore in different languages. -%package fonts +%package fonts Summary: MuseScore fonts License: GPL+ with exceptions and OFL Requires: fontpackages-filesystem BuildArch: noarch -%description fonts +%description fonts MuseScore is a free cross platform WYSIWYG music notation program. This package contains the musical notation fonts for use of MuseScore. @@ -125,8 +124,9 @@ This package contains the musical notation fonts for use of MuseScore. %autosetup -p1 -c # Remove bundled stuff -rm -vrf thirdparty/{freetype,kQOAuth,openssl,poppler,portmidi,singleapp} +rm -vrf thirdparty/{freetype,openssl,poppler,portmidi,singleapp} rm -vrf fonts/{bravura,FreeS*} +rm -vrf cmake # Force Fedora specific flags: find . -name CMakeLists.txt -exec sed -i -e 's|-O3|%{optflags}|' {} \+ @@ -250,7 +250,8 @@ mv thirdparty/rtf2html/README README.rtf2html 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 %{buildroot}%{_datadir}/%{name}-%{shortver}/sound/MuseScore_General_License.md \ + COPYING.MuseScore_General mv fonts/campania/LICENSE COPYING.OFL # Add AppStream metadata @@ -261,6 +262,11 @@ install -Dm 0644 -p %{SOURCE2} \ rm -f %{buildroot}%{_bindir}/QtWebEngineProcess rm -fr %{buildroot}%{_prefix}/lib +# Move the soundfonts to where the rest of the system expects them to be +mv %{buildroot}%{_datadir}/%{name}-%{shortver}/sound \ + %{buildroot}%{_datadir}/soundfonts +ln -s ../soundfonts %{buildroot}%{_datadir}/%{name}-%{shortver}/sound + %check # iotest seems outdated. Skipping. # reftest needs the X server. Skipping. @@ -278,6 +284,7 @@ rm -fr %{buildroot}%{_prefix}/lib %exclude %{_datadir}/mime/packages/musescore.xml %{_datadir}/mime/packages/mscore.xml %{_mandir}/man1/* +%{_datadir}/soundfonts/aeolus/ %{_datadir}/soundfonts/MuseScore_General.sf3 %files doc @@ -294,6 +301,12 @@ rm -fr %{buildroot}%{_prefix}/lib %{_datadir}/appdata/%{fontfamilyname}.metainfo.xml %changelog +* Mon Feb 17 2020 Jerry James - 3.4.2-1 +- Version 3.4.2 +- Drop the -user-default-soundfont patch; use a symlink instead +- R both qt5-qtquickcontrols and qt5-qtquickcontrols2; both seem to be used +- kQOAuth is no longer used, so drop unbundling + * Wed Jan 29 2020 Fedora Release Engineering - 3.3.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 88f9f9a..082bca0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (MuseScore-3.3.4.zip) = 50ea60282a19388afdf04783b6034958571e210ee4dde80d8d981b300dce5b2ec20c564142e97b2d078302c3addfe2d0011c7441088550f938a70e7c50c452cf +SHA512 (MuseScore-3.4.2.zip) = 49f8dd28e017499f6b48f626ef40bde06e9dd3dadcb09ebe24aa0b02c9df0c2e066c0d73d51a55e76be475af0461acf660ad33aa2206e7321f4064ed5e142a11