diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-20 18:49:26 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-20 18:49:26 +0200 |
| commit | 58366883f2f1516a4a02f5b4e2a70e86481827b5 (patch) | |
| tree | fa67d714c4596164b341118132728a48135f4759 /gnu/packages/image.scm | |
| parent | f40aef6b3b56e1e5fb6e6ac29bd372000e13982f (diff) | |
| parent | 9a1c4a981bdd7eeca76aaf73a57d6841918821c2 (diff) | |
| download | guix-58366883f2f1516a4a02f5b4e2a70e86481827b5.tar guix-58366883f2f1516a4a02f5b4e2a70e86481827b5.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5d062b107b..e525c75693 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -522,7 +522,10 @@ work.") "0yvfghxwfm3dcqr9krkw63pcd76hzkknc3fh7bh11s8qlvjvrpbg")) (patches (search-patches "openjpeg-CVE-2017-12982.patch" "openjpeg-CVE-2017-14040.patch" - "openjpeg-CVE-2017-14041.patch")))) + "openjpeg-CVE-2017-14041.patch" + "openjpeg-CVE-2017-14151.patch" + "openjpeg-CVE-2017-14152.patch" + "openjpeg-CVE-2017-14164.patch")))) (build-system cmake-build-system) (arguments ;; Trying to run `$ make check' results in a no rule fault. @@ -931,7 +934,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (define-public jasper (package (name "jasper") - (version "2.0.13") + (version "2.0.14") (source (origin (method url-fetch) (uri (string-append "https://github.com/mdadams/jasper/archive/" @@ -939,7 +942,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "090cyqcvqp4y12nc57gvcbrk3ap1rnnixd4qj90sx0pw3fs1615m")))) + "0yx9y5y0g6jv142vnqp50j3k8k5yqznz3smrblv192wgfbm6w9l5")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg))) (synopsis "JPEG-2000 library") |