amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: musescore: Update to 4.5.2-0.6ebc98e.

Browse source 
* gnu/packages/music.scm (musescore): Update to 4.5.2-0.6ebc98e.
[source] <modules, patches>: Delete fields.
[inputs]: Move gtk+:bin to...
[native-inputs]: ... here.
* gnu/packages/patches/musescore-fix-build.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.

Change-Id: If3f261b13bc01cae581db5822a44815909157ceb
This commit is contained in:
Maxim Cournoyer 2025-09-15 22:21:51 +09:00
parent 4fbf920dc1
commit 2b70a3d191
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 83 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1903,7 +1903,6 @@ dist_patch_DATA = \
%D%/packages/patches/mswebrtc-cmake.patch \ %D%/packages/patches/mswebrtc-cmake.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/musescore-fix-build.patch \
%D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/musl-cross-locale.patch \
%D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \ %D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \

163
gnu/packages/music.scm
View file

@ -47,7 +47,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022, 2023 Sughosha <sughosha@disroot.org> ;;; Copyright © 2022, 2023 Sughosha <sughosha@disroot.org>
;;; Copyright © 2022, 2025 Remco van 't Veer <remco@remworks.net> ;;; Copyright © 2022, 2025 Remco van 't Veer <remco@remworks.net>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com> ;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com> ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; Copyright © 2022 jgart <jgart@dismail.de>
@ -5516,84 +5516,87 @@ includes LV2 plugins and a JACK standalone client.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public musescore (define-public musescore
(package (let ((commit "6ebc98e021ba9d677fffa31255f8a53e60753724")
(name "musescore") (revision "0"))
(version "4.5.2") (package
(source (name "musescore")
(origin (version (git-version "4.5.2" revision commit))
(method git-fetch) (source
(uri (git-reference (origin
(url "https://github.com/musescore/MuseScore") (method git-fetch)
(commit (string-append "v" version)))) (uri (git-reference
(file-name (git-file-name name version)) (url "https://github.com/musescore/MuseScore")
(patches (search-patches "musescore-fix-build.patch")) (commit commit)))
(sha256 (file-name (git-file-name name version))
(base32 "12lwv0gxd49dily2hwmadbw6c59h11sfm5751dpfnzzjvj3rydpn")) (sha256
(modules '((guix build utils))))) (base32 "09a9wdfvjimapghygpbdpyr1y5zznnagbmxz9ahmslph5lflrhza"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
#:qtbase qtbase ;Qt 6 #:qtbase qtbase ;for qt 6
#:configure-flags #:configure-flags
#~(list #~(list
"-DMUSE_APP_BUILD_MODE=release" "-DMUSE_APP_BUILD_MODE=release"
;; Disable the build and usage of the `/bin/crashpad_handler` utility - ;; Disable the build and usage of the `/bin/crashpad_handler` utility -
;; it does automatic crash reporting and is distributed as a ;; it does automatic crash reporting and is distributed as a
;; pre-compiled binary in the source-tree of MuseScore: ;; pre-compiled binary in the source-tree of MuseScore:
;; https://github.com/musescore/MuseScore/issues/15571 ;; https://github.com/musescore/MuseScore/issues/15571
;; Renamed from MUE_BUILD_CRASHPAD_CLIENT, MUE_BUILD_DIAGNOSTICS_MODULE ;; Renamed from MUE_BUILD_CRASHPAD_CLIENT, MUE_BUILD_DIAGNOSTICS_MODULE
;; https://github.com/musescore/MuseScore/commit/6f269e8b072cca36cb76eb016cb60c1c1c2b9906 ;; https://github.com/musescore/MuseScore/commit/6f269e8b072cca36cb76eb016cb60c1c1c2b9906
"-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF" "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF"
;;; These five lines asks that Guix' versions of system libraries are used. ;;; These five lines asks that Guix' versions of system libraries are used.
"-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON" "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON"
"-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON" "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON"
"-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON" "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON"
"-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" ; Implies -DMUE_COMPILE_USE_SYSTEM_OPUS=ON "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" ; Implies -DMUE_COMPILE_USE_SYSTEM_OPUS=ON
"-DMUE_COMPILE_USE_SYSTEM_FLAC=ON" "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON"
;; Disable download of soundfont during build. ;; Disable download of soundfont during build.
"-DDOWNLOAD_SOUNDFONT=OFF" "-DDOWNLOAD_SOUNDFONT=OFF"
;; Don't bundle Qt QML files, relevant really only for Darwin. ;; Don't bundle Qt QML files, relevant really only for Darwin.
"-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF") "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF")
;; There are tests, but no simple target to run. The command used to ;; There are tests, but no simple target to run. The command used to
;; run them is: ;; run them is:
;; ;;
;; make debug && sudo make installdebug && cd \ ;; make debug && sudo make installdebug && cd \
;; build.debug/mtest && make && ctest ;; build.debug/mtest && make && ctest
;; ;;
;; Basically, it requires to start a whole new build process. ;; Basically, it requires to start a whole new build process.
;; So we simply skip them. ;; So we simply skip them.
#:tests? #f)) #:tests? #f))
(native-inputs (list git-minimal pkg-config qttools)) (native-inputs
(inputs (list git-minimal
(list alsa-lib `(,gtk+ "bin") ;for gtk-update-icon-cache
flac pkg-config
freetype qttools))
`(,gtk+ "bin") ;for gtk-update-icon-cache (inputs
harfbuzz (list alsa-lib
jack-1 flac
lame freetype
libogg harfbuzz
libopusenc jack-1
libsndfile lame
libvorbis libogg
portaudio libopusenc
portmidi libsndfile
pulseaudio libvorbis
python portaudio
qt5compat portmidi
qtbase pulseaudio
qtdeclarative python
qtnetworkauth qt5compat
qtscxml qtbase
qtshadertools qtdeclarative
qtsvg qtnetworkauth
qtwayland qtscxml
tinyxml2)) qtshadertools
(propagated-inputs qtsvg
(list `(,alsa-plugins "pulseaudio"))) ;for libasound_module_conf_pulse.so qtwayland
(synopsis "Music composition and notation software") tinyxml2))
(description (propagated-inputs
"MuseScore is a music score typesetter. Its main purpose is the creation (list `(,alsa-plugins "pulseaudio"))) ;for libasound_module_conf_pulse.so
(synopsis "Music composition and notation software")
(description
"MuseScore is a music score typesetter. Its main purpose is the creation
of high-quality engraved musical scores in a WYSIWYG environment. of high-quality engraved musical scores in a WYSIWYG environment.
It supports unlimited staves, linked parts and part extraction, tablature, It supports unlimited staves, linked parts and part extraction, tablature,
@ -5604,8 +5607,8 @@ appearance and layout are provided.
MuseScore can also play back scores through the built-in sequencer and SoundFont MuseScore can also play back scores through the built-in sequencer and SoundFont
sample library.") sample library.")
(home-page "https://musescore.org") (home-page "https://musescore.org")
(license license:gpl3))) (license license:gpl3))))
(define-public muse-sequencer (define-public muse-sequencer
(package (package

23
gnu/packages/patches/musescore-fix-build.patch
View file

@ -1,23 +0,0 @@
--- a/src/instrumentsscene/view/systemobjectslayersettingsmodel.cpp
+++ b/src/instrumentsscene/view/systemobjectslayersettingsmodel.cpp
@@ -83,6 +83,7 @@
void SystemObjectsLayerSettingsModel::setSystemObjectsGroupVisible(int index, bool visible)
{
+ using muse::TranslatableString;
const size_t idx = static_cast<size_t>(index);
if (idx >= m_systemObjectGroups.size()) {
return;
@@ -95,9 +96,9 @@
SystemObjectsGroup& group = m_systemObjectGroups.at(idx);
- const muse::TranslatableString actionName = visible
- ? TranslatableString("undoableAction", "Make system marking(s) visible")
- : TranslatableString("undoableAction", "Make system marking(s) invisible");
+ const TranslatableString actionName = visible
+ ? TranslatableString("undoableAction", "Make system marking(s) visible")
+ : TranslatableString("undoableAction", "Make system marking(s) invisible");
notation->undoStack()->prepareChanges(actionName);