From patchwork Thu Dec 15 23:31:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45427 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 6696A27BBED; Mon, 19 Dec 2022 16:47:19 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 8A56B27BBE9 for ; Mon, 19 Dec 2022 16:47:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7JIG-00086I-8r; Mon, 19 Dec 2022 11:47:12 -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 1p7JI6-00085c-1i for guix-patches@gnu.org; Mon, 19 Dec 2022 11:47:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7JI5-0003Z0-QA for guix-patches@gnu.org; Mon, 19 Dec 2022 11:47:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7JI5-0004ib-Jt for guix-patches@gnu.org; Mon, 19 Dec 2022 11:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60108] [PATCH v2] gnu: musescore: Fix build. References: <26ccc41a0b59e854f261e65cfee65803e78746f7.camel@gmail.com> In-Reply-To: <26ccc41a0b59e854f261e65cfee65803e78746f7.camel@gmail.com> Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Dec 2022 16:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60108 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60108@debbugs.gnu.org Cc: Nicolas Goaziou Received: via spool by 60108-submit@debbugs.gnu.org id=B60108.167146837418121 (code B ref 60108); Mon, 19 Dec 2022 16:47:01 +0000 Received: (at 60108) by debbugs.gnu.org; 19 Dec 2022 16:46:14 +0000 Received: from localhost ([127.0.0.1]:39145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7JHJ-0004iD-TU for submit@debbugs.gnu.org; Mon, 19 Dec 2022 11:46:14 -0500 Received: from planete-kraus.eu ([89.234.140.182]:52136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7JHE-0004i3-G3 for 60108@debbugs.gnu.org; Mon, 19 Dec 2022 11:46:12 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id cf7a158a; Mon, 19 Dec 2022 16:46:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:mime-version:content-type :content-transfer-encoding:to:cc:message-id; s=dkim; bh=EhskFphJ y/7g06IyAU5hapi8prU=; b=L7AZkpuFf9VA6jg6srQMew/sqQ998Sw7ode7Y/KE tbXNb7vRFqXBUaWEgV90BfdLFe6WE0aAEpcAPu1N5xLW1r6cjpDIptb/iASwsPnf uFAhWxyQ1Cq2jmYXmJEeMfmANoKQlp0Pm0deYZXWxFY8Cn1IWwHnXMKCkyMCHME+ BqM= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 22856a54 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 19 Dec 2022 16:46:03 +0000 (UTC) Date: Fri, 16 Dec 2022 00:31:00 +0100 MIME-Version: 1.0 Message-ID: User-Agent: Evolution 3.46.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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 From: Liliana Marie Prikler * gnu/packages/music.scm (musescore)[snippet]: Remove crashpad_handler and associated install actions. [arguments]<#:configure-flags>: Add “-DBUILD_DIAGNOSTICS=OFF”. [inputs]: Add qtquickcontrols-5. --- gnu/packages/music.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) base-commit: 05e4efe0c83c09929d15a0f5faa23a9afc0079e4 diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 614eb57791..bde01cb312 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4787,14 +4787,19 @@ (define-public musescore (base32 "16rcwr6fzghv8100syzicabqg8jqvng3zzsi6h3ja4zkp9hcbkcr")) (modules '((guix build utils))) (snippet - ;; Remove unused libraries. '(begin + ;; Remove unused libraries... (for-each delete-file-recursively - '("thirdparty/freetype")))))) + '("thirdparty/freetype")) + ;; ... and precompiled binaries. + (delete-file-recursively "src/diagnostics/crashpad_handler") + (substitute* "src/diagnostics/CMakeLists.txt" + (("install") "#install")))))) (build-system qt-build-system) (arguments `(#:configure-flags `("-DDOWNLOAD_SOUNDFONT=OFF" + "-DBUILD_DIAGNOSTICS=OFF" "-DMUSESCORE_BUILD_CONFIG=release" "-DUSE_SYSTEM_FREETYPE=ON") ;; There are tests, but no simple target to run. The command used to @@ -4825,6 +4830,7 @@ (define-public musescore qtdeclarative-5 qtgraphicaleffects qtnetworkauth-5 + qtquickcontrols-5 qtquickcontrols2-5 qtscript qtsvg-5