diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 18:30:13 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 18:30:13 +0200 |
commit | 8c4b4b65624198261d6e583214da9aa7c5524290 (patch) | |
tree | 5950b2d9e7608d154109b69dc349d1ab2b3ab371 /gnu/packages/pdf.scm | |
parent | 40522a7e89bc169233ec724592c9439e8004f4ad (diff) | |
parent | f8818360d5c185543b4bd1ad1c3c3ad7191af0c4 (diff) | |
download | guix-8c4b4b65624198261d6e583214da9aa7c5524290.tar guix-8c4b4b65624198261d6e583214da9aa7c5524290.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/pdf.scm')
-rw-r--r-- | gnu/packages/pdf.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0882d3b942..5ccaa38eea 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -531,7 +531,7 @@ extracting content or merging files.") (define-public mupdf (package (name "mupdf") - (version "1.10a") + (version "1.11") (source (origin (method url-fetch) @@ -539,10 +539,8 @@ extracting content or merging files.") name "-" version "-source.tar.gz")) (sha256 (base32 - "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a")) - (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch" - "mupdf-mujs-CVE-2016-10132.patch" - "mupdf-mujs-CVE-2016-10133.patch")) + "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510")) + (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch")) (modules '((guix build utils))) (snippet ;; Delete all the bundled libraries except for mujs, which is @@ -554,7 +552,7 @@ extracting content or merging files.") "thirdparty/glfw" "thirdparty/harfbuzz" "thirdparty/jbig2dec" - "thirdparty/jpeg" + "thirdparty/libjpeg" "thirdparty/openjpeg" "thirdparty/zlib"))))) (build-system gnu-build-system) |