gnu: musescore: Update to 4.5.2-0.6ebc98e.

* 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

View file

@ -1903,7 +1903,6 @@ dist_patch_DATA = \
%D%/packages/patches/mswebrtc-cmake.patch \
%D%/packages/patches/mtools-mformat-uninitialized.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/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \

View file

@ -47,7 +47,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022, 2023 Sughosha <sughosha@disroot.org>
;;; 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 Jose G Perez Taveras <josegpt27@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de>
@ -5516,24 +5516,24 @@ includes LV2 plugins and a JACK standalone client.")
(license license:bsd-2)))
(define-public musescore
(let ((commit "6ebc98e021ba9d677fffa31255f8a53e60753724")
(revision "0"))
(package
(name "musescore")
(version "4.5.2")
(version (git-version "4.5.2" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/musescore/MuseScore")
(commit (string-append "v" version))))
(commit commit)))
(file-name (git-file-name name version))
(patches (search-patches "musescore-fix-build.patch"))
(sha256
(base32 "12lwv0gxd49dily2hwmadbw6c59h11sfm5751dpfnzzjvj3rydpn"))
(modules '((guix build utils)))))
(base32 "09a9wdfvjimapghygpbdpyr1y5zznnagbmxz9ahmslph5lflrhza"))))
(build-system qt-build-system)
(arguments
(list
#:qtbase qtbase ;Qt 6
#:qtbase qtbase ;for qt 6
#:configure-flags
#~(list
"-DMUSE_APP_BUILD_MODE=release"
@ -5563,12 +5563,15 @@ includes LV2 plugins and a JACK standalone client.")
;; Basically, it requires to start a whole new build process.
;; So we simply skip them.
#:tests? #f))
(native-inputs (list git-minimal pkg-config qttools))
(native-inputs
(list git-minimal
`(,gtk+ "bin") ;for gtk-update-icon-cache
pkg-config
qttools))
(inputs
(list alsa-lib
flac
freetype
`(,gtk+ "bin") ;for gtk-update-icon-cache
harfbuzz
jack-1
lame
@ -5605,7 +5608,7 @@ appearance and layout are provided.
MuseScore can also play back scores through the built-in sequencer and SoundFont
sample library.")
(home-page "https://musescore.org")
(license license:gpl3)))
(license license:gpl3))))
(define-public muse-sequencer
(package

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);