From 0c772688b36c9bc9df6584564f9ebafb39525f17 Mon Sep 17 00:00:00 2001 Message-Id: <0c772688b36c9bc9df6584564f9ebafb39525f17.1727029359.git.rovanion.luckey@gmail.com> From: Rovanion Luckey Date: Sun, 15 Sep 2024 21:59:16 +0200 Subject: [PATCH] gnu: musescore: Update to 4.4.2. * (musescore): Update to 4.4.2. Change-Id: Id7771f90a91ec3fe1695f617cc98b0109bdf87fd --- gnu/packages/music.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git gnu/packages/music.scm gnu/packages/music.scm index 7fa94b6e14..117aa888c9 100644 --- gnu/packages/music.scm +++ gnu/packages/music.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Frank Pursel -;;; Copyright © 2021 Rovanion Luckey +;;; Copyright © 2021-2024 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021, 2022, 2023 Felix Gruber ;;; Copyright © 2021 Simon Streit @@ -5379,7 +5379,7 @@ (define-public sfizz (define-public musescore (package (name "musescore") - (version "4.3.2") + (version "4.4.2") (source (origin (method git-fetch) @@ -5388,13 +5388,13 @@ (define-public musescore (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hx0l6d7avyfbh88hwn01h9q51mgd9zix91q2kgg1ax73pqxhfs2")) + (base32 "13z0snyjvxz8cnp8vcia6bb9mc7zbvsapnvl279fhnfsbf4a62y2")) (modules '((guix build utils))) (snippet '(begin ;; Delete precompiled binaries. - (delete-file-recursively "src/diagnostics/crashpad_handler") - (substitute* "src/diagnostics/CMakeLists.txt" + (delete-file-recursively "src/framework/diagnostics/crashpad_handler") + (substitute* "src/framework/diagnostics/CMakeLists.txt" (("install") "#install")))))) (build-system qt-build-system) (arguments @@ -5402,7 +5402,9 @@ (define-public musescore `("-DDOWNLOAD_SOUNDFONT=OFF" "-DBUILD_DIAGNOSTICS=OFF" "-DMUSESCORE_BUILD_CONFIG=release" - "-DUSE_SYSTEM_FREETYPE=ON") + "-DUSE_SYSTEM_FREETYPE=ON" + ;; MuseScore uses HarfBuzz to compile a vendored FreeType. + "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON") ;; There are tests, but no simple target to run. The command used to ;; run them is: ;; @@ -5413,11 +5415,12 @@ (define-public musescore ;; So we simply skip them. #:tests? #f)) (native-inputs - (list git-minimal pkg-config qttools-5)) + (list git-minimal pkg-config qttools)) (inputs (list alsa-lib freetype `(,gtk+ "bin") ;for gtk-update-icon-cache + harfbuzz jack-1 lame libogg @@ -5427,14 +5430,14 @@ (define-public musescore portmidi pulseaudio python - qtbase-5 - qtdeclarative-5 + qtbase + qtdeclarative qtgraphicaleffects - qtnetworkauth-5 - qtquickcontrols-5 - qtquickcontrols2-5 + qtnetworkauth + qtscxml + qt5compat qtscript - qtsvg-5 + qtsvg qtx11extras qtxmlpatterns)) (propagated-inputs base-commit: b7c94d528875415ea7ec6225d88a6b3d55fa2e14 -- 2.39.2