From patchwork Wed Feb 21 19:30:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Rimoldi X-Patchwork-Id: 60876 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 5BA6927BBE9; Wed, 21 Feb 2024 19:32:14 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 BB6A527BBE2 for ; Wed, 21 Feb 2024 19:32:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcsJq-0005dW-Rn; Wed, 21 Feb 2024 14:31:50 -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 1rcsJg-0005co-LQ for guix-patches@gnu.org; Wed, 21 Feb 2024 14:31:47 -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 1rcsJg-0007D8-BQ for guix-patches@gnu.org; Wed, 21 Feb 2024 14:31:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcsK2-0003Cr-Ob for guix-patches@gnu.org; Wed, 21 Feb 2024 14:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68052] [PATCH v3 4/4] gnu: frescobaldi: Make it display icons with qtsvg-5. Resent-From: rimarko@libero.it Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Feb 2024 19:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 68052@debbugs.gnu.org Cc: Marco Rimoldi Received: via spool by 68052-submit@debbugs.gnu.org id=B68052.170854390212267 (code B ref 68052); Wed, 21 Feb 2024 19:32:02 +0000 Received: (at 68052) by debbugs.gnu.org; 21 Feb 2024 19:31:42 +0000 Received: from localhost ([127.0.0.1]:35820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsJe-0003BY-Hg for submit@debbugs.gnu.org; Wed, 21 Feb 2024 14:31:42 -0500 Received: from smtp-32.italiaonline.it ([213.209.10.32]:58688 helo=libero.it) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcsJX-0003At-Tr for 68052@debbugs.gnu.org; Wed, 21 Feb 2024 14:31:32 -0500 Received: from localhost ([93.38.119.137]) by smtp-32.iol.local with ESMTPA id csIsrmVVeXR0qcsJ5r0fPl; Wed, 21 Feb 2024 20:31:03 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1708543863; bh=+f951j84mks6rjKUaSrOdXoQ7vpQfGOdUZO+Yuy6sSo=; h=From; b=CK9akucJzvl9VfJMeHc9lyvQZ4UiTMbyxzJ0d7cIvz/PvbWG2fElXhIDlEEx2S+Cy zgmTmI9Y+LlXSq5yNK8qDJR1FYBc63bWtRzqmziVib1IZXMdfiGFMvwhW7HjpakMMO hjuncrWBw3zeBdG7SSh72nMdT3cpTTwi17/QRpqNfXiYX30disO1e7rklBl+IDFmal 9SHx1x+Efor5pi5UfeI+0OgGcUsk0oa/lQhUiMO90kWOs8F41Ksm9/jFK0PZ20IZzj /ijVCM1Ty/4rriPbalrZVGDhQRqBruoHrkShBjBqtifYJBE4Z1+ttDFcoMDFvJYsz2 GdmoKY8Ozxmww== X-CNFS-Analysis: v=2.4 cv=Rc4zCEtv c=1 sm=1 tr=0 ts=65d64f77 cx=a_exe a=zr5aN+YwjWvrDHBFAPbA8Q==:117 a=zr5aN+YwjWvrDHBFAPbA8Q==:17 a=NEAV23lmAAAA:8 a=DXx6YPyZAAAA:8 a=uevgM3sCq-TRXfd_OkEA:9 a=JkZe2gLXF4N2C6gDVeOo:22 Date: Wed, 21 Feb 2024 20:30:35 +0100 Message-ID: <69abfc9674f76ff26b43b5a2e75ab0f721fa3b61.1708543835.git.rimarko@libero.it> X-Mailer: git-send-email 2.41.0 In-Reply-To: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> References: <9b3717fdff5c1a5f20ae57b99f365775790b22c9.1708543835.git.rimarko@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfCksnVuppfmTp2iPZWLFirixS2f5YrAwKYJxSP6JqfNRAnw20lxSNGli6Mz2CUYjGe/nkDKUsKlJ9mtnF0ceZ0OM8eXPKwCKiHydYFfp4aiWLrXAxgir ICpztKUdzyhsNaTgzcIDWpPcNiv8paEsPoaiiSDhpjRFbuKl2GA7u3GDNeu7HzyMtel7ChBP39tC6/cFW6j6jJO2AwcYsBNmc84= 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: rimarko@libero.it X-ACL-Warn: , Marco Rimoldi via Guix-patches X-Patchwork-Original-From: Marco Rimoldi via Guix-patches via From: Marco Rimoldi 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: Marco Rimoldi * gnu/packages/music.scm (frescobaldi) [origin] Updated to avoid automatic redirect. [arguments] Add 'wrap-executable to export QT_PLUGIN_PATH. [inputs] Add qtsvg-5, bash-minimal. Change-Id: I55b3c56d41bd60e4ba4c938109ff41631e211ad2 --- gnu/packages/music.scm | 47 ++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a0be16a44e..63d545e68b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3098,32 +3098,39 @@ (define-public frescobaldi (origin (method url-fetch) (uri (string-append - "https://github.com/wbsoft/frescobaldi/releases/download/v" + "https://github.com/frescobaldi/frescobaldi/releases/download/v" version "/frescobaldi-" version ".tar.gz")) (sha256 (base32 "1n60gfnf6x0l1bac088g9adzx0lskbl9knd4y1ynr3y0zcs0kfcz")))) (build-system python-build-system) (arguments (list - #:tests? #f ;no tests included - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'generate-translations - (lambda _ - (invoke "make" "-C" "i18n"))) - (add-before 'build 'generate-metadata - (lambda _ - (invoke "make" "-C" "linux")))))) - (inputs - (list lilypond - poppler - portmidi-2 - python-ly - python-poppler-qt5 - python-pyportmidi - python-pyqt - python-sip - qpageview)) + #:tests? #f ;no tests included + #:phases #~(modify-phases %standard-phases + (add-before 'build 'generate-translations + (lambda _ + (invoke "make" "-C" "i18n"))) + (add-before 'build 'generate-metadata + (lambda _ + (invoke "make" "-C" "linux"))) + (add-after 'install 'wrap-executable + (lambda _ + ;; Ensure that icons are found at runtime. + (wrap-program (string-append #$output + "/bin/frescobaldi") + `("QT_PLUGIN_PATH" prefix + ,(list (getenv "QT_PLUGIN_PATH"))))))))) + (inputs (list bash-minimal + lilypond + poppler + portmidi-2 + python-ly + python-poppler-qt5 + python-pyportmidi + python-pyqt + python-sip + qpageview + qtsvg-5)) (home-page "https://www.frescobaldi.org/") (synopsis "LilyPond sheet music text editor") (description