From patchwork Wed Jun 26 19:26:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 65676 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 1675927BBEA; Wed, 26 Jun 2024 20:28:36 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 930A327BBE2 for ; Wed, 26 Jun 2024 20:28:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMYJX-0003SI-JB; Wed, 26 Jun 2024 15:28:19 -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 1sMYJN-0003P8-1o for guix-patches@gnu.org; Wed, 26 Jun 2024 15:28:10 -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 1sMYJE-0007dI-Fn for guix-patches@gnu.org; Wed, 26 Jun 2024 15:28:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMYJG-0007Du-TL for guix-patches@gnu.org; Wed, 26 Jun 2024 15:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71787] [PATCH 04/12] gnu: ijs: Remove unneeded files and build shared library. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71787 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71787@debbugs.gnu.org Cc: David Elsing Received: via spool by 71787-submit@debbugs.gnu.org id=B71787.171943007127647 (code B ref 71787); Wed, 26 Jun 2024 19:28:02 +0000 Received: (at 71787) by debbugs.gnu.org; 26 Jun 2024 19:27:51 +0000 Received: from localhost ([127.0.0.1]:40326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMYJ4-0007Bj-64 for submit@debbugs.gnu.org; Wed, 26 Jun 2024 15:27:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMYJ1-0007Av-P6 for 71787@debbugs.gnu.org; Wed, 26 Jun 2024 15:27:48 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B04F3240103 for <71787@debbugs.gnu.org>; Wed, 26 Jun 2024 21:27:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1719430059; bh=7Acxom93hzIe3JvxuWwrEL5+Jqg8nxmLRuHk8vLLgZs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=pLyonmcqGCWthzRmJvCv6eOlDBeIMsaw1AlGF/j4qZJocydH+C+0sTLz4to18saLs SFg8bUEj5Mk+XUYrHEqWAJwzD+rVqIVhQ5wfxK2yENdOaGM1RJMkx2bhKbl6xZMg+i lGpqUiZFEKL4YgqrOsiyB9JWVB/3PQ15iZiozpe0yIWK0iZt7DkAEJdgyfjmkN7qSS T7Y0jVNH78yp9Si5l2XDXOY/mScXKKQm8p2KLZNpx7nAddfAV4/PUBQiJvBwgSEWHW kZrsQbJEm3vMvmkMFldWz4ZV0Go8PsrqngnLPFzEg6Gqil1iN83ZIqwLMlldkU1dUx R/EB3MqJrTJ9w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4W8Wtf32jjz9rxL; Wed, 26 Jun 2024 21:27:38 +0200 (CEST) From: David Elsing Date: Wed, 26 Jun 2024 19:26:57 +0000 Message-ID: <20240626192717.12818-4-david.elsing@posteo.net> In-Reply-To: <20240626192505.12401-1-david.elsing@posteo.net> References: <20240626192505.12401-1-david.elsing@posteo.net> 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/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