unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: David Elsing <david.elsing@posteo.net>
To: 71787@debbugs.gnu.org
Cc: David Elsing <david.elsing@posteo.net>
Subject: [bug#71787] [PATCH 04/12] gnu: ijs: Remove unneeded files and build shared library.
Date: Wed, 26 Jun 2024 19:26:57 +0000	[thread overview]
Message-ID: <20240626192717.12818-4-david.elsing@posteo.net> (raw)
In-Reply-To: <20240626192505.12401-1-david.elsing@posteo.net>

* gnu/packages/ghostscript.scm (ijs)[source]: Add snippet. Remove patches.
[phases] Rename 'autogen' phase to 'prepare' and adjust.
---
 gnu/packages/ghostscript.scm | 106 +++++++++++++++++++++--------------
 1 file changed, 64 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 2e24904fd4..40891676b3 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -368,50 +368,72 @@ (define-public ghostscript/cups
 
 (define-public ijs
   (package
-   (name "ijs")
-   (version (package-version ghostscript))
-   (source (package-source ghostscript))
-   (build-system gnu-build-system)
-   (native-inputs
-    (append (if (target-riscv64?)
-              (list config)
-              '())
-            (list libtool automake autoconf)))
-   (arguments
-    `(#:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'autogen
-          (lambda _
-            ;; need to regenerate macros
-            (system* "autoreconf" "-if")
-            ;; do not run configure
-            (substitute* "autogen.sh"
-              (("^.*\\$srcdir/configure.*") ""))
-            (system* "bash" "autogen.sh")
-            ;; create configure script in ./ijs/
-            (chdir "ijs")
-            ;; do not run configure
-            (substitute* "autogen.sh"
-              (("^.*\\$srcdir/configure.*") "")
-              (("^ + && echo Now type.*$")  ""))
-            (invoke "bash" "autogen.sh")))
-        ,@(if (target-riscv64?)
-            `((add-after 'unpack 'update-config-scripts
-                (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                  (for-each (lambda (file)
-                              (install-file
-                               (search-input-file
-                                (or native-inputs inputs)
-                                (string-append "/bin/" file)) "ijs"))
-                            '("config.guess" "config.sub")))))
-            '()))))
-   (synopsis "IJS driver framework for inkjet and other raster devices")
-   (description
-    "IJS is a protocol for transmission of raster page images.  This package
+    (name "ijs")
+    (version (package-version ghostscript))
+    (source
+     (origin
+       (inherit
+        (package-source ghostscript))
+       (modules '((guix build utils)
+                  (srfi srfi-1)
+                  (ice-9 ftw)))
+       (snippet
+        '(begin
+           (for-each delete-file-recursively
+                     (lset-difference equal? (scandir ".")
+                                      '("." ".." "ijs")))
+           (chdir "ijs")
+           (for-each
+            delete-file
+            '("compile"
+              "config.guess"
+              "config.sub"
+              "configure"
+              "ijs_spec.pdf"
+              "ijs_spec.ps"
+              "install-sh"
+              "libtool"
+              "ltmain.sh"
+              "Makefile.in"
+              "missing"
+              "state.eps"
+              "state.fig"))))
+       (patches '())))
+    (build-system gnu-build-system)
+    (native-inputs
+     (append (if (target-riscv64?)
+                 (list config)
+                 '())
+             (list libtool automake autoconf)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'prepare
+           (lambda _
+             (chdir "ijs")
+             ;; do not run configure
+             (substitute* "autogen.sh"
+               (("^.*\\$srcdir/configure.*") "")
+               (("^ + && echo Now type.*$")  ""))
+             (substitute* "configure.ac"
+               (("AC_DISABLE_SHARED") ""))))
+         ,@(if (target-riscv64?)
+               `((add-after 'unpack 'update-config-scripts
+                   (lambda* (#:key native-inputs inputs #:allow-other-keys)
+                     (for-each (lambda (file)
+                                 (install-file
+                                  (search-input-file
+                                   (or native-inputs inputs)
+                                   (string-append "/bin/" file)) "ijs"))
+                               '("config.guess" "config.sub")))))
+               '()))))
+    (synopsis "IJS driver framework for inkjet and other raster devices")
+    (description
+     "IJS is a protocol for transmission of raster page images.  This package
 provides the reference implementation of the raster printer driver
 architecture.")
-   (license license:expat)
-   (home-page (package-home-page ghostscript))))
+    (license license:expat)
+    (home-page (package-home-page ghostscript))))
 
 (define-public font-ghostscript
   (package
-- 
2.45.1





  parent reply	other threads:[~2024-06-26 19:28 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-26 19:24 [bug#71787] [PATCH 00/12] Update and unbundle ghostscript and mupdf David Elsing
2024-06-26 19:26 ` [bug#71787] [PATCH 01/12] gnu: Add lcms2mt David Elsing
2024-06-26 19:26 ` [bug#71787] [PATCH 02/12] gnu: Add memento David Elsing
2024-06-26 19:26 ` [bug#71787] [PATCH 03/12] gnu: Add extract David Elsing
2024-06-26 19:26 ` David Elsing [this message]
2024-06-26 19:26 ` [bug#71787] [PATCH 05/12] gnu: ghostscript: Unbundle dependencies and remove non-free parts David Elsing
2024-06-26 19:26 ` [bug#71787] [PATCH 06/12] gnu: Add ghostscript/tesseract David Elsing
2024-06-26 19:27 ` [bug#71787] [PATCH 07/12] gnu: mupdf: Update to 1.24.4 and unbundle remaining dependencies David Elsing
2024-06-26 19:27 ` [bug#71787] [PATCH 08/12] gnu: Add mupdf/tesseract David Elsing
2024-06-26 19:27 ` [bug#71787] [PATCH 09/12] gnu: Add python-pymupdf David Elsing
2024-06-26 19:27 ` [bug#71787] [PATCH 10/12] gnu: Add python-svglib David Elsing
2024-06-26 19:27 ` [bug#71787] [PATCH 11/12] gnu: Add python-rst2pdf David Elsing
2024-06-26 19:27 ` [bug#71787] [PATCH 12/12] gnu: Add ghostscript-documentation David Elsing

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=20240626192717.12818-4-david.elsing@posteo.net \
    --to=david.elsing@posteo.net \
    --cc=71787@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).