From patchwork Wed Jan 1 20:14:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rovanion Luckey X-Patchwork-Id: 36355 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 7C56B27BBE2; Wed, 1 Jan 2025 20:15:32 +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=unavailable 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 B251627BBE9 for ; Wed, 1 Jan 2025 20:15:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tT57R-0006Vf-Vx; Wed, 01 Jan 2025 15:15:06 -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 1tT57P-0006T9-Iw for guix-patches@gnu.org; Wed, 01 Jan 2025 15:15: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 1tT57P-0001SX-9O for guix-patches@gnu.org; Wed, 01 Jan 2025 15:15:03 -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=Js/S2MjKmJlkAcTTcPL7N7ksNvuJkol50jpaANgWSZw=; b=MSE7FZhfJBOxnsZhxTjgH/KZVp2A+/6hhBLha2S2E8VmgSeWlBpppPruFZ/2J/ikq83clfQ6Ii18U7iZsIuBzTMYMrdRVSeoUqx6Jgs4qjR6CBJWY0NB4KQNc/qUFFLaWf7pMHfkIX5BbkUKYc3JEpLq71v3UGRDbVuQvcE20dMbx1MOXQprLm7NReQP+lIT3KChVEZylK0RERWay8flTurpWxQ9iHpmDHK8/DE7im+8vPQavsQNcJ5HA1wbs23ACUQwbJuEQWXNvQlNYKGXc7bd0kOEHKY0a6ojQw88jhL6ziueJqstMSWhDXndjbls72+bgKodpUuObYGzPERWbA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tT57P-0002jW-56 for guix-patches@gnu.org; Wed, 01 Jan 2025 15:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75037] Upgrade MuseScore to 4.4.4 References: In-Reply-To: Resent-From: Rovanion Luckey Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jan 2025 20:15:03 +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: 75037@debbugs.gnu.org Received: via spool by 75037-submit@debbugs.gnu.org id=B75037.173576249810469 (code B ref 75037); Wed, 01 Jan 2025 20:15:03 +0000 Received: (at 75037) by debbugs.gnu.org; 1 Jan 2025 20:14:58 +0000 Received: from localhost ([127.0.0.1]:40578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tT57I-0002im-VQ for submit@debbugs.gnu.org; Wed, 01 Jan 2025 15:14:58 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:47563) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tT57G-0002ic-8r for 75037@debbugs.gnu.org; Wed, 01 Jan 2025 15:14:56 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5d3d143376dso15634742a12.3 for <75037@debbugs.gnu.org>; Wed, 01 Jan 2025 12:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735762492; x=1736367292; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=23HRNhuwZxqRoHV/avwDfL+eALDcS7Q2N2ScVlKjvF4=; b=ZoMe4LO5X+vjjaTp2LqhSXqmvJ6QI31NQ249dqO32YSQCQ6c6UBfCvvWfP6JeATVnB grY9d9uLTHAM94rfJXG2sa3xzDYuZ0MPQWRTI9bEP2fk5ITsFsYkoCFY+MLWOhlUjpCm 3tPwFNc/AXXpjFZBkd5zlouWNNuQVCaPtxjimRaBa1+btTFsozwuAwSvjUSyc6W/uWNw RMLSaveP2mB/HZGi3G2fPbs5gxw3rYno2U3IwAsPK8UdZd7DUoXf/j63M24zr24w7iF6 78g6jg1kHY0e80VVaa4Kw0ebZVgC6JMXl85vCKIgIKL9wdmdoKY9J09nJokyRAcJxWe1 R9hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735762492; x=1736367292; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=23HRNhuwZxqRoHV/avwDfL+eALDcS7Q2N2ScVlKjvF4=; b=EBIgLrFxGMFiytOmh9owqo1zXvAMwXERTzG45J6t3pniFos665c03lp+pbUbKZbfMe jGVmyBgkLvOV7+9kVMEHpUdqXWJqHofWvhNnBipV322ooIa1mRkv5Gz0MGcR1X3ghwJJ xk+PWVrX4NaRb0SsbA2Biuxdgv68kL7sXrrGwfP44xOY8Fe7V3rJR8UjYkf3wOO0y/OB ++4ZdCwuomqomyEmVgLo7KOlSr8Tqk7n7lx5pVvRodW39Rtq4KJtH3a4ajie/KEKYvwu LXc+0YH7gxlOOGOEfEMI88QWYhh2us+bcgPUdOknxILhG4dF07DaA9eueOKSVixIn1oh b9PQ== X-Gm-Message-State: AOJu0YxBjrc3sJskLmpKLzO1Yu46FwMRDwSWmT8PCm8AW0IyjDscLSTo 2un6sQA1Z1qJ9Cl5ije1Llth/mTk3rv51OnzCg9I595Jx7K5gszoHdRNV74DI14rVzggMLcg2iA A1rORuRW+IDmCtopXJhSqD6FGDOrjWrUh X-Gm-Gg: ASbGncvVEm2dNncST6L6XnUueHB01clFmif9PtcyiVWrP/NBbFPJOaHSzy2J0QpBkFK xk5f+zzJWUd8tKl8HZOJvXO02+0gqcf1fOPzDLNvDfXiug9QHRSIryur2n22d38X0E/PqK3+P X-Google-Smtp-Source: AGHT+IF80GfvWGcrRPFrq+Cv6WbD6cCBsZc4+6Rdd7ww99vlB0lytRrI3uc/cr7uEeVblb85xcxGpOdjDOD3iT5rBhA= X-Received: by 2002:a05:6402:3510:b0:5d3:d4cf:fea0 with SMTP id 4fb4d7f45d1cf-5d81ddffae0mr32870820a12.21.1735762492058; Wed, 01 Jan 2025 12:14:52 -0800 (PST) MIME-Version: 1.0 From: Rovanion Luckey Date: Wed, 1 Jan 2025 21:14:24 +0100 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 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. 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 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 ;;; 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 @@ -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