From patchwork Fri May 23 23:52:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Skylar Hill X-Patchwork-Id: 42892 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 92B3027BC4A; Sat, 24 May 2025 00:54:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 7E91827BC49 for ; Sat, 24 May 2025 00:54:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIcDJ-00027f-AN; Fri, 23 May 2025 19:54:09 -0400 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 1uIcDE-00027R-C4 for guix-patches@gnu.org; Fri, 23 May 2025 19:54:06 -0400 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 1uIcDC-0003oE-Ve for guix-patches@gnu.org; Fri, 23 May 2025 19:54:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=R5LNddNN5IBxP/GGZ6YUSLNM2YSLaqLdR6pJVVNspgo=; b=BDb0swKfDDgAsgNT/LkKm2vSxrviR9tdnKjBS07aOpnlkPiMhXwcv+TrIOVT73fER4JrKCyAlEDhlyA4mTyptSFIznaiYvOZPOn/WxJ7NJVgz10BSlC/ik7BtACKk4H+he1WgvFHgRZr8S3MI7rrn+wSnd5kKLMjqt06hV5u0CZLnvRTDuKxfuFrvcdbbvce5iZPNAA5nOjforWg45izVHjGl5XQubv64Wy2zvddPj3iNV37Pf73ZUpQBCaBZTdF6FSRjQop4yTRjEUg26CjxNalYZ7tftgHeAHI8oXnN7m6/RnbMi1MhXLuNT6vPDVPSGH6iCgMpljMfY0id8AV7A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uIcDC-0003En-GW for guix-patches@gnu.org; Fri, 23 May 2025 19:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78571] [PATCH] gnu: musescore: Update to 4.5.2. Resent-From: Skylar Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 23:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78571@debbugs.gnu.org Cc: Skylar Hill X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174804439412220 (code B ref -1); Fri, 23 May 2025 23:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2025 23:53:14 +0000 Received: from localhost ([127.0.0.1]:52867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIcCP-0003Ay-Gc for submit@debbugs.gnu.org; Fri, 23 May 2025 19:53:14 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55630) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uIcCM-0003AT-UT for submit@debbugs.gnu.org; Fri, 23 May 2025 19:53:11 -0400 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 1uIcCH-00024s-8j for guix-patches@gnu.org; Fri, 23 May 2025 19:53:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIcCF-0003n8-Dh for guix-patches@gnu.org; Fri, 23 May 2025 19:53:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9A9F2240027 for ; Sat, 24 May 2025 01:52:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1748044378; bh=/+Jsb/TmUVLGB1l5iWp2tH08NOtYwq+Nz/Jo0XNEqB4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=juKqhXUc8pPckzU73C684Q6wgCC9g96A1v5PlKmZtKswEOAx7Nw2mprs15QyaHX/X eIpGpmdNDzmcBbiwXHPyraQiW4BuNYXe7WFjBc3YwT58QMJ+GZ3ScgyshuOyVF3jte yR7LZgOBLZgECrqnhKXeb5hiUCTlTF9kxFRMr2aGnF14Kd8nzvQSCweJ5wvf4QyB5D dC0dIlmJbQlSqbzBy+GmF51q2lYBq80/oCo2P4jf2EfOnm13RLvBqETWhPYQCalZGo f1PWbz4qdgLdPU+XvMWNwg3F8YhmiJ/tfqAR2SkgUeSZBdmNEkNOtnp+oLfuo5jbAm uQ4+9+zVCBJ/Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4b42612hmvz6tvx; Sat, 24 May 2025 01:52:57 +0200 (CEST) From: Skylar Hill Date: Fri, 23 May 2025 23:52:25 +0000 Message-ID: <1c9ec0ccf1119ce51f61d62e89d4190d49fac4ca.1748044345.git.stellarskylark@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=stellarskylark@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 A small patch is required to get the build to complete. * gnu/packages/music.scm (musescore): Update to 4.5.2. * gnu/packages/patches/musescore-translatablestring-namespace.patch Change-Id: Idad8a3cd8719c32ff3beddf003a1f29ab10e957d --- gnu/packages/music.scm | 9 +++++++-- .../musescore-translatablestring-namespace.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/musescore-translatablestring-namespace.patch base-commit: 7533d742dadda08f06ffd312c3ab08a11d11d5c5 diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4f91cab931..281abecc8f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2024 hapster ;;; Copyright © 2024 Nikita Domnitskii ;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2025 Skylar Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -5472,7 +5473,7 @@ (define-public sfizz (define-public musescore (package (name "musescore") - (version "4.4.4") + (version "4.5.2") (source (origin (method git-fetch) @@ -5481,7 +5482,11 @@ (define-public musescore (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cjp1sp50pwmrgvpxjxg849s0vsvk2vcb66ym617nvlj761h0ngz")) + (base32 "12lwv0gxd49dily2hwmadbw6c59h11sfm5751dpfnzzjvj3rydpn")) + ;; NB: This patch has already been applied upstream, you'll probably + ;; need to remove this on the next version bump + (patches + (search-patches "musescore-translatablestring-namespace.patch")) (modules '((guix build utils))))) (build-system qt-build-system) (arguments diff --git a/gnu/packages/patches/musescore-translatablestring-namespace.patch b/gnu/packages/patches/musescore-translatablestring-namespace.patch new file mode 100644 index 0000000000..e2c8d1ffaf --- /dev/null +++ b/gnu/packages/patches/musescore-translatablestring-namespace.patch @@ -0,0 +1,13 @@ +--- a/src/instrumentsscene/view/systemobjectslayersettingsmodel.cpp 2025-05-23 14:53:12.684111400 -0500 ++++ b/src/instrumentsscene/view/systemobjectslayersettingsmodel.cpp 2025-05-23 14:53:27.300378768 -0500 +@@ -96,8 +96,8 @@ + 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"); ++ ? muse::TranslatableString("undoableAction", "Make system marking(s) visible") ++ : muse::TranslatableString("undoableAction", "Make system marking(s) invisible"); + + notation->undoStack()->prepareChanges(actionName); +