From patchwork Thu Jul 20 18:41:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 51869 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 EF5F827BBE2; Thu, 20 Jul 2023 19:45:23 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 5F90227BBE9 for ; Thu, 20 Jul 2023 19:45:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMYeJ-0002Av-Le; Thu, 20 Jul 2023 14:45:15 -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 1qMYe6-0002A4-56 for guix-patches@gnu.org; Thu, 20 Jul 2023 14:45:02 -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 1qMYe5-0003C3-TF for guix-patches@gnu.org; Thu, 20 Jul 2023 14:45:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMYe5-0002cV-OH for guix-patches@gnu.org; Thu, 20 Jul 2023 14:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64751] [PATCH core-updates 3/4] gnu: imagemagick: Update package style References: <20230720183731.7296-1-saku@laesvuori.fi> In-Reply-To: <20230720183731.7296-1-saku@laesvuori.fi> Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 18:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64751@debbugs.gnu.org Cc: Saku Laesvuori Received: via spool by 64751-submit@debbugs.gnu.org id=B64751.16898786559991 (code B ref 64751); Thu, 20 Jul 2023 18:45:01 +0000 Received: (at 64751) by debbugs.gnu.org; 20 Jul 2023 18:44:15 +0000 Received: from localhost ([127.0.0.1]:59882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMYdK-0002az-CA for submit@debbugs.gnu.org; Thu, 20 Jul 2023 14:44:14 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:56176 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMYdI-0002aq-21 for 64751@debbugs.gnu.org; Thu, 20 Jul 2023 14:44:13 -0400 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 85C7034012E; Thu, 20 Jul 2023 20:44:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1689878652; bh=yb8pkLwkliIL5isjjHAcvzr6S9BcVjmMGSPjT7snhrw=; h=From:To:Cc:Subject:Date; b=TGhZ/RwG2RFmAev9ZrbfOouJmjmPSd7ugnOU/qk4vQMgQ7n+/DsmSWm2CGvvLc5J/ xuffv8YD8mkLcuM+XmPmi939sDUSblLo0iw4MiLS3V5x3Y44DCUtPKPerTjXKd1/09 wqNHysmjWDEKDPYfRoqFNHgRG1qxRw0wAek0BYpM= Date: Thu, 20 Jul 2023 21:41:26 +0300 Message-ID: <20230720184404.14172-1-saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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/imagemagick.scm (imagemagick/stable)[arguments]: Use G-exps. [inputs]: Use new style. (imagemagick)[inputs]: Use new style. --- gnu/packages/imagemagick.scm | 105 +++++++++++++++++------------------ 1 file changed, 50 insertions(+), 55 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 55e100a71c..82ac9f5107 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -68,69 +68,65 @@ (define-public imagemagick/stable (version "6.9.11-48") (source (origin (method url-fetch) - (uri (string-append "mirror://imagemagick/ImageMagick-" - version ".tar.xz")) + (uri (string-append "mirror://imagemagick/ImageMagick-" version + ".tar.xz")) (sha256 (base32 "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" + (list + #:configure-flags ''("--with-frozenpaths" "--without-gcc-arch" - ;; Do not embed the build date in binaries. - "--enable-reproducible-build") + ;; Do not embed the build date in binaries. + "--enable-reproducible-build") - ;; FIXME: The test suite succeeded before version 6.9.6-2. - ;; Try enabling it again with newer releases. - #:tests? #f - #:phases (modify-phases %standard-phases - (add-before - 'build 'pre-build - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - ;; Clear the `LIBRARY_PATH' setting, which otherwise - ;; interferes with our own use. - (("^LIBRARY_PATH[[:blank:]]*=.*$") - "") + ;; FIXME: The test suite succeeded before version 6.9.6-2. + ;; Try enabling it again with newer releases. + #:tests? #f + #:phases #~(modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* _ + (substitute* "Makefile" + ;; Clear the `LIBRARY_PATH' setting, which otherwise + ;; interferes with our own use. + (("^LIBRARY_PATH[[:blank:]]*=.*$") + "") - ;; Since the Makefile overrides $docdir, modify it to - ;; refer to what we want. - (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") - (let ((doc (assoc-ref outputs "doc"))) - (string-append "DOCUMENTATION_PATH = " - doc "/share/doc/" - ,name "-" - ,(package-version this-package) "\n")))) - #t)) - (add-before - 'configure 'strip-configure-xml - (lambda _ - (substitute* "config/configure.xml.in" - ;; Do not record 'configure' arguments in the - ;; configure.xml file that gets installed: That would - ;; include --docdir, and thus retain a reference to the - ;; 'doc' output. - (("@CONFIGURE_ARGS@") - "not recorded")) - #t))))) + ;; Since the Makefile overrides $docdir, modify it to + ;; refer to what we want. + (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") + (string-append "DOCUMENTATION_PATH = " + #$output:doc + "/share/doc/imagemagick-" + #$(package-version this-package) + "\n"))))) + (add-before 'configure 'strip-configure-xml + (lambda _ + (substitute* "config/configure.xml.in" + ;; Do not record 'configure' arguments in the + ;; configure.xml file that gets installed: That would + ;; include --docdir, and thus retain a reference to the + ;; 'doc' output. + (("@CONFIGURE_ARGS@") + "not recorded"))))))) ;; TODO: Add Jasper etc. - (inputs `(("fftw" ,fftw) - ("graphviz" ,graphviz) - ("ghostscript" ,ghostscript) - ("lcms" ,lcms) - ("libx11" ,libx11) - ("zlib" ,zlib) - ("libxml2" ,libxml2) - ("libtiff" ,libtiff) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("pango" ,pango) - ("freetype" ,freetype) - ("bzip2" ,bzip2) - ("xz" ,xz))) + (inputs (list fftw + graphviz + ghostscript + lcms + libx11 + zlib + libxml2 + libtiff + libpng + libjpeg-turbo + pango + freetype + bzip2 + xz)) (native-inputs (list pkg-config)) - (outputs '("out" - "doc")) ; 26 MiB of HTML documentation + (outputs '("out" "doc")) ;26 MiB of HTML documentation (home-page "https://www.imagemagick.org/") (synopsis "Create, edit, compose, or convert bitmap images") (description @@ -158,8 +154,7 @@ (define-public imagemagick (base32 "0didbs10i9zb4dgripa851j7fivxb9jar7l3vvxz6i4kn6xvdv7r")) (patches (search-patches "imagemagick-Fix-tests.patch")))) - (inputs (cons `("libwebp" ,libwebp) - (package-inputs imagemagick/stable))) + (inputs (cons libwebp (package-inputs imagemagick/stable))) (arguments (append (package-arguments imagemagick/stable) '(#:tests? #t)))))