From ef00f3ebaee08fe245cad6a6e0b431f88a4b7103 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 25 Jan 2017 13:42:46 -0500 Subject: gnu: mupdf, cups-filters: Incorporated grafted changes. * gnu/packages/pdf.scm (mupdf)[replacement]: Remove field. [source]: Add 'mupdf-mujs-CVE-2016-10132.patch' and 'mupdf-mujs-CVE-2016-10133.patch'. (mupdf/fixed): Remove variable. * gnu/packages/cups.scm (cups-filters)[replacement]: Remove field. (mupdf/fixed-instead-of-mupdf),(cups-filters/fixed): Remove variables. --- gnu/packages/pdf.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 2ea48e5999..d449b72eef 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -481,7 +481,6 @@ extracting content or merging files.") (define-public mupdf (package (name "mupdf") - (replacement mupdf/fixed) (version "1.10a") (source (origin @@ -491,7 +490,9 @@ extracting content or merging files.") (sha256 (base32 "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a")) - (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch")) + (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch" + "mupdf-mujs-CVE-2016-10132.patch" + "mupdf-mujs-CVE-2016-10133.patch")) (modules '((guix build utils))) (snippet ;; Delete all the bundled libraries except for mujs, which is @@ -540,18 +541,6 @@ line tools for batch rendering (pdfdraw), rewriting files (pdfclean), and examining the file structure (pdfshow).") (license license:agpl3+))) -(define mupdf/fixed - (package - (inherit mupdf) - (source - (origin - (inherit (package-source mupdf)) - (patches - (append - (origin-patches (package-source mupdf)) - (search-patches "mupdf-mujs-CVE-2016-10132.patch" - "mupdf-mujs-CVE-2016-10133.patch"))))))) - (define-public qpdf (package (name "qpdf") -- cgit v1.2.3 From fe5790e1e0865c4acd6b39856396bc0fec8f05a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Mar 2017 16:27:42 +0100 Subject: gnu: poppler: Update to 0.52.0. * gnu/packages/pdf.scm (poppler): Update to 0.52.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/pdf.scm') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index d449b72eef..2e26ba9ad4 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -73,14 +73,14 @@ (define-public poppler (package (name "poppler") - (version "0.50.0") + (version "0.52.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0dmwnh59m75vhii6dw63x8l0qa0ha733pb8bdqzr7lw9nwc37jf9")))) + "14hrrac2f1phi5j0qn283457w06vsp9gr075yqjrm7w370bnd2sj")))) (build-system gnu-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3