diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-24 22:00:23 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-24 22:00:23 +0200 |
| commit | ca4fd41de892c7055ce140863382c332441b15d3 (patch) | |
| tree | 39872899c5bc649e11172dccb2f262a56f234661 /gnu/packages/pdf.scm | |
| parent | 7276eca4dcbe513922d5a778ee5fc8f2b2649642 (diff) | |
| parent | 648c896ad3b198a1742c1ee8f66a1922aa98c1d8 (diff) | |
| download | guix-patches-ca4fd41de892c7055ce140863382c332441b15d3.tar guix-patches-ca4fd41de892c7055ce140863382c332441b15d3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/pdf.scm')
| -rw-r--r-- | gnu/packages/pdf.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6dbba2c7ec..f3df7c1045 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -7,7 +7,7 @@ ;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Coypright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Coypright © 2016, 2017 Marius Bakke <mbakke@fastmail.com> -;;; Coypright © 2016 Ludovic Courtès <ludo@gnu.org> +;;; Coypright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Coypright © 2016 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> @@ -576,6 +576,9 @@ extracting content or merging files.") (base32 "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510")) (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch" + "mupdf-CVE-2017-14685.patch" + "mupdf-CVE-2017-14686.patch" + "mupdf-CVE-2017-14687.patch" "mupdf-CVE-2017-15587.patch")) (modules '((guix build utils))) (snippet @@ -747,7 +750,7 @@ vector formats.") (build-system python-build-system) ;; TODO: Add dependency on pdftk. - (inputs `(("python-pygame" ,python-pygame) + (inputs `(("python2-pygame" ,python2-pygame) ("python2-pillow" ,python2-pillow) ("sdl" ,sdl) ("xpdf" ,xpdf))) |