diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
commit | e1556533d3e57950417b2e35a68e95c65fee5042 (patch) | |
tree | 41d67b065c7828e164af83254fb447849d9e880d /gnu/packages/imagemagick.scm | |
parent | 5d8d8f3b0a07edb3bd435830b076749f906537d8 (diff) | |
parent | 92f1cefb74f6092c0c70f93140824ab806086272 (diff) | |
download | guix-patches-e1556533d3e57950417b2e35a68e95c65fee5042.tar guix-patches-e1556533d3e57950417b2e35a68e95c65fee5042.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/imagemagick.scm')
-rw-r--r-- | gnu/packages/imagemagick.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 4e49c60993..8e176845e1 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -23,6 +23,7 @@ #:use-module (guix build-system perl) #:use-module (guix download) #:use-module ((guix licenses) #:select (fsf-free)) + #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) @@ -37,14 +38,15 @@ (define-public imagemagick (package (name "imagemagick") - (version "6.9.1-3") + (version "6.9.2-1") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "18wbsjfccxlgsdsd6h9wvhcjrsglyi086jk4bk029ik07rh81laz")))) + "159afhqrj22jlz745ccbgnkdiwvn8pjcc96jic0iv9ms7gqxwln5")) + (patches (list (search-patch "imagemagick-test-segv.patch"))))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -84,7 +86,7 @@ ("libxml2" ,libxml2) ("libtiff" ,libtiff) ("libpng" ,libpng) - ("libjpeg" ,libjpeg-8) + ("libjpeg" ,libjpeg) ("pango" ,pango) ("freetype" ,freetype) ("bzip2" ,bzip2) |