From 8b31d5da6d7f3792c69cdabeafdba7739744d1bb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 3 Jul 2025 20:24:36 +0300 Subject: [PATCH] musescore: 4.5.2 -> 4.5.2-unstable-2025-07-03 --- pkgs/applications/audio/musescore/default.nix | 16 +++------------- pkgs/applications/audio/musescore/qt-6.9.patch | 13 ------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/audio/musescore/qt-6.9.patch diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 315ed5932fb5..d5937376d1d7 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -36,25 +36,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.5.2"; + version = "4.5.2-unstable-2025-07-03"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-9jafh9zyf+tuC+WU6nQIMBVm+Gqqcig8jS2R1h/YnIo="; + rev = "0ff2476af4e16286ee9f7cf2322715273a0117e0"; + sha256 = "sha256-0ixQfAyAyRmuIrlPosCV/VucKJYYvxjL2o4pkVb5Sd8="; }; - # Backport + additional patch to fix build on Qt 6.9 - # FIXME: remove when no longer required - patches = [ - (fetchpatch { - url = "https://github.com/musescore/MuseScore/commit/05056ed19520060c3912a09a3adfa0927057f956.patch"; - hash = "sha256-50Hytuu2lQRbAI2JEwlKeMUmJxTUtfqgwru6U760hAY="; - }) - ./qt-6.9.patch - ]; - cmakeFlags = [ "-DMUSE_APP_BUILD_MODE=release" # Disable the build and usage of the `/bin/crashpad_handler` utility - it's diff --git a/pkgs/applications/audio/musescore/qt-6.9.patch b/pkgs/applications/audio/musescore/qt-6.9.patch deleted file mode 100644 index d4cc3cacb556..000000000000 --- a/pkgs/applications/audio/musescore/qt-6.9.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/palette/view/widgets/specialcharactersdialog.cpp b/src/palette/view/widgets/specialcharactersdialog.cpp -index 2fe07bdb8f..dfcae1ded7 100644 ---- a/src/palette/view/widgets/specialcharactersdialog.cpp -+++ b/src/palette/view/widgets/specialcharactersdialog.cpp -@@ -712,7 +712,7 @@ void SpecialCharactersDialog::populateUnicode() - std::shared_ptr fs = std::make_shared(gpaletteScore->dummy()); - fs->setCode(code); - fs->setFont(m_font); -- m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QLatin1Char('0'))); -+ m_pUnicode->appendElement(fs, QString("0x%1").arg((uint32_t)code, 5, 16, QLatin1Char('0'))); - } - } -