From patchwork Sun Sep 24 15:30:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54273 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 4C88727BBEA; Sun, 24 Sep 2023 16:32:18 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 ACB2327BBE2 for ; Sun, 24 Sep 2023 16:32:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkR5M-0003JQ-Ix; Sun, 24 Sep 2023 11:31:52 -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 1qkR5L-0003J4-Is for guix-patches@gnu.org; Sun, 24 Sep 2023 11:31:51 -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 1qkR5L-00056T-9q for guix-patches@gnu.org; Sun, 24 Sep 2023 11:31:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkR5X-0004nM-3M for guix-patches@gnu.org; Sun, 24 Sep 2023 11:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65873] [PATCH v2 1/3] gnu: xfig: Use G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Sep 2023 15:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65873@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65873-submit@debbugs.gnu.org id=B65873.169556947918365 (code B ref 65873); Sun, 24 Sep 2023 15:32:03 +0000 Received: (at 65873) by debbugs.gnu.org; 24 Sep 2023 15:31:19 +0000 Received: from localhost ([127.0.0.1]:43437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4o-0004m7-Bn for submit@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:18 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]:58996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkR4h-0004lo-6y for 65873@debbugs.gnu.org; Sun, 24 Sep 2023 11:31:12 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 150F4203EE for <65873@debbugs.gnu.org>; Sun, 24 Sep 2023 17:30:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 579CA80099; Sun, 24 Sep 2023 17:30:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8drGdaBEzBQN; Sun, 24 Sep 2023 17:30:51 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B16F58005B; Sun, 24 Sep 2023 17:30:51 +0200 (CEST) From: Bruno Victal Date: Sun, 24 Sep 2023 16:30:25 +0100 Message-ID: <1393088416c6de494317c3e79cba85b23853f869.1695569123.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/xfig.scm (xfig)[arguments]<#:phases>: Relocate 'strip-bogus-exec-prefix into … [sources]: … here, as a snippet instead. [inputs]: Restyle. --- gnu/packages/xfig.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 8efe561433..f68ddb01f9 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2022 Ivan Vilata i Balaguer +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages xfig) #:use-module (guix packages) #:use-module ((guix licenses) #:select (bsd-2)) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages freedesktop) @@ -43,27 +45,23 @@ (define-public xfig name "-" version ".tar.xz")) (sha256 (base32 - "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")))) + "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")) + (modules '((guix build utils))) + (snippet + ;; The patch-dot-desktop-files phase requires a relative name. + #~(substitute* "xfig.desktop" + (("^(Exec=)/usr/bin/" _ key) key))))) (build-system gnu-build-system) (native-inputs ;; For tests. (list desktop-file-utils ghostscript)) (inputs - `(("libxaw3d" ,libxaw3d) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxpm" ,libxpm) - ("libx11" ,libx11) - ("libxt" ,libxt))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'strip-bogus-exec-prefix - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "xfig.desktop" - ;; The patch-dot-desktop-files phase requires a relative name. - (("Exec=/usr/bin/xfig") "Exec=xfig")) - #t))))) + (list libxaw3d + libjpeg-turbo + libpng + libxpm + libx11 + libxt)) (home-page "https://mcj.sourceforge.net/") (synopsis "Interactive drawing tool") (description