* [bug#75037] WIP: Upgrade MuseScore to 4.4.4 @ 2024-12-22 22:45 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 0 siblings, 2 replies; 5+ messages in thread From: Rovanion Luckey @ 2024-12-22 22:45 UTC (permalink / raw) To: 75037 [-- Attachment #1.1: Type: text/plain, Size: 1542 bytes --] Hi, I have been working on and off for the last month to get MuseScore 4.4.x packaged for Guix. I have come so far as to have the project build but not run. The program gets partially through its startup procedure but fails with a QML related error: 23:10:58.058 | WARN | main_thread | Qt | > QQmlApplicationEngine failed to load component > 23:10:58.112 | ERROR | main_thread | GuiApp::perform | error: > qrc:/qml/platform/linux/Main.qml: module "QtQml.WorkerScript" is not > installed > 23:10:58.112 | WARN | main_thread | Qt | > qrc:/qml/platform/linux/Main.qml: module "QtQml.WorkerScript" is not > installed > 23:10:58.112 | WARN | main_thread | Qt | > QObject::connect(QQuickWindow, QApplication): invalid nullptr parameter > 23:10:58.113 | INFO | main_thread | AudioOutputDeviceController::init > | Available output devices changed, checking connection... > 23:10:58.116 | ERROR | main_thread | GuiApp::perform | failed Qml load If anyone has a pointer such are gracefully received. Right now it's time for me to give up for today. Unrelated: The largest change that's needed for this build to work is to change build system for HarfBuzz to meson. This because the makefile based build does not produce correct CMake-files for HarfBuzz. The attached work-in-progress-patch creates a separate package for HarfBuzz for convenience while developing the patch - but the build system should probably be changed for the real HarfBuzz package in the real patch. Cheers! [-- Attachment #1.2: Type: text/html, Size: 1867 bytes --] [-- Attachment #2: 0001-WIP-gnu-music-Update-to-4.4.4.patch --] [-- Type: text/x-patch, Size: 7105 bytes --] From 291b21f68a4248023f9da0b9820a095b7649faa6 Mon Sep 17 00:00:00 2001 Message-ID: <291b21f68a4248023f9da0b9820a095b7649faa6.1734906963.git.rovanion.luckey@gmail.com> From: Rovanion Luckey <rovanion.luckey@gmail.com> Date: Sun, 22 Dec 2024 23:32:21 +0100 Subject: [PATCH] WIP: gnu: music: Update to 4.4.4. * (music): Update to 4.4.4. Change-Id: Ia5509faad497a13e4c8b1e8d0269449fc5426f43 --- gnu/packages/gtk.scm | 40 +++++++++++++++++++++++++++++ gnu/packages/music.scm | 58 +++++++++++++++++++++++++----------------- 2 files changed, 74 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ef1391e8ba..d422403dec 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2024 Rovanion Luckey <rovanion.luckey@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -318,6 +319,45 @@ (define-public harfbuzz "See 'COPYING' in the distribution.")) (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) +(define-public harfbuzz-meson + (package + (name "harfbuzz") + (version "8.3.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/harfbuzz/harfbuzz" + "/releases/download/" version "/harfbuzz-" + version ".tar.xz")) + (sha256 + (base32 + "0izq2lpqxrf1l755nxrxkkiarywkx5j43asznankxplbxgm0358h")))) + (build-system meson-build-system) + (outputs '("out" + "bin")) ;160K, only hb-view depend on cairo + (inputs + (list cairo)) + (propagated-inputs + ;; There are all in the Requires or Requires.private field of '.pc'. + (list glib graphite2 icu4c)) + (native-inputs + (append (list `(,glib "bin")) ;for glib-mkenums + (if (target-hurd?) + '() + (list gobject-introspection)) + (list pkg-config + python-wrapper + which))) + (arguments + (list #:configure-flags + #~(list "-Dgraphite2=enabled" + (string-append "--bindir=" #$output:bin "/bin")))) + (synopsis "OpenType text shaping engine") + (description + "HarfBuzz is an OpenType text shaping engine.") + (license (license:x11-style "file://COPYING" + "See 'COPYING' in the distribution.")) + (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) + (define-public libdatrie (package (name "libdatrie") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2fbdcf4ea9..9de1ea442c 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 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> @@ -5416,7 +5416,7 @@ (define-public sfizz (define-public musescore (package (name "musescore") - (version "4.3.2") + (version "4.4.4") (source (origin (method git-fetch) @@ -5425,21 +5425,30 @@ (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))))) (build-system qt-build-system) (arguments `(#:configure-flags - `("-DDOWNLOAD_SOUNDFONT=OFF" - "-DBUILD_DIAGNOSTICS=OFF" - "-DMUSESCORE_BUILD_CONFIG=release" - "-DUSE_SYSTEM_FREETYPE=ON") + `("-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" + ) ;; There are tests, but no simple target to run. The command used to ;; run them is: ;; @@ -5450,30 +5459,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)) (inputs (list alsa-lib freetype `(,gtk+ "bin") ;for gtk-update-icon-cache + harfbuzz-meson 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 + tinyxml2 + qtbase + qtdeclarative + qtnetworkauth + qt5compat + qtwayland + qtsvg qtx11extras - qtxmlpatterns)) + qtscxml)) (propagated-inputs (list `(,alsa-plugins "pulseaudio"))) ;for libasound_module_conf_pulse.so (synopsis "Music composition and notation software") base-commit: 11855e1c2863c56d9a3364cdac614a529a1c7cc2 -- 2.46.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#75037] Upgrade MuseScore to 4.4.4 2024-12-22 22:45 [bug#75037] WIP: Upgrade MuseScore to 4.4.4 Rovanion Luckey @ 2025-01-01 20:14 ` Rovanion Luckey 2025-01-08 11:46 ` [bug#75037] [PATCH gnome-team v2 1/2] gnu: harfbuzz: Build with meson Liliana Marie Prikler 1 sibling, 0 replies; 5+ messages in thread From: Rovanion Luckey @ 2025-01-01 20:14 UTC (permalink / raw) To: 75037 [-- Attachment #1.1: Type: text/plain, Size: 803 bytes --] Hi, I've now finalized my patch to bring up MuseScore to version 4.4. As different downstream packagers have experienced this upgrade was trickier than usual. Fortunately I could draw from their experiences to reach my now working version. Loading, arranging and playback of arrangements works well. Though there is graphical lag during playback with the playhead visibly juttering. On the Guix side I had to change the build system for Harfbuzz in order for it to build correct CMake-files for MuseScore to consume - rather than build its vendored version. The problem of course is that harfbuzz has about 15 000 dependants. So I created a temporary package named harfbuzz-meson to later be removed with a core-updates merge. So the patches 0001 and 0002 are for master and 0003 is for core-updates. [-- Attachment #1.2: Type: text/html, Size: 902 bytes --] [-- Attachment #2: 0003-gnu-harfbuzz-Switch-build-system-to-meson.patch --] [-- Type: text/x-patch, Size: 3521 bytes --] From 90f9fc42e00b5cc0cd9777fd9393d079883c52fd Mon Sep 17 00:00:00 2001 Message-ID: <90f9fc42e00b5cc0cd9777fd9393d079883c52fd.1735762381.git.rovanion.luckey@gmail.com> In-Reply-To: <8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf.1735762381.git.rovanion.luckey@gmail.com> References: <8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf.1735762381.git.rovanion.luckey@gmail.com> From: Rovanion Luckey <rovanion.luckey@gmail.com> Date: Wed, 1 Jan 2025 21:08:05 +0100 Subject: [PATCH 3/3] gnu: harfbuzz: Switch build system to meson. * gnu/packages/gtk.scm (harfbuzz): Switch build system to meson. * gnu/packages/gtk.scm (harfbuzz-meson): Remove temporary package. Change-Id: I0041beab3bd596f58547351071edb49ebb5077af --- gnu/packages/gtk.scm | 42 +----------------------------------------- gnu/packages/music.scm | 2 +- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 984645f847..83e2b3cd67 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -279,7 +279,7 @@ (define-public cairo-xcb #~(cons "-Dxlib-xcb=enabled" #$flags)))) (synopsis "2D graphics library (with X11 support)"))) -(define-public harfbuzz-meson +(define-public harfbuzz (package (name "harfbuzz") (version "8.3.0") @@ -318,46 +318,6 @@ (define-public harfbuzz-meson "See 'COPYING' in the distribution.")) (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) -(define-public harfbuzz - (package - (name "harfbuzz") - (version "8.3.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/harfbuzz/harfbuzz" - "/releases/download/" version "/harfbuzz-" - version ".tar.xz")) - (sha256 - (base32 - "0izq2lpqxrf1l755nxrxkkiarywkx5j43asznankxplbxgm0358h")))) - (build-system gnu-build-system) - (outputs '("out" - "bin")) ;160K, only hb-view depend on cairo - (inputs - (list cairo)) - (propagated-inputs - ;; There are all in the Requires or Requires.private field of '.pc'. - (list glib graphite2 icu4c)) - (native-inputs - (append (list `(,glib "bin")) ;for glib-mkenums - (if (target-hurd?) - '() - (list gobject-introspection)) - (list pkg-config - python-wrapper - which))) - (arguments - (list #:configure-flags - #~(list "--with-graphite2" - "--with-gobject" - (string-append "--bindir=" #$output:bin "/bin")))) - (synopsis "OpenType text shaping engine") - (description - "HarfBuzz is an OpenType text shaping engine.") - (license (license:x11-style "file://COPYING" - "See 'COPYING' in the distribution.")) - (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) - (define-public libdatrie (package (name "libdatrie") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index afdec7c775..f69aa637fb 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5419,7 +5419,7 @@ (define-public musescore (list alsa-lib freetype `(,gtk+ "bin") ;for gtk-update-icon-cache - harfbuzz-meson + harfbuzz jack-1 lame libogg -- 2.46.0 [-- Attachment #3: 0001-gnu-Add-harfbuzz-meson.patch --] [-- Type: text/x-patch, Size: 3081 bytes --] From 8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf Mon Sep 17 00:00:00 2001 Message-ID: <8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf.1735762381.git.rovanion.luckey@gmail.com> From: Rovanion Luckey <rovanion.luckey@gmail.com> Date: Wed, 1 Jan 2025 20:52:08 +0100 Subject: [PATCH 1/3] gnu: Add harfbuzz-meson. * gnu/packages/gtk.scm (harfbuzz-meson): New variable. Temporary package to cover the need of MuseScore to have Harfbuzz built with Meson in order for it to produce the CMake-files it needs, but without having to rebuild its 15.000 dependants. Later to be removed when the main package is switched over to be built with Meson. Change-Id: I21406452155674a292656142268c40f01902d25d --- gnu/packages/gtk.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ef1391e8ba..984645f847 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2024, 2025 Rovanion Luckey <rovanion.luckey@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -278,6 +279,45 @@ (define-public cairo-xcb #~(cons "-Dxlib-xcb=enabled" #$flags)))) (synopsis "2D graphics library (with X11 support)"))) +(define-public harfbuzz-meson + (package + (name "harfbuzz") + (version "8.3.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/harfbuzz/harfbuzz" + "/releases/download/" version "/harfbuzz-" + version ".tar.xz")) + (sha256 + (base32 + "0izq2lpqxrf1l755nxrxkkiarywkx5j43asznankxplbxgm0358h")))) + (build-system meson-build-system) + (outputs '("out" + "bin")) ;160K, only hb-view depend on cairo + (inputs + (list cairo)) + (propagated-inputs + ;; There are all in the Requires or Requires.private field of '.pc'. + (list glib graphite2 icu4c)) + (native-inputs + (append (list `(,glib "bin")) ;for glib-mkenums + (if (target-hurd?) + '() + (list gobject-introspection)) + (list pkg-config + python-wrapper + which))) + (arguments + (list #:configure-flags + #~(list "-Dgraphite2=enabled" + (string-append "--bindir=" #$output:bin "/bin")))) + (synopsis "OpenType text shaping engine") + (description + "HarfBuzz is an OpenType text shaping engine.") + (license (license:x11-style "file://COPYING" + "See 'COPYING' in the distribution.")) + (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) + (define-public harfbuzz (package (name "harfbuzz") base-commit: d43f2386383b1428c3b79e8a1443986a75341ad5 -- 2.46.0 [-- Attachment #4: 0002-gnu-musescore-Update-to-4.4.4.patch --] [-- Type: text/x-patch, Size: 5099 bytes --] From 91a4d1d5c5e838e73d669976df38a1f59af023d5 Mon Sep 17 00:00:00 2001 Message-ID: <91a4d1d5c5e838e73d669976df38a1f59af023d5.1735762381.git.rovanion.luckey@gmail.com> In-Reply-To: <8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf.1735762381.git.rovanion.luckey@gmail.com> References: <8eb6ab38d47f373b6a1b6a7c043b7ea7f8b8f2cf.1735762381.git.rovanion.luckey@gmail.com> From: Rovanion Luckey <rovanion.luckey@gmail.com> Date: Wed, 1 Jan 2025 19:37:57 +0100 Subject: [PATCH 2/3] gnu: musescore: Update to 4.4.4. * 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 --- 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 6825f14dcc..afdec7c775 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") (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))))) (build-system qt-build-system) (arguments - `(#:configure-flags - `("-DDOWNLOAD_SOUNDFONT=OFF" - "-DBUILD_DIAGNOSTICS=OFF" - "-DMUSESCORE_BUILD_CONFIG=release" - "-DUSE_SYSTEM_FREETYPE=ON") + `(#:qtbase ,qtbase + #: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" + ) ;; 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)) (inputs (list alsa-lib freetype `(,gtk+ "bin") ;for gtk-update-icon-cache + harfbuzz-meson 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)) (propagated-inputs (list `(,alsa-plugins "pulseaudio"))) ;for libasound_module_conf_pulse.so (synopsis "Music composition and notation software") -- 2.46.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#75037] [PATCH gnome-team v2 1/2] gnu: harfbuzz: Build with meson. 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 ` 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 1 sibling, 1 reply; 5+ messages in thread From: Liliana Marie Prikler @ 2025-01-08 11:46 UTC (permalink / raw) To: 75037; +Cc: Rovanion Luckey, liliana.prikler, maxim.cournoyer, vivien * gnu/packages/gtk.scm (harfbuzz)[build-system]: Use meson-build-system. [#:configure-flags]: Replace “--with-graphite2” with “-Dgraphite2=enabled”. Remove other flags. --- gnu/packages/gtk.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fd6448cc6d..c8bcb02cbb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -291,7 +291,7 @@ (define-public harfbuzz (sha256 (base32 "0izq2lpqxrf1l755nxrxkkiarywkx5j43asznankxplbxgm0358h")))) - (build-system gnu-build-system) + (build-system meson-build-system) (outputs '("out" "bin")) ;160K, only hb-view depend on cairo (inputs @@ -309,9 +309,7 @@ (define-public harfbuzz which))) (arguments (list #:configure-flags - #~(list "--with-graphite2" - "--with-gobject" - (string-append "--bindir=" #$output:bin "/bin")))) + #~(list "-Dgraphite2=enabled"))) (synopsis "OpenType text shaping engine") (description "HarfBuzz is an OpenType text shaping engine.") base-commit: 198b6c745a7ac9813a8c9b9995f287b3a4c6cb48 prerequisite-patch-id: b8ea62f663c0eb01ba5b47665196e3197cbb474c -- 2.47.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#75037] [PATCH gnome-team v2 2/2] gnu: musescore: Update to 4.4.4. 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 ` Rovanion Luckey 2025-01-08 12:01 ` Liliana Marie Prikler 0 siblings, 1 reply; 5+ messages in thread From: Rovanion Luckey @ 2025-01-01 18:37 UTC (permalink / raw) To: 75037; +Cc: Rovanion Luckey, liliana.prikler, maxim.cournoyer, vivien [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 4665 bytes --] * 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> --- 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") (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))))) (build-system qt-build-system) (arguments - `(#:configure-flags - `("-DDOWNLOAD_SOUNDFONT=OFF" - "-DBUILD_DIAGNOSTICS=OFF" - "-DMUSESCORE_BUILD_CONFIG=release" - "-DUSE_SYSTEM_FREETYPE=ON") + `(#:qtbase ,qtbase + #: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" + ) ;; 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)) (inputs (list alsa-lib freetype `(,gtk+ "bin") ;for gtk-update-icon-cache + harfbuzz-meson 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)) (propagated-inputs (list `(,alsa-plugins "pulseaudio"))) ;for libasound_module_conf_pulse.so (synopsis "Music composition and notation software") -- 2.47.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#75037] [PATCH gnome-team v2 2/2] gnu: musescore: Update to 4.4.4. 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 0 siblings, 0 replies; 5+ messages in thread From: Liliana Marie Prikler @ 2025-01-08 12:01 UTC (permalink / raw) To: 75037; +Cc: Rovanion Luckey 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-01-08 12:02 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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
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).