From d178039a07a33751ac4f7cd582df5ae7349db4fb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Mar 2021 13:44:18 -0500 Subject: 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. --- gnu/packages/gtk.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 16efb072a3..24fd48d971 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -125,11 +125,12 @@ (define-public cairo (package (name "cairo") (version "1.16.0") - (replacement cairo/fixed) (source (origin (method url-fetch) (uri (string-append "https://cairographics.org/releases/cairo-" version ".tar.xz")) + (patches (search-patches "cairo-CVE-2018-19876.patch" + "cairo-CVE-2020-35492.patch")) (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) @@ -176,15 +177,6 @@ (define-public cairo (license license:lgpl2.1) ; or Mozilla Public License 1.1 (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 ;; Variant used to break the dependency cycle between Poppler and Cairo. (package/inherit cairo -- cgit v1.2.3