From patchwork Fri Jan 10 13:47:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rovanion Luckey X-Patchwork-Id: 36872 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7FDC627BBEA; Fri, 10 Jan 2025 13:49:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3CFBC27BBE2 for ; Fri, 10 Jan 2025 13:49:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tWFNt-0006b9-J2; Fri, 10 Jan 2025 08:49:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tWFNm-0006YP-Iu for guix-patches@gnu.org; Fri, 10 Jan 2025 08:49:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tWFNm-0001Pk-7y for guix-patches@gnu.org; Fri, 10 Jan 2025 08:49:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:MIME-Version:To:In-Reply-To:References:Subject; bh=citaCThiqgbbdBan7CEdLSLl3wv+RHDiTKIBgnP7tug=; b=KzVYht5hktt8KyJjBgwmRSQpz09olA6IgtjEPE9TNj1vL+gD8EpL4FsATEcq6dCM1niqqjyPSIagPsOsUaY6Fy4B783zYY9zF9lvNMV+nR43DW2ctB6WDxbX3MkVZZwKICO728IXda1K7YdE3a9E+66f1nl9jWT39vJGBLrGjM73TxZ8UPqRpJ1MB9U3PGCig3uwS0lSrt1c6UCPBN+2KKM6MsQ6gpr+BzHdtE8RYeC1IoZYKUcb+PPgYxLeNK2xklASX7NioL/Ip8JWLArriZ4gfOpFTSidABoPNjiEf6ru1AttmD1SgTM0hxPcJIvcSBKlaWi7pyPfz1AtAAKkVQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tWFNm-0002bq-2i for guix-patches@gnu.org; Fri, 10 Jan 2025 08:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75037] [PATCH gnome-team v3 2/2] gnu: musescore: Update to 4.4.4. References: In-Reply-To: Resent-From: Rovanion Luckey Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Jan 2025 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Liliana Marie Prikler Cc: 75037@debbugs.gnu.org Received: via spool by 75037-submit@debbugs.gnu.org id=B75037.17365168859924 (code B ref 75037); Fri, 10 Jan 2025 13:49:02 +0000 Received: (at 75037) by debbugs.gnu.org; 10 Jan 2025 13:48:05 +0000 Received: from localhost ([127.0.0.1]:56765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWFMq-0002a0-DP for submit@debbugs.gnu.org; Fri, 10 Jan 2025 08:48:05 -0500 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:50368) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tWFMn-0002ZI-EN for 75037@debbugs.gnu.org; Fri, 10 Jan 2025 08:48:02 -0500 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5d3cf094768so3573822a12.0 for <75037@debbugs.gnu.org>; Fri, 10 Jan 2025 05:48:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736516875; x=1737121675; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=kTdWqv15pMLG5si0JOmjlSuXjxcwPEjjegy9bTc3wO0=; b=TmToV9baDPUEnDZg7P7h/+WuHB4NgO/eurIsNjomfGoB7xwTi7Fiq9C+EGCvtj+4zL Z4n4Wd+kmTPBvSZrt2VTHywTD9CU9UtSo3yIQnTCTKy+ujjmSBiquulnMoDroUNDaMjp ZzlY8hzmLAIKJbYUFwZ5bJfS6ZWAVpcpcIJvLDeIbkxtAjBfJYzIwGlETBZfg+dhVu4G qLGeYqCemjTlZNIun7WehKFRyfUFixIhViKyS4GYU5NsmptKNp62KHv75B8D6742ybr6 APLCJNeT+36ilzMOdfTx+tNwpu9o5U1z17dM6d9ONyp8BbbNdB52s4ashTwDnuksQ5Va hnHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736516875; x=1737121675; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=kTdWqv15pMLG5si0JOmjlSuXjxcwPEjjegy9bTc3wO0=; b=wqMYEYbMhN6FOa4q6y2oNB4ilf6EzUn7FYVyM8GsciwIAvAhXu/wxj8VHPof7XSYpG +waq+6T6dPsPXNfA3pqE3Xj00pQHsLGm/3+4weWJIf/SnV4f9qzQGrbO76XSKkWyIWN2 JoggZN5yxeOxR/0URf4WXUOoO3ZUUh3rjsj6cOKgrcL9GTzJFD2OiOUVIDnWCGTD8Nwr XiR3cg05HKhW1RWAX2g2jRk8a4HtY7z7ZDlk/teYsyNGfLGg+J8F4dFtR8JwhRttI9ud /uoFt1vtlwhZP9lBsiSFB+wvaqK9eACc1iWV6GdvV8Z8k/F44XJtE829bc1RYPlIcdur A7aw== X-Gm-Message-State: AOJu0YwdUWJVB4mxPQVPdbRZ5QaNNXIN5hwWqrfE6tfa4JiCtUtqqBpN MiwMDEJlRuY5LkBgrmLXWGSg1himRaAjISuBFgl4S/6uDDhGMNhGEqGyn22QvKlTVKVy+1M4IA9 N/l+ikIfNkHcy00xeOgDxgXsdYxU= X-Gm-Gg: ASbGnct/X4IAZU9YMH3Bbg1zgXOI9YibcaiBLARutsVGwdHeP0pa+ruGdbfOGIWBJKz YBRYKHp3S6pn76+YOQa0y7cg4G3znKkNFaG5uUTshQCmAG1odiw== X-Google-Smtp-Source: AGHT+IG9kBliO0CtfxZCSI2MNE4PXAKUjOhmOuLQl5nlzc91Az3tsCB8lPe1qq0oobddcluqdUG4Kg+EqTDzLH0TNsY= X-Received: by 2002:a05:6402:518f:b0:5d0:abb8:79d with SMTP id 4fb4d7f45d1cf-5d972e083f9mr2038596a12.14.1736516874309; Fri, 10 Jan 2025 05:47:54 -0800 (PST) MIME-Version: 1.0 From: Rovanion Luckey Date: Fri, 10 Jan 2025 14:47:27 +0100 X-Gm-Features: AbW1kvYmFfok9gA2uT42IACMmdpAK9qJWQ_42BY-_G9FMfSSKrbJicwi2XZg2vM Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches I've attached an updated version 3 of the music.scm patch. Den ons 8 jan. 2025 kl 13:01 skrev Liliana Marie Prikler < liliana.prikler@gmail.com>: > Am Mittwoch, dem 01.01.2025 um 19:37 +0100 schrieb Rovanion Luckey: > > - (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. > As far as I can tell, yes. This step is superseeded by the flag -DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF. > (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… Yes, Musescore will crash on startup otherwise as it would be linked against the wrong qtbase. Added a comment. It's of course a bit insane that the qt-build-system doesn't pick up the qt-base passed as arguments for the package, but that is what it is. > + #: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. I clearified the comment spanning multiple lines and hopefully understood the meaning of document correctly when I added some text to the commit message. Is everything renamed from MUSE to MUE or > are these typos? > Yes, renamed. 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. > Sure. > (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. > Fixed. > 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. Done. > (propagated-inputs > > (list `(,alsa-plugins "pulseaudio"))) ;for > > libasound_module_conf_pulse.so > > (synopsis "Music composition and notation software") > > Cheers > Thanks for the review, hope this one fits the bill. From a098362bde076d983e73b25c2fd56f871b287368 Mon Sep 17 00:00:00 2001 Message-ID: From: Rovanion Luckey Date: Wed, 1 Jan 2025 19:37:57 +0100 Subject: [PATCH] gnu: musescore: Update to 4.4.4. * gnu/packages/music.scm (musescore): Update to 4.4.4. [source]: Remove snippet to delete precompiled binaries, superseeded by flag "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF". The directory src/diagnostics/crashpad_handler no longer exists. [arguments]<#:configure-flags>: Decreased the number of vendored libraries by four. [inputs]: Move to Qt 6. Add the now unvendored libraries: flac, harfbuzz, libopusenc and tinyxml2. Change-Id: Ib5da630b73889625054f88b1e86af1e9666e6e93 --- gnu/packages/music.scm | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4832f33f09..0f399bbb3b 100644 --- a/gnu/packages/music.scm +++ b/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, 2025 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021, 2022, 2023 Felix Gruber ;;; Copyright © 2021 Simon Streit @@ -5424,7 +5424,7 @@ (define-public sfizz (define-public musescore (package (name "musescore") - (version "4.3.2") + (version "4.4.4") (source (origin (method git-fetch) @@ -5433,21 +5433,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") + `(;; In order for qt-build-system to build against qt-base 6 and not 5. + #: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" + ;;; These five lines asks that Guix' versions of system libraries are used. + "-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: ;; @@ -5458,30 +5468,32 @@ (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 + flac freetype `(,gtk+ "bin") ;for gtk-update-icon-cache + harfbuzz 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") base-commit: 461d773adead955e2daead70cee4415f7f0f00be prerequisite-patch-id: 7a77c9e2af02bf1a414a08e0380a523af0074899 -- 2.46.0