summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2021-04-16 16:51:16 -0400
committerLeo Famulari <leo@famulari.name>2021-04-16 16:57:28 -0400
commit92434734c515c5b9fdd55d93eba74a56ad3e01d0 (patch)
tree7db299c111bd48804503a897323c701c8c7d8c04 /gnu
parentd178039a07a33751ac4f7cd582df5ae7349db4fb (diff)
gnu: libcroco: Absorb grafted replacement.
* gnu/packages/gnome.scm (libcroco)[source]: Use libcroco-CVE-2020-12825.patch. [replacement]: Remove field. (libcroco/fixed): Remove variable.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gnome.scm17
1 files changed, 1 insertions, 16 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 34f5078581a..78a473b348c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3221,10 +3221,10 @@ the GNOME desktop environment.")
3221 (uri (string-append "mirror://gnome/sources/" name "/" 3221 (uri (string-append "mirror://gnome/sources/" name "/"
3222 (version-major+minor version) "/" 3222 (version-major+minor version) "/"
3223 name "-" version ".tar.xz")) 3223 name "-" version ".tar.xz"))
3224 (patches (search-patches "libcroco-CVE-2020-12825.patch"))
3224 (sha256 3225 (sha256
3225 (base32 3226 (base32
3226 "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")))) 3227 "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"))))
3227 (replacement libcroco/fixed)
3228 (build-system gnu-build-system) 3228 (build-system gnu-build-system)
3229 (native-inputs 3229 (native-inputs
3230 `(("pkg-config" ,pkg-config))) 3230 `(("pkg-config" ,pkg-config)))
@@ -3243,21 +3243,6 @@ XML/CSS rendering engine.")
3243 ;; LGPLv2.1-only. 3243 ;; LGPLv2.1-only.
3244 (license license:lgpl2.1))) 3244 (license license:lgpl2.1)))
3245 3245
3246(define libcroco/fixed
3247 (package
3248 (inherit libcroco)
3249 (name "libcroco")
3250 (version "0.6.13")
3251 (source (origin
3252 (method url-fetch)
3253 (uri (string-append "mirror://gnome/sources/" name "/"
3254 (version-major+minor version) "/"
3255 name "-" version ".tar.xz"))
3256 (sha256
3257 (base32
3258 "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"))
3259 (patches (search-patches "libcroco-CVE-2020-12825.patch"))))))
3260
3261(define-public libgsf 3246(define-public libgsf
3262 (package 3247 (package
3263 (name "libgsf") 3248 (name "libgsf")