nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: graphicsmagick: Update to 1.3.26. 

* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.26.
[source]: Use url-fetch and add SourceForge URL. Remove snippet.
This commit is contained in:
Leo Famulari 2017-07-19 12:02:42 -04:00
parent 8016393eab
commit 6d5deda16d
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 49 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
gnu/packages/imagemagick.scm
View File

@ -25,7 +25,6 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix hg-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -162,70 +161,54 @@ script.")
(license (package-license imagemagick)))) (license (package-license imagemagick))))
(define-public graphicsmagick (define-public graphicsmagick
(let ((changeset "6156b4c2992d855ece6079653b3b93c3229fc4b8") ; fix CVE-2017-6335 (package
(revision "3")) (name "graphicsmagick")
(package (version "1.3.26")
(name "graphicsmagick") (source (origin
(version (string-append "1.3.25-" revision "." (method url-fetch)
(string-take changeset 7))) (uri
(source (origin (list
(method hg-fetch) (string-append "mirror://sourceforge/" name "/" name
(uri (hg-reference "/" version "/GraphicsMagick-" version ".tar.xz")
(url "http://hg.code.sf.net/p/graphicsmagick/code") (string-append "ftp://ftp.graphicsmagick.org/pub/"
(changeset changeset))) "GraphicsMagick/" (version-major+minor version)
(file-name (string-append name "-" version "-checkout")) "/GraphicsMagick-" version ".tar.xz")))
;;(method url-fetch) (sha256
;;(uri (string-append "ftp://ftp.graphicsmagick.org/pub/" (base32
;; "GraphicsMagick/" (version-major+minor version) "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"))))
;; "/GraphicsMagick-" version ".tar.xz")) (build-system gnu-build-system)
(sha256 (arguments
(base32 `(#:configure-flags
"08yfsn8mrqkwpax43vv1crfr55rcf004wwpzsinr5c6m0asqr08b")) (list "--with-frozenpaths"
(modules '((guix build utils))) "--enable-shared=yes"
(snippet "--with-x=yes"
;; Remove bundled software. This reduces the size of the built "--with-quantum-depth=16" ; required by Octave
;; source checkout from 177 MiB to 49 MiB. This should not be "--enable-quantum-library-names"
;; necessary when using the GraphicsMagick release tarball, (string-append "--with-gs-font-dir="
;; because these files are not distributed there. (assoc-ref %build-inputs "gs-fonts")
'(for-each delete-file-recursively '("bzlib" "dcraw" "hp2xx" "/share/fonts/type1/ghostscript"))))
"jbig" "jp2" "jpeg" (inputs
"lcms" "libxml" "png" `(("graphviz" ,graphviz)
"ralcgm" "tiff" "ttf" ("ghostscript" ,ghostscript)
"webp" "wmf" "xlib" ("gs-fonts" ,gs-fonts)
"zlib"))))) ("lcms" ,lcms)
(build-system gnu-build-system) ("libx11" ,libx11)
(arguments ("libxml2" ,libxml2)
`(#:configure-flags ("libtiff" ,libtiff)
(list "--with-frozenpaths" ("libpng" ,libpng)
"--enable-shared=yes" ("libjpeg" ,libjpeg)
"--with-x=yes" ("freetype" ,freetype)
"--with-quantum-depth=16" ; required by Octave ("bzip2" ,bzip2)
"--enable-quantum-library-names" ("xz" ,xz)
(string-append "--with-gs-font-dir=" ("zlib" ,zlib)))
(assoc-ref %build-inputs "gs-fonts") (native-inputs
"/share/fonts/type1/ghostscript")))) `(("pkg-config" ,pkg-config)))
(inputs (outputs '("out" ; 13 MiB
`(("graphviz" ,graphviz) "doc")) ; ~7 MiB
("ghostscript" ,ghostscript) (home-page "http://www.graphicsmagick.org")
("gs-fonts" ,gs-fonts) (synopsis "Create, edit, compose, or convert bitmap images")
("lcms" ,lcms) (description
("libx11" ,libx11) "GraphicsMagick provides a comprehensive collection of utilities,
("libxml2" ,libxml2)
("libtiff" ,libtiff)
("libpng" ,libpng)
("libjpeg" ,libjpeg)
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(outputs '("out" ; 13 MiB
"doc")) ; ~7 MiB
(home-page "http://www.graphicsmagick.org")
(synopsis "Create, edit, compose, or convert bitmap images")
(description
"GraphicsMagick provides a comprehensive collection of utilities,
programming interfaces, and GUIs, to support file format conversion, image programming interfaces, and GUIs, to support file format conversion, image
processing, and 2D vector rendering.") processing, and 2D vector rendering.")
(license license:expat)))) (license license:expat)))