diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 21:52:41 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 22:16:38 +0300 |
| commit | 60bf81541cd9c35f3382e10fa6e86d44a932a850 (patch) | |
| tree | fcb30c7a08ad6534daa3bc6fb2c25bc0e4e8d8a5 /gnu/packages/gtk.scm | |
| parent | 7067414bccceefccc96ef5a29352e5fa39e605fc (diff) | |
| download | gnu-guix-60bf81541cd9c35f3382e10fa6e86d44a932a850.tar gnu-guix-60bf81541cd9c35f3382e10fa6e86d44a932a850.tar.gz | |
gnu: gdk-pixbuf: Update to 2.36.10.
* gnu/packages/gtk.scm (gdk-pixbuf, gdk-pixbuf+svg): Update to 2.36.10.
[replacement]: Remove field.
[source]: Remove patch.
(gdk-pixbuf-2.36.10, gdk-pixbuf+svg-2.36.10): Remove variables.
* gnu/packages/patches/gdk-pixbuf-list-dir.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d7c18f90e1..2d95fada21 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Coypright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org> @@ -427,8 +427,7 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (replacement gdk-pixbuf-2.36.10) - (version "2.36.6") + (version "2.36.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -436,8 +435,7 @@ highlighting and other features typical of a source code editor.") name "-" version ".tar.xz")) (sha256 (base32 - "034279k49ydawnagqd7b1rz741n20k4y3grybzwp26zd146bjpj5")) - (patches (search-patches "gdk-pixbuf-list-dir.patch")))) + "1klsjkdbashd8yb8xjsc9ff3bz32n2id5s79nrrmqiw9df4zmxpq")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-x11") @@ -484,7 +482,6 @@ in the GNOME project.") (define-public gdk-pixbuf+svg (package (inherit gdk-pixbuf) (name "gdk-pixbuf+svg") - (replacement gdk-pixbuf+svg-2.36.10) (inputs `(("librsvg" ,librsvg) ,@(package-inputs gdk-pixbuf))) @@ -508,26 +505,6 @@ in the GNOME project.") (synopsis "GNOME image loading and manipulation library, with SVG support"))) -;; Graft replacement packages to fix these vulnerabilities. -;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2862 -;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-2870 -;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6311 -(define-public gdk-pixbuf-2.36.10 - (package (inherit gdk-pixbuf) - (version "2.36.A") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gdk-pixbuf/2.36/" - "gdk-pixbuf-2.36.10.tar.xz")) - (sha256 - (base32 - "1klsjkdbashd8yb8xjsc9ff3bz32n2id5s79nrrmqiw9df4zmxpq")))))) - -(define-public gdk-pixbuf+svg-2.36.10 - (package (inherit gdk-pixbuf+svg) - (version "2.36.A") - (source (origin (inherit (package-source gdk-pixbuf-2.36.10)))))) - (define-public at-spi2-core (package (name "at-spi2-core") |