gnu: imagemagick: Hide 'imagemagick/stable' variant.
* gnu/packages/imagemagick.scm (imagemagick/stable): Hide it. (imagemagick): Remove inherited 'hidden?' property.master
Mark H Weaver
parent
ea2b379ac5
commit
cb3ae2f246
|
|
@ -42,7 +42,8 @@
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xorg))
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (srfi srfi-1))
|
||||||
|
|
||||||
;; This is a variant of the 'imagemagick' package that is not updated often.
|
;; This is a variant of the 'imagemagick' package that is not updated often.
|
||||||
;; It is intended to be used as a native-input at build-time only, e.g. by
|
;; It is intended to be used as a native-input at build-time only, e.g. by
|
||||||
|
|
@ -57,91 +58,93 @@
|
||||||
;; grafting is ineffective. See:
|
;; grafting is ineffective. See:
|
||||||
;; <https://lists.gnu.org/archive/html/guix-devel/2021-03/msg00381.html>.
|
;; <https://lists.gnu.org/archive/html/guix-devel/2021-03/msg00381.html>.
|
||||||
(define-public imagemagick/stable
|
(define-public imagemagick/stable
|
||||||
(package
|
(hidden-package
|
||||||
(name "imagemagick")
|
(package
|
||||||
;; The 7 release series has an incompatible API, while the 6 series is still
|
(name "imagemagick")
|
||||||
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
;; The 7 release series has an incompatible API, while the 6 series is still
|
||||||
;; users are ready for the 7-series API.
|
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
||||||
(version "6.9.11-48")
|
;; users are ready for the 7-series API.
|
||||||
(source (origin
|
(version "6.9.11-48")
|
||||||
(method url-fetch)
|
(source (origin
|
||||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
(method url-fetch)
|
||||||
version ".tar.xz"))
|
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||||
(sha256
|
version ".tar.xz"))
|
||||||
(base32
|
(sha256
|
||||||
"0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql"))))
|
(base32
|
||||||
(build-system gnu-build-system)
|
"0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql"))))
|
||||||
(arguments
|
(build-system gnu-build-system)
|
||||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch"
|
(arguments
|
||||||
|
`(#:configure-flags '("--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 (modify-phases %standard-phases
|
||||||
(add-before
|
(add-before
|
||||||
'build 'pre-build
|
'build 'pre-build
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(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")))
|
(let ((doc (assoc-ref outputs "doc")))
|
||||||
(string-append "DOCUMENTATION_PATH = "
|
(string-append "DOCUMENTATION_PATH = "
|
||||||
doc "/share/doc/"
|
doc "/share/doc/"
|
||||||
,name "-"
|
,name "-"
|
||||||
,(package-version this-package) "\n"))))
|
,(package-version this-package) "\n"))))
|
||||||
#t))
|
#t))
|
||||||
(add-before
|
(add-before
|
||||||
'configure 'strip-configure-xml
|
'configure 'strip-configure-xml
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "config/configure.xml.in"
|
(substitute* "config/configure.xml.in"
|
||||||
;; Do not record 'configure' arguments in the
|
;; Do not record 'configure' arguments in the
|
||||||
;; configure.xml file that gets installed: That would
|
;; configure.xml file that gets installed: That would
|
||||||
;; include --docdir, and thus retain a reference to the
|
;; include --docdir, and thus retain a reference to the
|
||||||
;; 'doc' output.
|
;; 'doc' output.
|
||||||
(("@CONFIGURE_ARGS@")
|
(("@CONFIGURE_ARGS@")
|
||||||
"not recorded"))
|
"not recorded"))
|
||||||
#t)))))
|
#t)))))
|
||||||
;; TODO: Add Jasper etc.
|
;; TODO: Add Jasper etc.
|
||||||
(inputs `(("fftw" ,fftw)
|
(inputs `(("fftw" ,fftw)
|
||||||
("graphviz" ,graphviz)
|
("graphviz" ,graphviz)
|
||||||
("ghostscript" ,ghostscript)
|
("ghostscript" ,ghostscript)
|
||||||
("lcms" ,lcms)
|
("lcms" ,lcms)
|
||||||
("libx11" ,libx11)
|
("libx11" ,libx11)
|
||||||
("zlib" ,zlib)
|
("zlib" ,zlib)
|
||||||
("libxml2" ,libxml2)
|
("libxml2" ,libxml2)
|
||||||
("libtiff" ,libtiff)
|
("libtiff" ,libtiff)
|
||||||
("libpng" ,libpng)
|
("libpng" ,libpng)
|
||||||
("libjpeg" ,libjpeg-turbo)
|
("libjpeg" ,libjpeg-turbo)
|
||||||
("pango" ,pango)
|
("pango" ,pango)
|
||||||
("freetype" ,freetype)
|
("freetype" ,freetype)
|
||||||
("bzip2" ,bzip2)
|
("bzip2" ,bzip2)
|
||||||
("xz" ,xz)))
|
("xz" ,xz)))
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
(outputs '("out"
|
(outputs '("out"
|
||||||
"doc")) ; 26 MiB of HTML documentation
|
"doc")) ; 26 MiB of HTML documentation
|
||||||
(home-page "https://www.imagemagick.org/")
|
(home-page "https://www.imagemagick.org/")
|
||||||
(synopsis "Create, edit, compose, or convert bitmap images")
|
(synopsis "Create, edit, compose, or convert bitmap images")
|
||||||
(description
|
(description
|
||||||
"ImageMagick is a software suite to create, edit, compose, or convert
|
"ImageMagick is a software suite to create, edit, compose, or convert
|
||||||
bitmap images. It can read and write images in a variety of formats (over 100)
|
bitmap images. It can read and write images in a variety of formats (over 100)
|
||||||
including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
|
including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
|
||||||
and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
|
and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and
|
||||||
transform images, adjust image colors, apply various special effects, or draw
|
transform images, adjust image colors, apply various special effects, or draw
|
||||||
text, lines, polygons, ellipses and Bézier curves.")
|
text, lines, polygons, ellipses and Bézier curves.")
|
||||||
(license (license:fsf-free "http://www.imagemagick.org/script/license.php"))))
|
(license (license:fsf-free "http://www.imagemagick.org/script/license.php")))))
|
||||||
|
|
||||||
(define-public imagemagick
|
(define-public imagemagick
|
||||||
(package
|
(package
|
||||||
(inherit imagemagick/stable)
|
(inherit imagemagick/stable)
|
||||||
|
(properties (alist-delete 'hidden? (package-properties imagemagick/stable)))
|
||||||
;; 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.
|
||||||
|
|
|
||||||
Reference in New Issue