From: Saku Laesvuori via Guix-patches via <guix-patches@gnu.org>
To: 64751@debbugs.gnu.org
Cc: Saku Laesvuori <saku@laesvuori.fi>
Subject: [bug#64751] [PATCH core-updates 3/4] gnu: imagemagick: Update package style
Date: Thu, 20 Jul 2023 21:41:26 +0300 [thread overview]
Message-ID: <20230720184404.14172-1-saku@laesvuori.fi> (raw)
In-Reply-To: <20230720183731.7296-1-saku@laesvuori.fi>
* gnu/packages/imagemagick.scm
(imagemagick/stable)[arguments]<phases>: 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)))))
--
2.41.0
next prev parent reply other threads:[~2023-07-20 18:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 18:37 [bug#64751] [PATCH core-updates 1/4] gnu: imagemagick: Update to 6.9.12-91 Saku Laesvuori via Guix-patches via
2023-07-20 18:40 ` [bug#64751] [PATCH core-updates 2/4] gnu: imagemagick: Fix converting webp images Saku Laesvuori via Guix-patches via
2023-07-20 18:41 ` Saku Laesvuori via Guix-patches via [this message]
2023-07-20 18:41 ` [bug#64751] [PATCH core-updates 4/4] gnu: imagemagick/stable: Sync with imagemagick Saku Laesvuori via Guix-patches via
2024-01-21 23:05 ` bug#64751: [PATCH core-updates 1/4] gnu: imagemagick: Update to 6.9.12-91 Maxim Cournoyer
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=20230720184404.14172-1-saku@laesvuori.fi \
--to=guix-patches@gnu.org \
--cc=64751@debbugs.gnu.org \
--cc=saku@laesvuori.fi \
/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).