diff --git a/debian/changelog b/debian/changelog index edb5e3f653..e438518624 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ gtk+2.0 (2.12.0-1) UNRELEASED; urgency=low [ Alan Baghumian ] * New upstream stable release - Regenerated 070_mandatory-relibtoolize.patch + * Added 081_icon-cache-validate.patch, GNOME #476342 [ Loic Minier ] * Refresh patches 033_treeview_resizing and 040_filechooser_single-click to diff --git a/debian/patches/081_icon-cache-validate.patch b/debian/patches/081_icon-cache-validate.patch new file mode 100644 index 0000000000..610d03bf22 --- /dev/null +++ b/debian/patches/081_icon-cache-validate.patch @@ -0,0 +1,30 @@ +# See: http://bugzilla.gnome.org/show_bug.cgi?id=476342 + +--- trunk/gtk/gtkiconcache.c 2007/09/14 01:01:59 18822 ++++ trunk/gtk/gtkiconcache.c 2007/09/14 02:11:01 18823 +@@ -127,14 +127,19 @@ + info.n_directories = 0; + info.flags = CHECK_OFFSETS|CHECK_STRINGS; + +- if (!_gtk_icon_cache_validate (&info)) ++#ifdef G_ENABLE_DEBUG ++ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME) + { +- g_mapped_file_free (map); +- g_warning ("Icon cache '%s' is invalid\n", cache_filename); ++ if (!_gtk_icon_cache_validate (&info)) ++ { ++ g_mapped_file_free (map); ++ g_warning ("Icon cache '%s' is invalid\n", cache_filename); + +- goto done; ++ goto done; ++ } + } +- ++#endif ++ + GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path)); + + cache = g_new0 (GtkIconCache, 1); +