rpms/gtk2/F-7 gtk+-2.10.14-dont-validate-icon-cache.patch, NONE, 1.1 gtk2.spec, 1.230, 1.231

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/gtk2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21358

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.14-dont-validate-icon-cache.patch 
Log Message:
* Mon Jan 14 2008 Dan Williams <dcbw at redhat.com> - 2.10.14-4
- Only validate an icon cache when debugging (gnome.org #476342)



gtk+-2.10.14-dont-validate-icon-cache.patch:

--- NEW FILE gtk+-2.10.14-dont-validate-icon-cache.patch ---
Bug 476342 – Icon cache validation causes severe page-in
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);


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-7/gtk2.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- gtk2.spec	25 Jul 2007 02:16:07 -0000	1.230
+++ gtk2.spec	14 Jan 2008 20:18:14 -0000	1.231
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
@@ -38,6 +38,8 @@
 Patch12: gtk+-2.10.11-user-dirs.patch
 # fixed in upstream svn
 Patch13: silence-icon-cache-validator.patch
+# backport from GTK+ 2.12 and later (gnome.org #476342)
+Patch14: gtk+-2.10.14-dont-validate-icon-cache.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -125,6 +127,7 @@
 %patch10 -p1 -b .im-reset
 %patch12 -p1 -b .user-dirs
 %patch13 -p1 -b .silence
+%patch14 -p1 -b .dont-validate-icon-cache
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -291,6 +294,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Jan 14 2008 Dan Williams <dcbw at redhat.com> - 2.10.14-4
+- Only validate an icon cache when debugging (gnome.org #476342)
+
 * Tue Jul 24 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.14-3
 - Silence the icon cache validator (#248789)