unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Bruno Victal <mirai@makinata.eu>
To: 65873@debbugs.gnu.org
Cc: Bruno Victal <mirai@makinata.eu>
Subject: [bug#65873] [PATCH 1/5] gnu: xfig: Use G-Expressions.
Date: Mon, 11 Sep 2023 19:54:49 +0100	[thread overview]
Message-ID: <9b1ed59e811ee0fcdf52d9a34bbe871df994517b.1694458076.git.mirai@makinata.eu> (raw)
In-Reply-To: <cover.1694458076.git.mirai@makinata.eu>

* 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 <me@tobias.gr>
 ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Ivan Vilata i Balaguer <ivan@selidor.net>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
 ;;;
 ;;; 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
-- 
2.40.1





  reply	other threads:[~2023-09-11 19:12 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-11 18:51 [bug#65873] [PATCH 0/5] Xfig module refactoring Bruno Victal
2023-09-11 18:54 ` Bruno Victal [this message]
2023-09-11 18:54 ` [bug#65873] [PATCH 2/5] gnu: Add fig2dev Bruno Victal
2023-09-11 18:54 ` [bug#65873] [PATCH 3/5] gnu: transfig: Remove package Bruno Victal
2023-09-11 18:54 ` [bug#65873] [PATCH 4/5] gnu: texlive-latex-make: Update description Bruno Victal
2023-09-11 18:54 ` [bug#65873] [PATCH 5/5] gnu: xfig: Update to 3.2.9 Bruno Victal
2023-09-24 15:30 ` [bug#65873] [PATCH v2 0/3] Xfig module refactoring Bruno Victal
2023-09-24 15:30   ` [bug#65873] [PATCH v2 1/3] gnu: xfig: Use G-Expressions Bruno Victal
2023-09-24 15:30   ` [bug#65873] [PATCH v2 2/3] gnu: Add fig2dev Bruno Victal
2023-09-24 15:30   ` [bug#65873] [PATCH v2 3/3] gnu: xfig: Update to 3.2.9 Bruno Victal
2023-10-01  8:19     ` bug#65873: " Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9b1ed59e811ee0fcdf52d9a34bbe871df994517b.1694458076.git.mirai@makinata.eu \
    --to=mirai@makinata.eu \
    --cc=65873@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).