diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-24 19:50:26 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-24 21:53:10 +0200 |
| commit | 15d34a18c33a349b6817ba21daaf1e369b5e0dd1 (patch) | |
| tree | 4346d05406cf6c66703b7a81291b9c989177514e /gnu/packages/gnome.scm | |
| parent | 9d5aadb35d60769ce46aad9ed8d09b8b0bd00cd0 (diff) | |
| download | guix-15d34a18c33a349b6817ba21daaf1e369b5e0dd1.tar.gz | |
gnu: libcroco: Update to 0.6.12.
* gnu/packages/gnome.scm (libcroco/fixed): Remove variable. (libcroco): Update to 0.6.12. [source]: Use patches from LIBCROCO/FIXED. [replacement]: Remove field.
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2cf6f4e3f0..c0f8392ed3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -949,16 +949,18 @@ the GNOME desktop environment.") (define-public libcroco (package (name "libcroco") - (replacement libcroco/fixed) - (version "0.6.11") + (version "0.6.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches + (search-patches "libcroco-CVE-2017-7960.patch" + "libcroco-CVE-2017-7961.patch")) (sha256 (base32 - "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk")))) + "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -977,19 +979,6 @@ XML/CSS rendering engine.") ;; LGPLv2.1-only. (license license:lgpl2.1))) -(define libcroco/fixed - (package - (inherit libcroco) - (replacement #f) - (source - (origin - (inherit (package-source libcroco)) - (patches - (append - (origin-patches (package-source libcroco)) - (search-patches "libcroco-CVE-2017-7960.patch" - "libcroco-CVE-2017-7961.patch"))))))) - (define-public libgsf (package (name "libgsf") |