diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 16:51:10 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 16:51:10 +0200 |
| commit | aa3542e844cb527d3d95e65de652fd664c77c5b3 (patch) | |
| tree | 8d5be324ad0855a3a2125391223f7a9fc1f7b878 /gnu/packages | |
| parent | d0cc3a98796cc81146f5e8b5a6d644c4e1ff89cc (diff) | |
| download | gnu-guix-aa3542e844cb527d3d95e65de652fd664c77c5b3.tar gnu-guix-aa3542e844cb527d3d95e65de652fd664c77c5b3.tar.gz | |
gnu: gdk-pixbuf: Update to 2.36.9.
* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.36.9.
[source]: Remove obsolete patch.
* gnu/packages/patches/gdk-pixbuf-list-dir.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/gtk.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/gdk-pixbuf-list-dir.patch | 35 |
2 files changed, 2 insertions, 38 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4b0c1a271e..3e8d87e91b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.36.6") + (version "2.36.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -435,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")))) + "02klisz3ly0bvflj39x49lnl4mnldsgvkjdvnla1as8szxqv44w0")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-x11") diff --git a/gnu/packages/patches/gdk-pixbuf-list-dir.patch b/gnu/packages/patches/gdk-pixbuf-list-dir.patch deleted file mode 100644 index 137914a19c..0000000000 --- a/gnu/packages/patches/gdk-pixbuf-list-dir.patch +++ /dev/null @@ -1,35 +0,0 @@ -Sort directory entries so that the output of -‘gdk-pixbuf-query-loaders’ is deterministic. - -See: https://bugzilla.gnome.org/show_bug.cgi?id=777332 ---- gdk-pixbuf-2.34.0/gdk-pixbuf/queryloaders.c.orig 2017-01-11 00:17:32.865843062 +0100 -+++ gdk-pixbuf-2.34.0/gdk-pixbuf/queryloaders.c 2017-01-16 16:12:03.420667874 +0100 -@@ -354,16 +354,27 @@ - - dir = g_dir_open (path, 0, NULL); - if (dir) { -+ GList *entries = NULL; - const char *dent; - - while ((dent = g_dir_read_name (dir))) { - gint len = strlen (dent); - if (len > SOEXT_LEN && - strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) { -- query_module (contents, path, dent); -+ entries = g_list_append (entries, g_strdup (dent)); - } - } - g_dir_close (dir); -+ /* Sort directory entries so that the output of -+ ‘gdk-pixbuf-query-loaders’ is deterministic. */ -+ entries = g_list_sort (entries, (GCompareFunc) strcmp); -+ GList *xentries; -+ for (xentries = entries; xentries; xentries = g_list_next (xentries)) { -+ dent = xentries->data; -+ query_module (contents, path, dent); -+ g_free (xentries->data); -+ } -+ g_list_free (entries); - } - #else - g_string_append_printf (contents, "# dynamic loading of modules not supported\n"); |