diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-11-29 18:47:16 +0100 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-11-29 18:47:16 +0100 |
commit | 3bf428065916f1a47c5ed12f5622f0eff4123644 (patch) | |
tree | f424c57b8a00a019e04fc29f42c8527a811ba281 /gnu/packages/pdf.scm | |
parent | 2cb64f3b1b3df338acfc0ba9f719875db21812b0 (diff) | |
parent | 683c5ab70accb909697717bb61741a7692c52c09 (diff) | |
download | guix-3bf428065916f1a47c5ed12f5622f0eff4123644.tar.gz |
Merge branch 'master' into python-build-system
Diffstat (limited to 'gnu/packages/pdf.scm')
-rw-r--r-- | gnu/packages/pdf.scm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index d491642e49..b95fe5e0cf 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -95,6 +95,17 @@ ;; To build poppler-glib (as needed by Evince), we need Cairo and ;; GLib. But of course, that Cairo must not depend on Poppler. ("cairo" ,(package (inherit cairo) + (replacement + (package + (inherit cairo) + (replacement #f) + (source + (origin + (inherit (package-source cairo)) + (patches (search-patches + "cairo-CVE-2016-9082.patch")))) + (inputs (alist-delete "poppler" + (package-inputs cairo))))) (inputs (alist-delete "poppler" (package-inputs cairo))))) ("glib" ,glib))) |