diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-30 18:21:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-30 18:21:31 +0200 |
| commit | 5866fa558b68b3e0213b9eef93d115e6e38dcc2a (patch) | |
| tree | b39873aae544ad920caaefa8a98f7f5deb5f0a8e /gnu/packages/gnome.scm | |
| parent | ed9d890e0e24b10df6f170fe7c9635151e0423c1 (diff) | |
| parent | 2c11e7be745a790320a42a357635997310d731d0 (diff) | |
| download | guix-5866fa558b68b3e0213b9eef93d115e6e38dcc2a.tar guix-5866fa558b68b3e0213b9eef93d115e6e38dcc2a.tar.gz | |
Merge branch 'wip-ungrafting'
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 11e08e15e9..a572ca9aa3 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") |