me
/
guix
Archived
1
0
Fork 0
Code

gnu: cairo: Absorb grafted replacement. 

* gnu/packages/gtk.scm (cairo)[source]: Use cairo-CVE-2018-19876.patch
and cairo-CVE-2020-35492.patch.
[replacement]: Remove field.
(cairo/fixed): Remove variable.
master
Leo Famulari 2021-03-12 13:44:18 -05:00
parent a456b09c43
commit d178039a07
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gtk.scm
View File

@ -125,11 +125,12 @@ tools have full access to view and control running applications.")
(package (package
(name "cairo") (name "cairo")
(version "1.16.0") (version "1.16.0")
(replacement cairo/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://cairographics.org/releases/cairo-" (uri (string-append "https://cairographics.org/releases/cairo-"
version ".tar.xz")) version ".tar.xz"))
(patches (search-patches "cairo-CVE-2018-19876.patch"
"cairo-CVE-2020-35492.patch"))
(sha256 (sha256
(base32 (base32
"0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))
@ -176,15 +177,6 @@ affine transformation (scale, rotation, shear, etc.).")
(license license:lgpl2.1) ; or Mozilla Public License 1.1 (license license:lgpl2.1) ; or Mozilla Public License 1.1
(home-page "https://cairographics.org/"))) (home-page "https://cairographics.org/")))
(define cairo/fixed
(package
(inherit cairo)
(source (origin
(inherit (package-source cairo))
(patches (append (search-patches "cairo-CVE-2018-19876.patch"
"cairo-CVE-2020-35492.patch")
(origin-patches (package-source cairo))))))))
(define-public cairo-sans-poppler (define-public cairo-sans-poppler
;; Variant used to break the dependency cycle between Poppler and Cairo. ;; Variant used to break the dependency cycle between Poppler and Cairo.
(package/inherit cairo (package/inherit cairo