amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: imagemagick/stable: Update to 6.9.12-4 and use gexps.

Browse source 
* gnu/packages/imagemagick.scm (imagemagick/stable): Update to 6.9.12-4.
[arguments] Use gexps, strip trailing #t in phases.
[inputs]: Remove labels and sort.

Change-Id: I3c97868a663c44efedcea40a99af933cecb50549
This commit is contained in:
Maxim Cournoyer 2024-01-03 17:08:21 -05:00 • committed by Ludovic Courtès
parent fc1aa48eb7
commit 9be6c34ce7
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 60 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

117
gnu/packages/imagemagick.scm
View file

@ -65,70 +65,73 @@
;; The 7 release series has an incompatible API, while the 6 series is still ;; The 7 release series has an incompatible API, while the 6 series is still
;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API. ;; users are ready for the 7-series API.
(version "6.9.11-48") (version "6.9.12-4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-" (uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b"))
(patches
(search-patches "imagemagick-ReadDCMImage-fix.patch"
"imagemagick-ReadDCMPixels-fix.patch"
"imagemagick-WriteTHUMBNAILImage-fix.patch"
"imagemagick-CVE-2020-27829.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" (list
#:configure-flags #~(list "--with-frozenpaths" "--without-gcc-arch"
;; Do not embed the build date in binaries. ;; Do not embed the build date in binaries.
"--enable-reproducible-build") "--enable-reproducible-build")
;; FIXME: The test suite succeeded before version 6.9.6-2. ;; FIXME: The test suite succeeded before version 6.9.6-2.
;; Try enabling it again with newer releases. ;; Try enabling it again with newer releases.
#:tests? #f #:tests? #f
#:phases (modify-phases %standard-phases #:phases
(add-before #~(modify-phases %standard-phases
'build 'pre-build (add-before 'build 'pre-build
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(substitute* "Makefile" (substitute* "Makefile"
;; Clear the `LIBRARY_PATH' setting, which otherwise ;; Clear the `LIBRARY_PATH' setting, which otherwise
;; interferes with our own use. ;; interferes with our own use.
(("^LIBRARY_PATH[[:blank:]]*=.*$") (("^LIBRARY_PATH[[:blank:]]*=.*$")
"") "")
;; Since the Makefile overrides $docdir, modify it to ;; Since the Makefile overrides $docdir, modify it to
;; refer to what we want. ;; refer to what we want.
(("^DOCUMENTATION_PATH[[:blank:]]*=.*$") (("^DOCUMENTATION_PATH[[:blank:]]*=.*$")
(let ((doc (assoc-ref outputs "doc"))) (string-append "DOCUMENTATION_PATH = "
(string-append "DOCUMENTATION_PATH = " #$output:doc "/share/doc/"
doc "/share/doc/" ,name "-"
,name "-" #$(package-version this-package) "\n")))))
,(package-version this-package) "\n")))) (add-before 'configure 'strip-configure-xml
#t)) (lambda _
(add-before (substitute* "config/configure.xml.in"
'configure 'strip-configure-xml ;; Do not record 'configure' arguments in the
(lambda _ ;; configure.xml file that gets installed: That would
(substitute* "config/configure.xml.in" ;; include --docdir, and thus retain a reference to the
;; Do not record 'configure' arguments in the ;; 'doc' output.
;; configure.xml file that gets installed: That would (("@CONFIGURE_ARGS@")
;; include --docdir, and thus retain a reference to the "not recorded")))))))
;; 'doc' output.
(("@CONFIGURE_ARGS@")
"not recorded"))
#t)))))
;; TODO: Add Jasper etc. ;; TODO: Add Jasper etc.
(inputs `(("fftw" ,fftw) (inputs
("graphviz" ,graphviz) (list bzip2
("ghostscript" ,ghostscript) fftw
("lcms" ,lcms) freetype
("libx11" ,libx11) ghostscript
("zlib" ,zlib) graphviz
("libxml2" ,libxml2) lcms
("libtiff" ,libtiff) libjpeg-turbo
("libpng" ,libpng) libpng
("libjpeg" ,libjpeg-turbo) libtiff
("libwebp" ,libwebp) libwebp
("pango" ,pango) libx11
("freetype" ,freetype) libxml2
("bzip2" ,bzip2) pango
("xz" ,xz))) xz
zlib))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(outputs '("out" (outputs '("out"
"doc")) ; 26 MiB of HTML documentation "doc")) ; 26 MiB of HTML documentation