From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 75037@debbugs.gnu.org
Cc: Rovanion Luckey <rovanion.luckey@gmail.com>
Subject: [bug#75037] [PATCH gnome-team v2 2/2] gnu: musescore: Update to 4.4.4.
Date: Wed, 08 Jan 2025 13:01:32 +0100 [thread overview]
Message-ID: <9da58939db312dfae999c43df31e3c3944221043.camel@gmail.com> (raw)
In-Reply-To: <c047da63dbcb34594a041a930d706a427172caef.1736336958.git.liliana.prikler@gmail.com>
Am Mittwoch, dem 01.01.2025 um 19:37 +0100 schrieb Rovanion Luckey:
> * gnu/packages/music.scm (musescore): Update to 4.4.4.
>
> This update was a major one as it upgraded Qt from 5 to 6.
>
> Change-Id: Ib5da630b73889625054f88b1e86af1e9666e6e93
> Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
> ---
Ignore this, it's not yet signed off.
> gnu/packages/music.scm | 63 +++++++++++++++++++++++++---------------
> --
> 1 file changed, 37 insertions(+), 26 deletions(-)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index fc6e774eda..7fe78484fd 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -38,7 +38,7 @@
> ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
> ;;; Copyright © 2021 Bonface Munyoki Kilyungi
> <me@bonfacemunyoki.com>
> ;;; Copyright © 2021 Frank Pursel <frank.pursel@gmail.com>
> -;;; Copyright © 2021 Rovanion Luckey <rovanion.luckey@gmail.com>
> +;;; Copyright © 2021, 2024, 2025 Rovanion Luckey
> <rovanion.luckey@gmail.com>
> ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
> ;;; Copyright © 2021, 2022, 2023 Felix Gruber <felgru@posteo.net>
> ;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
> @@ -5370,7 +5370,7 @@ (define-public sfizz
> (define-public musescore
> (package
> (name "musescore")
> - (version "4.3.2")
> + (version "4.4.4")
Looking good so far.
> (source
> (origin
> (method git-fetch)
> @@ -5379,21 +5379,31 @@ (define-public musescore
> (commit (string-append "v" version))))
> (file-name (git-file-name name version))
> (sha256
> - (base32
> "1hx0l6d7avyfbh88hwn01h9q51mgd9zix91q2kgg1ax73pqxhfs2"))
> - (modules '((guix build utils)))
> - (snippet
> - '(begin
> - ;; Delete precompiled binaries.
> - (delete-file-recursively
> "src/diagnostics/crashpad_handler")
> - (substitute* "src/diagnostics/CMakeLists.txt"
> - (("install") "#install"))))))
> + (base32
> "0cjp1sp50pwmrgvpxjxg849s0vsvk2vcb66ym617nvlj761h0ngz"))
> + (modules '((guix build utils)))))
This change is undocumented. If you do drop the snippet (is it really
safe to?), then you can also drop the modules.
> (build-system qt-build-system)
> (arguments
> - `(#:configure-flags
> - `("-DDOWNLOAD_SOUNDFONT=OFF"
> - "-DBUILD_DIAGNOSTICS=OFF"
> - "-DMUSESCORE_BUILD_CONFIG=release"
> - "-DUSE_SYSTEM_FREETYPE=ON")
> + `(#:qtbase ,qtbase
Is this flag needed? Anyway, new flags should be documented…
> + #:configure-flags
> + `("-DMUSE_APP_BUILD_MODE=release"
> + ;; Disable the build and usage of the
> `/bin/crashpad_handler` utility -
> + ;; it does automatic crash reporting and is distributed as
> a
> + ;; pre-compiled binary in the source-tree of MuseScore:
> + ;; https://github.com/musescore/MuseScore/issues/15571
> + ;; Renamed from MUE_BUILD_CRASHPAD_CLIENT,
> MUE_BUILD_DIAGNOSTICS_MODULE
> + ;;
> https://github.com/musescore/MuseScore/commit/6f269e8b072cca36cb76eb016cb60c1c1c2b9906
> + "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF"
> + ;; Use Guix' versions of system libraries.
> + "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON"
> + "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON"
> + "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON"
> + "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" ; Ipmlies -
> DMUE_COMPILE_USE_SYSTEM_OPUS=ON
> + "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON"
> + ;; Disable download of soundfont during build.
> + "-DDOWNLOAD_SOUNDFONT=OFF"
> + ;; Don't bundle Qt QML files, relevant really only for
> Darwin.
> + ;; "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF"
> + )
… as should changes here. Is everything renamed from MUSE to MUE or
are these typos?
Also, parentheses are social animals, they like to group together :)
> ;; There are tests, but no simple target to run. The command
> used to
> ;; run them is:
> ;;
> @@ -5404,30 +5414,31 @@ (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))
Write this out in the ChangeLog.
> (inputs
> (list alsa-lib
> freetype
> `(,gtk+ "bin") ;for gtk-update-icon-cache
> + harfbuzz-meson
Whoopsie, this can be regular harfbuzz with the new 1/2.
> jack-1
> lame
> libogg
> + libopusenc
> libsndfile
> libvorbis
> portaudio
> portmidi
> pulseaudio
> python
> - qtbase-5
> - qtdeclarative-5
> - qtgraphicaleffects
> - qtnetworkauth-5
> - qtquickcontrols-5
> - qtquickcontrols2-5
> - qtscript
> - qtsvg-5
> - qtx11extras
> - qtxmlpatterns))
> + qt5compat
> + qtbase
> + qtdeclarative
> + qtnetworkauth
> + qtscxml
> + qtshadertools
> + qtsvg
> + qtwayland
> + tinyxml2))
Write these out in the ChangeLog.
> (propagated-inputs
> (list `(,alsa-plugins "pulseaudio"))) ;for
> libasound_module_conf_pulse.so
> (synopsis "Music composition and notation software")
Cheers
prev parent reply other threads:[~2025-01-08 12:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-22 22:45 [bug#75037] WIP: Upgrade MuseScore to 4.4.4 Rovanion Luckey
2025-01-01 20:14 ` [bug#75037] " Rovanion Luckey
2025-01-08 11:46 ` [bug#75037] [PATCH gnome-team v2 1/2] gnu: harfbuzz: Build with meson Liliana Marie Prikler
2025-01-01 18:37 ` [bug#75037] [PATCH gnome-team v2 2/2] gnu: musescore: Update to 4.4.4 Rovanion Luckey
2025-01-08 12:01 ` Liliana Marie Prikler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9da58939db312dfae999c43df31e3c3944221043.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=75037@debbugs.gnu.org \
--cc=rovanion.luckey@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).