diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-06 11:03:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-06 11:03:27 +0200 |
| commit | 6a317919cf0f9dbc651a4a41f9ed99c49bf2d543 (patch) | |
| tree | 9454b6c587b75ee1e3625be64f39cc39a5154db6 /gnu/packages/image.scm | |
| parent | 68932812b8f6581dda4bf1896235492f687b7cc9 (diff) | |
| parent | 8bde6a524e19d2bc9763b84dbf99959faf653bf8 (diff) | |
| download | guix-6a317919cf0f9dbc651a4a41f9ed99c49bf2d543.tar guix-6a317919cf0f9dbc651a4a41f9ed99c49bf2d543.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e525c75693..aed4bdd6ec 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -167,7 +167,7 @@ APNG patch provides APNG support to libpng.") (define-public libpng-1.2 (package (inherit libpng) - (version "1.2.57") + (version "1.2.59") (source (origin (method url-fetch) @@ -180,7 +180,8 @@ APNG patch provides APNG support to libpng.") "ftp://ftp.simplesystems.org/pub/libpng/png/src/history" "/libpng12/libpng-" version ".tar.xz"))) (sha256 - (base32 "1n2lrzjkm5jhfg2bs10q398lkwbbx742fi27zgdgx0x23zhj0ihg")))))) + (base32 + "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl")))))) (define-public r-png (package @@ -509,7 +510,7 @@ work.") (define-public openjpeg (package (name "openjpeg") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) @@ -519,13 +520,7 @@ work.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0yvfghxwfm3dcqr9krkw63pcd76hzkknc3fh7bh11s8qlvjvrpbg")) - (patches (search-patches "openjpeg-CVE-2017-12982.patch" - "openjpeg-CVE-2017-14040.patch" - "openjpeg-CVE-2017-14041.patch" - "openjpeg-CVE-2017-14151.patch" - "openjpeg-CVE-2017-14152.patch" - "openjpeg-CVE-2017-14164.patch")))) + "06npqzkg20avnygdwaqpap91r7qpdqgrn39adj2bl8v0pg0qgirx")))) (build-system cmake-build-system) (arguments ;; Trying to run `$ make check' results in a no rule fault. |