diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-08-29 23:46:33 +0300 |
| commit | b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60 (patch) | |
| tree | 707c6a5e18474b410e39fa6892521c9f47518ccc /gnu/packages/pdf.scm | |
| parent | 97127431ee9133626fea62449706d729d80b73f6 (diff) | |
| parent | 5b63a8568b39c019970569773bace18fab17a157 (diff) | |
| download | gnu-guix-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar gnu-guix-b3d2be945d2dfe08e3b73102dd0fd3f4a0a93b60.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/pdf.scm')
| -rw-r--r-- | gnu/packages/pdf.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 3b26e26b78..7313ee3974 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -27,6 +27,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) @@ -120,8 +121,12 @@ (define-public poppler-qt5 (package (inherit poppler) (name "poppler-qt5") - (inputs `(("qt" ,qt) + (inputs `(("qtbase" ,qtbase) ,@(package-inputs poppler))) + (arguments + (substitute-keyword-arguments (package-arguments poppler) + ((#:configure-flags flags) + `(cons "CXXFLAGS=-std=gnu++11" ,flags)))) (synopsis "Qt5 frontend for the Poppler PDF rendering library"))) (define-public python-poppler-qt4 @@ -469,6 +474,8 @@ extracting content or merging files.") name "-" version "-source.tar.gz")) (sha256 (base32 "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2")) + (patches (search-patches "mupdf-CVE-2016-6265.patch" + "mupdf-CVE-2016-6525.patch")) (modules '((guix build utils))) (snippet ;; Don't build the bundled-in third party libraries. |