From patchwork Wed Jan 8 11:46:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 36746 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 580A827BBE2; Wed, 8 Jan 2025 11:57:42 +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,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 D5C4E27BBE9 for ; Wed, 8 Jan 2025 11:57:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVUeQ-0008N2-Ma; Wed, 08 Jan 2025 06:55: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 1tVUeN-0008Fj-G2 for guix-patches@gnu.org; Wed, 08 Jan 2025 06:55:04 -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 1tVUeM-0002Nz-TA for guix-patches@gnu.org; Wed, 08 Jan 2025 06:55:03 -0500 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:In-Reply-To:References:Subject; bh=R53fbHZ4NoC32aAbrpE6URqZ6ttbMylNteBLLPvsXaE=; b=pwmBgAsjsICz/9qI2e/PeP3vVLc9qtqcoIZcBYPki3aAUrBhHICQfA/lycbLldEn4sM985Z0ylCuiPc8kWCfWtJokhiD6gHHFs+zVl/h452SeWXyTYJ/5N8R3o+7abqJFiV+QBMazMKF+5zgtGH2kNSR5KF77LFz8QEbu541o9tObTcIHD1TBtlI0tmT5TDdM/ZrdV3l+Sosibs/eFldYYEzzstQ4/uDVZVgtnEWQxHvJRdJXYiP+hkOqwAAYAQGKD0yHMXP69Pc7Wj+ckc6EqETsbeqwxPHFSVlVqwFBj3YujgJgM5UJzjaGkFryRlg+0nqulbI5oDVlT9/1kOBZg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVUeM-0006vz-7Q; Wed, 08 Jan 2025 06:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75037] [PATCH gnome-team v2 1/2] gnu: harfbuzz: Build with meson. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Wed, 08 Jan 2025 11:55: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: 75037@debbugs.gnu.org Cc: Rovanion Luckey , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 75037-submit@debbugs.gnu.org id=B75037.173633729526628 (code B ref 75037); Wed, 08 Jan 2025 11:55:02 +0000 Received: (at 75037) by debbugs.gnu.org; 8 Jan 2025 11:54:55 +0000 Received: from localhost ([127.0.0.1]:46213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVUeF-0006vP-0g for submit@debbugs.gnu.org; Wed, 08 Jan 2025 06:54:55 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:53490) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tVUeB-0006v4-P8 for 75037@debbugs.gnu.org; Wed, 08 Jan 2025 06:54:53 -0500 Received: by mail-wr1-x444.google.com with SMTP id ffacd0b85a97d-38633b5dbcfso15972389f8f.2 for <75037@debbugs.gnu.org>; Wed, 08 Jan 2025 03:54:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736337285; x=1736942085; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=R53fbHZ4NoC32aAbrpE6URqZ6ttbMylNteBLLPvsXaE=; b=C9VDBxkR8do6KRB/yTCY77w99A+nq3N+t9akZrnODE88N4d20GioGurIdln/WfQ8LH TG1DHEfk3lMcTTsFOxQpHekvSWfke4kEvbmMh3QBTo9LWvzMcP/G/el6lOo+M5Jo9rM0 tV5Lxy5/d5UgMgaWMkVMXLNl5FHLjMMo0JoZ0k8Os64CIpCp/OjIyKebulzr4p9p/k+2 ysNumb3EP2E1x10ubvzXSv1fveImKglKlgzrjS4dX9Kh2RRUPbfSvIO1NT1CuoagBJ+x K1cWp/mtPWVOMowgXAPBwVS42eo4q+au7CtGKnN2Yw0GTCPRQGVF5iZiMTove5RRPCSS uavA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736337285; x=1736942085; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R53fbHZ4NoC32aAbrpE6URqZ6ttbMylNteBLLPvsXaE=; b=FRJCBMTh8k7y01QTReaI3+kINp1U1d5QYBFbhtF/2e0eIJKbCO1E2L20GP/Ko3DpXO KpjYyq7aTYigquXjJud2TX/P8ccIHfkSIGScQZ+95Ru3pgMQEPkq7hLbjs9QKn/O5FFy 8Pdwj4KUD5hH1kQTI/12nhNvKHAuQSADWOVYPB9gAbgYpTCE3q+g9Fz8PQKFiXpsCzHX Ypvoja8qIIQ1pyZwlA8yTr0W+MFAuyUYlcOF+LWMIMtI+J0jh5wToayA7caX+mDMy9ry NVoOnFjJJb5EFlSLbK3YFkgn+aWjJU7k/SM78S0QzpB6OV5PYp2ZsqUAXS3n7gg7KJxT JV0w== X-Gm-Message-State: AOJu0YwfU7mV7jZL90MGNyxwAZQHq6DRC/NxFvcJIxBuBjXl0quR+Wyf 7se6Hh+RFGiM+OCTZYaI+3XaJ8VwAa+OqZSzz9TynSiCVoMAOuuCLCzyv/LT X-Gm-Gg: ASbGncvfZzubJg24apwXqcliwrm9sOSGrA9JiP23QkVgavKCv++4I+YoCIZKqo8WA87 yJUYR8TN37kWUyTsH5B8gXrOc1a3iaZo2GZGHbHQdsEi3CHRwtT7DUHAlaQ+FRRPK+PNiRf+qub jP+NX0qwm7z0EU4uGkqZoanaXRyifD0/sbdNtuJiMlazUOSaoEu+fKQJ4DC9sdj/qphf3tV/ipG 7Ie8CPPz5NDIc3JGmTAWuAH3494bw/JLWaL7NEV8YXO1DsgppyIfFtoG4kB9toqLP5KaS4RCkBL 5ezpKwHuEZab7Y0AryBnrZXNtuTn4nrD X-Google-Smtp-Source: AGHT+IFtDy4S97NshbPXOTpD/qe+c2Dr+KnkPgDwtXH97wh9kOiGxk+wOGzUa7LXFIcpBJ3dp2Dn7g== X-Received: by 2002:a5d:6da2:0:b0:386:256c:8e59 with SMTP id ffacd0b85a97d-38a872fbd0dmr2146295f8f.3.1736337285276; Wed, 08 Jan 2025 03:54:45 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2da66d9sm18562035e9.1.2025.01.08.03.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 03:54:44 -0800 (PST) Message-ID: <02df420e622b5e1fb5a59964fc8076b62a5cd636.1736336958.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Wed, 8 Jan 2025 12:46:01 +0100 MIME-Version: 1.0 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 * 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(-) base-commit: 198b6c745a7ac9813a8c9b9995f287b3a4c6cb48 prerequisite-patch-id: b8ea62f663c0eb01ba5b47665196e3197cbb474c 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.") From patchwork Wed Jan 1 18:37:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 36745 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 BED2127BBEA; Wed, 8 Jan 2025 11:56:25 +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=-5.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,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 025D027BBE9 for ; Wed, 8 Jan 2025 11:56:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVUeS-00006E-OR; Wed, 08 Jan 2025 06:55:08 -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 1tVUeP-0008Ib-2U for guix-patches@gnu.org; Wed, 08 Jan 2025 06:55:05 -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 1tVUeO-0002ZB-Nm for guix-patches@gnu.org; Wed, 08 Jan 2025 06:55:04 -0500 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:References:In-Reply-To:From:To:Subject; bh=huOHeFLKv7QC69EtD7cvmeDe8WbXM6p//fFLjyQtjYg=; b=Di5JVY4v9lqRFaE9SmeE/stllV7XuhNf12jhnxgNjdfoLKySMvLcFDqVOxRkJjrUiU9ZxLWypmcpx+ILWh8CeVXATXKLpCaKc8AnFAdp2mwfu8uSjy3WgM+rub4ZUeR0jawSapaDhdRzbYrOqHNpoBaWMhjcug8CuoR0ycU2gVAZ3CGydDhfqQaRTWgCIWX0FJ64uoxena5SNCc7kJrCiroWrkfZAxNlHMa9F/elnN+0G1Ts0ShscKcyuJ27TOxNATx2KupCN5i3ieL2CpKO3QCUlurlgBdawhy5x2yAmt36QC7YyNun2bbxWUqXGJEuA2VDzXsGYl0YgBC+nexVew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVUeM-0006w6-NI; Wed, 08 Jan 2025 06:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75037] [PATCH gnome-team v2 2/2] gnu: musescore: Update to 4.4.4. Resent-From: Rovanion Luckey Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Wed, 08 Jan 2025 11:55: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: 75037@debbugs.gnu.org Cc: Rovanion Luckey , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 75037-submit@debbugs.gnu.org id=B75037.173633729926638 (code B ref 75037); Wed, 08 Jan 2025 11:55:02 +0000 Received: (at 75037) by debbugs.gnu.org; 8 Jan 2025 11:54:59 +0000 Received: from localhost ([127.0.0.1]:46215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVUeI-0006vZ-EK for submit@debbugs.gnu.org; Wed, 08 Jan 2025 06:54:58 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50491) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tVUeC-0006v6-DO for 75037@debbugs.gnu.org; Wed, 08 Jan 2025 06:54:54 -0500 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-436a39e4891so63344555e9.1 for <75037@debbugs.gnu.org>; Wed, 08 Jan 2025 03:54:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736337286; x=1736942086; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:references:in-reply-to:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=huOHeFLKv7QC69EtD7cvmeDe8WbXM6p//fFLjyQtjYg=; b=YZNnAfSqrEzU4LrhtHOkm2uqL4TH1c1nW/8+jeeFiBOXLrK16DfDMYwD1IRKzZ4TmO /WPFvqpOm9SCrt5d2L9VLg3Q5HEW5bG6z5XF/8v2Pqc84Np2g/UJRYPElGXwSGCMdOGH P9H1dPF7cmnXJ16OrjLfd/RYaU4o0LZIzLZUk2r47vONqJ3Giqo1P1VD6YQvYHwTLMn/ ESBFU9kA+tntmkA5IEhbAy4QEg7C0MoGop4IsGxUDKZw+BJNz5eu1I6g5RZWlPZRckdY JPtXJxlFfo2lc1ZefQvfT4ckTmi8WjLHa9B4Q0GpWYeJbv2hhDPpNloeQ7BV2ZERvvjM ZJPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736337286; x=1736942086; h=mime-version:cc:to:subject:date:references:in-reply-to:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=huOHeFLKv7QC69EtD7cvmeDe8WbXM6p//fFLjyQtjYg=; b=W72xNaxnYa75WLR958pamqjAQtWnTpkNVqzMHMvk5wXnsQN1bO2V2vrGZ1wpySzXhJ YXsMRAsJisCgXJt54P3ISI8Nh/BhHRKywxWt0kOeQLxgzs9/QMam2B8MuslkepALpiqG 4PWmH501/Ryy57xkUpdIIN3VxHkOrfw82DOT6njGJ9sv8inQjIrSUkJCanyP7maxmwRg 1y0sLbhW/wDutN2wNxpbsxlMXwLgkUAQBoeuyVU86kXQhQwhUDqTP/EIvVGhc/iGlwoK OltQAgfbzxgeG9Vm1c23LxFwZE3YXbSi9khKW04AgTbIn7ouX9VXprZLMS29BBosb371 ARVw== X-Gm-Message-State: AOJu0YwWsJeWgy5I4cyM2UIoFQa67FC3qOhiN8c3axWdifHWia7WIuKn nFM/Cd385tWlXawFIGtVUCDmuAPlfjxuKWLCDux4MgiwPrrvWy8qySkGLQ7X X-Gm-Gg: ASbGncufitPkjULtMHYZqwz+vMDrz2u3u43bzqXzpuM8+5Z8nKVgCdAA4Xfq8rcXAJ6 G+9Exe+aSpmRlbcbMwsgf22Q3YpuWWbmZTLaZIg8+rczkiUzYWQ0hMGr3LqXij2up9Kpxk42YgA SjUQMHZwqwmpd52cDeUZdBKY7Pq4hpVbMkc9f/acVIaGRcX8iSIGRVGR1S7UfMSyieRGCLoh3Gr HXag8DlzHjXWiGie/qZN8VWMW1nMn9PUj2edQ8kuYexTEqAyy0qzW6yAAZmrYEQeTif/5/Loc98 SL8mxA27h6YcOkD+r/VMal+hiMfUw9WF X-Google-Smtp-Source: AGHT+IGkY10EJdNIQhQDsKoJRjkJ+t1sVYGqXk0Cf3bMqvEE56yrTyHZrv5VmovHM9Pl5ZYAZYFm1g== X-Received: by 2002:a05:600c:3ca0:b0:434:ff9d:a3a1 with SMTP id 5b1f17b1804b1-436e266e818mr20411125e9.2.1736337285967; Wed, 08 Jan 2025 03:54:45 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2da66d9sm18562035e9.1.2025.01.08.03.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 03:54:45 -0800 (PST) From: Rovanion Luckey X-Google-Original-From: Rovanion Luckey Message-ID: In-Reply-To: <02df420e622b5e1fb5a59964fc8076b62a5cd636.1736336958.git.liliana.prikler@gmail.com> References: <02df420e622b5e1fb5a59964fc8076b62a5cd636.1736336958.git.liliana.prikler@gmail.com> Date: Wed, 1 Jan 2025 19:37:57 +0100 MIME-Version: 1.0 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 * 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 --- 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 ;;; 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")