nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: cairo: Eliminate graft. 

* gnu/packages/gtk.scm (cairo)[replacement]: Remove field.
[source]: Add patch from 'cairo/fixed'.
(cairo-xcb)[source]: Inherit from cairo.
[replacement]: Remove field.
(cairo/fixed): Remove variable.
* gnu/packages/pdf.scm (poppler)[inputs]: Remove cairo replacement.
This commit is contained in:
Marius Bakke 2016-11-30 18:31:37 +01:00
parent 8b6aee5f82
commit bc118f1a03
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/gtk.scm
View File

@ -100,7 +100,6 @@ tools have full access to view and control running applications.")
(define-public cairo (define-public cairo
(package (package
(name "cairo") (name "cairo")
(replacement cairo/fixed)
(version "1.14.6") (version "1.14.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -108,7 +107,8 @@ tools have full access to view and control running applications.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31")))) "0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31"))
(patches (search-patches "cairo-CVE-2016-9082.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("fontconfig" ,fontconfig) `(("fontconfig" ,fontconfig)
@ -154,10 +154,6 @@ affine transformation (scale, rotation, shear, etc.).")
(package (package
(inherit cairo) (inherit cairo)
(name "cairo-xcb") (name "cairo-xcb")
(source (origin
(inherit (package-source cairo))
(patches (search-patches "cairo-CVE-2016-9082.patch"))))
(replacement #f)
(inputs (inputs
`(("mesa" ,mesa) `(("mesa" ,mesa)
,@(package-inputs cairo))) ,@(package-inputs cairo)))
@ -167,13 +163,6 @@ affine transformation (scale, rotation, shear, etc.).")
'("--enable-xlib-xcb" "--enable-gl" "--enable-egl"))) '("--enable-xlib-xcb" "--enable-gl" "--enable-egl")))
(synopsis "2D graphics library (with X11 support)"))) (synopsis "2D graphics library (with X11 support)")))
(define cairo/fixed
(package
(inherit cairo)
(source (origin
(inherit (package-source cairo))
(patches (search-patches "cairo-CVE-2016-9082.patch"))))))
(define-public harfbuzz (define-public harfbuzz
(package (package
(name "harfbuzz") (name "harfbuzz")

11
gnu/packages/pdf.scm
View File

@ -95,17 +95,6 @@
;; To build poppler-glib (as needed by Evince), we need Cairo and ;; To build poppler-glib (as needed by Evince), we need Cairo and
;; GLib. But of course, that Cairo must not depend on Poppler. ;; GLib. But of course, that Cairo must not depend on Poppler.
("cairo" ,(package (inherit cairo) ("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" (inputs (alist-delete "poppler"
(package-inputs cairo))))) (package-inputs cairo)))))
("glib" ,glib))) ("glib" ,glib)))