Backport patch from GTK 4 to make the icon cache reproducible

Closes: #953105
This commit is contained in:
Simon McVittie
2020-03-25 19:56:28 +00:00
parent 20dc1bfff7
commit 924db2af5d
3 changed files with 59 additions and 0 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
gtk+3.0 (3.24.14-2) UNRELEASED; urgency=medium
* d/p/updateiconcache-Sort-list-of-entries.patch:
Backport patch from GTK 4 to make the icon cache reproducible
(Closes: #953105)
-- Simon McVittie <smcv@debian.org> Wed, 25 Mar 2020 19:55:39 +0000
gtk+3.0 (3.24.14-1) unstable; urgency=medium
* Team upload

View File

@ -20,3 +20,4 @@ demos-examples-tests-Don-t-distribute-built-files.patch
reftest-known-fail.patch
Don-t-test-default-constructed-GdkPixbuf-properties.patch
Disable-accessibility-dump-aka-a11ytests-test.patch
updateiconcache-Sort-list-of-entries.patch

View File

@ -0,0 +1,50 @@
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Wed, 15 Aug 2018 03:11:21 +0200
Subject: updateiconcache: Sort list of entries
because filesystem readdir order is indeterministic.
Without this patch, building openSUSE's balsa package
had variations between builds in /usr/share/balsa/icon-theme.cache
Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/297
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=953105
Applied-upstream: 3.96.0, commit:b364827a5b99e3b02862f36be4c03826e72aefba
---
gtk/updateiconcache.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 6f76b6a..fd66ac8 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -600,6 +600,7 @@ scan_directory (const gchar *base_path,
{
GHashTable *dir_hash;
GDir *dir;
+ GList *list = NULL, *iterator = NULL;
const gchar *name;
gchar *dir_path;
gboolean dir_added = FALSE;
@@ -617,6 +618,13 @@ scan_directory (const gchar *base_path,
while ((name = g_dir_read_name (dir)))
{
+ list = g_list_prepend (list, g_strdup (name));
+ }
+ list = g_list_sort (list, (GCompareFunc) strcmp);
+ for (iterator = list; iterator; iterator = iterator->next)
+ {
+ name = iterator->data;
+
gchar *path;
gboolean retval;
int flags = 0;
@@ -695,6 +703,7 @@ scan_directory (const gchar *base_path,
g_free (path);
}
+ g_list_free_full (list, g_free);
g_dir_close (dir);
/* Move dir into the big file hash */