[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: gnu: libcroco: Absorb grafted replacement.
From: |
guix-commits |
Subject: |
04/07: gnu: libcroco: Absorb grafted replacement. |
Date: |
Fri, 16 Apr 2021 17:00:09 -0400 (EDT) |
lfam pushed a commit to branch wip-ungrafting
in repository guix.
commit 92434734c515c5b9fdd55d93eba74a56ad3e01d0
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Apr 16 16:51:16 2021 -0400
gnu: libcroco: Absorb grafted replacement.
* gnu/packages/gnome.scm (libcroco)[source]: Use
libcroco-CVE-2020-12825.patch.
[replacement]: Remove field.
(libcroco/fixed): Remove variable.
---
gnu/packages/gnome.scm | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 34f5078..78a473b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3221,10 +3221,10 @@ the GNOME desktop environment.")
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
+ (patches (search-patches "libcroco-CVE-2020-12825.patch"))
(sha256
(base32
"1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"))))
- (replacement libcroco/fixed)
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@@ -3243,21 +3243,6 @@ XML/CSS rendering engine.")
;; LGPLv2.1-only.
(license license:lgpl2.1)))
-(define libcroco/fixed
- (package
- (inherit libcroco)
- (name "libcroco")
- (version "0.6.13")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"))
- (patches (search-patches "libcroco-CVE-2020-12825.patch"))))))
-
(define-public libgsf
(package
(name "libgsf")
- branch wip-ungrafting created (now 76b6c61), guix-commits, 2021/04/16
- 05/07: gnu: cyrus-sasl: Absorb grafted replacement., guix-commits, 2021/04/16
- 01/07: gnu: OpenSSL: Absorb grafted replacement., guix-commits, 2021/04/16
- 02/07: gnu: gdk-pixbuf: Absorb grafted replacement., guix-commits, 2021/04/16
- 03/07: gnu: cairo: Absorb grafted replacement., guix-commits, 2021/04/16
- 07/07: gnu: Python: Absorb grafted replacement., guix-commits, 2021/04/16
- 04/07: gnu: libcroco: Absorb grafted replacement.,
guix-commits <=
- 06/07: gnu: Python 2: Absorb grafted replacement., guix-commits, 2021/04/16