Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
audio/musescore: update to 4.2.1, latest upstream
While here, add a .desktop file as requested in PR 275314 .
- Loading branch information
Adriaan de Groot
authored and
Adriaan de Groot
committed
Feb 27, 2024
1 parent
8de7c0d
commit d2a73d2
Showing
14 changed files
with
179 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1694947674 | ||
| SHA256 (musescore-MuseScore-v4.1.1_GH0.tar.gz) = 3e53ce88b98c08422c8f8dc8c71c6e31d1038c2b263649f6647de6fa4269ce9b | ||
| SIZE (musescore-MuseScore-v4.1.1_GH0.tar.gz) = 131007032 | ||
| TIMESTAMP = 1707166162 | ||
| SHA256 (musescore-MuseScore-v4.2.1_GH0.tar.gz) = 9636b303afdb44228dc6d64dbc14773b60840dec7225602d79b126d97f555680 | ||
| SIZE (musescore-MuseScore-v4.2.1_GH0.tar.gz) = 136655690 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| [Desktop Entry] | ||
| Version=1.0 | ||
| Name=MuseScore 4.2 | ||
| GenericName=Music notation | ||
| GenericName[de]=Notensatz | ||
| GenericName[fr]=Notation musicale | ||
| Comment=Create, play and print sheet music | ||
| Comment[ru]=Визуальный редактор нотных партитур | ||
| Comment[fr]=Gravure de partitions musicales | ||
| Exec=mscore %F | ||
| Icon=mscore | ||
| StartupNotify=true | ||
| StartupWMClass=mscore | ||
| Terminal=false | ||
| Type=Application | ||
| Categories=Qt;Audio;Sequencer;Midi;AudioVideoEditing;Music;AudioVideo; | ||
| Keywords=music;notation;composition;composing;arranging;making;sheet music;music notation software;lead sheet;leadsheet;score;full score;scorewriter;MIDI;musicxml;playback;instrument; | ||
| Keywords[de]=Musik;Noten;Musiknoten;Komposition;Komponieren;Arrangieren;Notenblatt;Notenblätter;Notationsprogramm;Musiknotationsprogramm;Musiknotation;Tabulatur;MIDI;musicxml;Instrument; | ||
| MimeType=application/x-musescore;application/x-musescore+xml;application/vnd.recordare.musicxml;application/vnd.recordare.musicxml+xml;audio/midi;application/x-bww;application/x-biab;application/x-capella;audio/x-gtp;application/x-musedata;application/x-overture;audio/x-ptb;application/x-sf2;application/x-sf3; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
audio/musescore/files/patch-build_cmake_GetPlatformInfo.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- build/cmake/GetPlatformInfo.cmake.orig 2024-02-06 21:53:14 UTC | ||
| +++ build/cmake/GetPlatformInfo.cmake | ||
| @@ -29,6 +29,7 @@ elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows") | ||
| elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") | ||
| set(OS_IS_LIN 1) | ||
| elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD") | ||
| + set(OS_IS_LIN 1) | ||
| set(OS_IS_FBSD 1) | ||
| elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin") | ||
| set(OS_IS_MAC 1) |
11 changes: 11 additions & 0 deletions
11
audio/musescore/files/patch-src_framework_ui_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- src/framework/ui/CMakeLists.txt.orig 2024-02-08 21:39:07 UTC | ||
| +++ src/framework/ui/CMakeLists.txt | ||
| @@ -48,6 +48,8 @@ elseif(OS_IS_LIN) | ||
| set(PLATFORM_THEME_SRC | ||
| ${CMAKE_CURRENT_LIST_DIR}/internal/platform/linux/linuxplatformtheme.cpp | ||
| ${CMAKE_CURRENT_LIST_DIR}/internal/platform/linux/linuxplatformtheme.h | ||
| + ${CMAKE_CURRENT_LIST_DIR}/internal/platform/stub/stubplatformtheme.cpp | ||
| + ${CMAKE_CURRENT_LIST_DIR}/internal/platform/stub/stubplatformtheme.h | ||
| ) | ||
| else() | ||
| set(PLATFORM_THEME_SRC |
17 changes: 17 additions & 0 deletions
17
audio/musescore/files/patch-src_framework_ui_internal_platform_stub_stubplatformtheme.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| --- src/framework/ui/internal/platform/stub/stubplatformtheme.cpp.orig 2024-02-08 19:49:06 UTC | ||
| +++ src/framework/ui/internal/platform/stub/stubplatformtheme.cpp | ||
| @@ -25,6 +25,8 @@ | ||
| using namespace mu::ui; | ||
| using namespace mu::async; | ||
|
|
||
| +namespace mu::ui { | ||
| +StubPlatformTheme::~StubPlatformTheme() = default; | ||
| void StubPlatformTheme::startListening() | ||
| { | ||
| } | ||
| @@ -59,4 +61,5 @@ void StubPlatformTheme::applyPlatformStyleOnAppForThem | ||
|
|
||
| void StubPlatformTheme::applyPlatformStyleOnWindowForTheme(QWindow*, const ThemeCode&) | ||
| { | ||
| +} | ||
| } |
10 changes: 10 additions & 0 deletions
10
audio/musescore/files/patch-src_framework_ui_internal_platform_stub_stubplatformtheme.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- src/framework/ui/internal/platform/stub/stubplatformtheme.h.orig 2024-02-08 19:49:29 UTC | ||
| +++ src/framework/ui/internal/platform/stub/stubplatformtheme.h | ||
| @@ -29,6 +29,7 @@ namespace mu::ui { | ||
| class StubPlatformTheme : public IPlatformTheme | ||
| { | ||
| public: | ||
| + ~StubPlatformTheme() override; | ||
| void startListening() override; | ||
| void stopListening() override; | ||
|
|
24 changes: 24 additions & 0 deletions
24
audio/musescore/files/patch-src_importexport_musicxml_internal_musicxml_exportxml.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| --- src/importexport/musicxml/internal/musicxml/exportxml.cpp.orig 2024-02-05 22:14:10 UTC | ||
| +++ src/importexport/musicxml/internal/musicxml/exportxml.cpp | ||
| @@ -3624,8 +3624,8 @@ static void writeBeam(XmlWriter& xml, ChordRest* const | ||
| // TODO: correctly handle Beam::Mode::AUTO | ||
| // when equivalent to BEGIN32 or BEGIN64 | ||
| if ((blp < i && bln >= i) | ||
| - || bmc == BeamMode::BEGIN16 && i > 1 | ||
| - || bmc == BeamMode::BEGIN32 && i > 2) { | ||
| + || (bmc == BeamMode::BEGIN16 && i > 1) | ||
| + || (bmc == BeamMode::BEGIN32 && i > 2)) { | ||
| text = "begin"; | ||
| } else if (blp < i && bln < i) { | ||
| if (bln > 0) { | ||
| @@ -3634,8 +3634,8 @@ static void writeBeam(XmlWriter& xml, ChordRest* const | ||
| text = "backward hook"; | ||
| } | ||
| } else if ((blp >= i && bln < i) | ||
| - || bmn == BeamMode::BEGIN16 && i > 1 | ||
| - || bmn == BeamMode::BEGIN32 && i > 2) { | ||
| + || (bmn == BeamMode::BEGIN16 && i > 1) | ||
| + || (bmn == BeamMode::BEGIN32 && i > 2)) { | ||
| text = "end"; | ||
| } else if (blp >= i && bln >= i) { | ||
| text = "continue"; |
11 changes: 11 additions & 0 deletions
11
audio/musescore/files/patch-src_importexport_musicxml_internal_musicxml_importmxmlpass1.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- src/importexport/musicxml/internal/musicxml/importmxmlpass1.h.orig 2024-02-05 22:17:12 UTC | ||
| +++ src/importexport/musicxml/internal/musicxml/importmxmlpass1.h | ||
| @@ -179,7 +179,7 @@ class MusicXMLParserPass1 (public) | ||
| bool hasBeamingInfo() const { return _hasBeamingInfo; } | ||
| bool isVocalStaff(const QString& id) const { return _parts[id].isVocalStaff(); } | ||
| static VBox* createAndAddVBoxForCreditWords(Score* const score, const int miny = 0, const int maxy = 75); | ||
| - const int maxDiff() { return _maxDiff; } | ||
| + int maxDiff() const { return _maxDiff; } | ||
| void insertAdjustedDuration(Fraction key, Fraction value) { _adjustedDurations.insert(key, value); } | ||
| QMap<Fraction, Fraction>& adjustedDurations() { return _adjustedDurations; } | ||
| void insertSeenDenominator(int val) { _seenDenominators.emplace(val); } |
11 changes: 11 additions & 0 deletions
11
audio/musescore/files/patch-src_importexport_musicxml_internal_musicxml_musicxmlsupport.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp.orig 2024-02-05 22:18:41 UTC | ||
| +++ src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp | ||
| @@ -34,6 +34,8 @@ | ||
|
|
||
| #include "log.h" | ||
|
|
||
| +#include <QXmlStreamReader> | ||
| + | ||
| using AccidentalType = mu::engraving::AccidentalType; | ||
| using SymId = mu::engraving::SymId; | ||
| const static QMap<QString, AccidentalType> smuflAccidentalTypes { |
11 changes: 11 additions & 0 deletions
11
audio/musescore/files/patch-src_project_internal_exporttype.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- src/project/internal/exporttype.cpp.orig 2024-02-27 16:37:17 UTC | ||
| +++ src/project/internal/exporttype.cpp | ||
| @@ -21,6 +21,8 @@ | ||
| */ | ||
| #include "exporttype.h" | ||
|
|
||
| +#include <QVariantList> | ||
| + | ||
| using namespace mu::project; | ||
|
|
||
| ExportTypeList::ExportTypeList() |
13 changes: 13 additions & 0 deletions
13
audio/musescore/files/patch-src_project_internal_exporttype.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- src/project/internal/exporttype.h.orig 2024-01-23 09:35:14 UTC | ||
| +++ src/project/internal/exporttype.h | ||
| @@ -26,6 +26,10 @@ | ||
|
|
||
| #include "containers.h" | ||
|
|
||
| +#include <QList> | ||
| +#include <QString> | ||
| +#include <QVariantList> | ||
| + | ||
| namespace mu::project { | ||
| struct ExportType; | ||
| class ExportTypeList : public QList<ExportType> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters