diff --git a/0dde64eef84.patch b/0dde64eef84.patch index cb37cd0..b64b542 100644 --- a/0dde64eef84.patch +++ b/0dde64eef84.patch @@ -4,10 +4,10 @@ Date: Tue Dec 6 13:19:35 2022 -0700 Fix cmake error when building with jack on Linux -diff --git a/build/cmake/FindJack.cmake b/build/cmake/FindJack.cmake -index 6713e3aeef..d1676fa82b 100644 ---- a/build/cmake/FindJack.cmake -+++ b/build/cmake/FindJack.cmake +Index: MuseScore-4.0.2/build/cmake/FindJack.cmake +=================================================================== +--- MuseScore-4.0.2.orig/build/cmake/FindJack.cmake ++++ MuseScore-4.0.2/build/cmake/FindJack.cmake @@ -28,6 +28,7 @@ IF(BUILD_JACK) set (JACK_LIB "$ENV{${progenv}}/Jack/lib/libjack.a") MESSAGE("JACK support enabled.") diff --git a/MuseScore-4.0.1.tar.gz b/MuseScore-4.0.1.tar.gz deleted file mode 100644 index eb0c362..0000000 --- a/MuseScore-4.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35367bdf473571ed6fb5df6a8d07f56c730c4bce92030216d7fc44bbb884bbe6 -size 123830145 diff --git a/MuseScore-4.0.2.tar.gz b/MuseScore-4.0.2.tar.gz new file mode 100644 index 0000000..b9e629e --- /dev/null +++ b/MuseScore-4.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9907b75e6194405bf8c8d23d2bb1b03343c76258426a8aee11d161390fc4f06d +size 123962958 diff --git a/musescore-4.0.2-return.patch b/musescore-4.0.2-return.patch new file mode 100644 index 0000000..af9c67c --- /dev/null +++ b/musescore-4.0.2-return.patch @@ -0,0 +1,28 @@ +Index: MuseScore-4.0.2/src/project/internal/projectactionscontroller.cpp +=================================================================== +--- MuseScore-4.0.2.orig/src/project/internal/projectactionscontroller.cpp ++++ MuseScore-4.0.2/src/project/internal/projectactionscontroller.cpp +@@ -934,6 +934,7 @@ bool ProjectActionsController::askIfUser + default: + return false; + } ++ return false; + } + + void ProjectActionsController::warnScoreWithoutPartsCannotBeSaved() +@@ -960,6 +961,7 @@ bool ProjectActionsController::askIfUser + case SaveLocationType::Undefined: + return false; + } ++ return false; + } + + void ProjectActionsController::warnCorruptedScoreCannotBeSavedOnCloud(const std::string& errorText, bool canRevert) +@@ -1040,6 +1042,7 @@ bool ProjectActionsController::askIfUser + case SaveLocationType::Undefined: + return false; + } ++ return false; + } + + void ProjectActionsController::showErrCorruptedScoreCannotBeSaved(const SaveLocation& location, const std::string& errorText) diff --git a/musescore.changes b/musescore.changes index 529174b..a80f809 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Thu Mar 16 10:21:13 UTC 2023 - Michael Vetter + +- Update to 4.0.2: + * Score corruption fixes + - Multiple issues causing score corruption have been fixed + - Part scores are now scanned for corruptions + - There is now a more comprehensive system for alerting you + when there are corruptions identified on your score (including + a mechanism to help you avoid saving those corruptions) + * Usability improvements + - The Properties panel has been improved so it's possible to edit + the visibility, colour and play settings of individual notes within chords + - Toggling visibility of notes within chords now produces more predictable results + - Images in frames can now be deleted + - Parts can now be reset to their original layout + - The UI is now easier to interact with when the user is holding the mouse unsteadily + - The audio export process can now be cancelled + - There's a new feature to save relevant diagnostic files (making it + easier to get support from MuseScore developers) + * Performance enhancements + - Major improvements to how MuseScore handles with WASAPI (Benefits Windows users) + * Bugs squashed and regressions repaired + - Various crashes have been fixed (including numerous VST-related crashes) + - Zoom controls in the status bar are easier to use and more intuitive + - Various problems with the visual behaviour of the app on second monitors are now resolved + - Text line spacing option has been reinstated in Properties + - Some playback problems have been resolved, including when entering tablature + notation, and when changing the tempo using the tempo slider + - Multiple other minor bug fixes + * A ton of engraving fixes and improvements + - Multiple fixes to system-line objects + - Several errors arising from setting notes to cue size are resolved + - Fixes to the behaviour of system objects + - Various fixes to the behaviour of stems + - Voices now align correctly in 'full' tab staves + - Sticking in percussion music no longer breaks slurs + - Slurs now show correctly in parts when only some voices are displayed + - Cross-page glissando lines have been finessed + - Various collisions have been resolved (clefs and key signatures, accidentals and cross-staff beams) +- Add musescore-4.0.2-return.patch: to make the compiler happy + ------------------------------------------------------------------- Sat Mar 11 11:07:40 UTC 2023 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 22fd454..acce9cb 100644 --- a/musescore.spec +++ b/musescore.spec @@ -26,7 +26,7 @@ %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore -Version: 4.0.1 +Version: 4.0.2 Release: 0 Summary: A WYSIWYG music score typesetter # Licenses in MuseScore are a mess. To help other maintainers I give the following overview: @@ -65,6 +65,8 @@ Source5: README.SUSE Patch0: use-qtmake-qt5.patch # PATCH-FIX-UPSTREAM: fix build with jack on linux. Patch1: 0dde64eef84.patch +# PATCH-FIX-UPSTREAM: make compiler happy by adding returns +Patch2: musescore-4.0.2-return.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++