gtk 2.10.7: rediffed run-iconcache.patch

diff --git a/packages/gtk+/gtk+-2.10.7/run-iconcache.patch b/packages/gtk+/gtk+-2.10.7/run-iconcache.patch
index 5c114db..ac15e9a 100644 (file)
--- a/packages/gtk+/gtk+-2.10.7/run-iconcache.patch
+++ b/packages/gtk+/gtk+-2.10.7/run-iconcache.patch
@@ -1,21 +1,19 @@
-Index: gtk+-2.10.6/gtk/Makefile.am
-===================================================================
---- gtk+-2.10.6.orig/gtk/Makefile.am   2006-10-30 12:56:34.000000000 +0000
-+++ gtk+-2.10.6/gtk/Makefile.am        2006-10-30 12:57:08.000000000 +0000
-@@ -1119,11 +1119,11 @@
-       done                                                                    \
-       && touch stamp-icons
+--- /tmp/Makefile.am   2007-01-08 17:44:47.000000000 +0100
++++ gtk+-2.10.7/gtk/Makefile.am        2007-01-08 17:45:17.025251000 +0100
+@@ -1128,11 +1128,11 @@
+          ./gtk-update-icon-cache
+ endif
  
 -gtkbuiltincache.h: @REBUILD@ stamp-icons
 -      $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
--      GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders    \
--         ./gtk-update-icon-cache --force --ignore-theme-index                 \
--         --source builtin_icons stock-icons > gtkbuiltincache.h
+-      $(gtk_update_icon_cache_program) --force --ignore-theme-index           \
+-         --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+-      mv gtkbuiltincache.h.tmp gtkbuiltincache.h
 +#gtkbuiltincache.h: @REBUILD@ stamp-icons
 +#     $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
-+#     GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders    \
-+#        ./gtk-update-icon-cache --force --ignore-theme-index                 \
-+#        --source builtin_icons stock-icons > gtkbuiltincache.h
++#     $(gtk_update_icon_cache_program) --force --ignore-theme-index           \
++#        --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
++#     mv gtkbuiltincache.h.tmp gtkbuiltincache.h
  
  EXTRA_DIST +=                   \
        $(STOCK_ICONS)          \

diff --git a/packages/gtk+/gtk+_2.10.7.bb b/packages/gtk+/gtk+_2.10.7.bb
index e3a7718..7f0fc4e 100644 (file)
--- a/packages/gtk+/gtk+_2.10.7.bb
+++ b/packages/gtk+/gtk+_2.10.7.bb
@@ -15,7 +15,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://scroll-timings.patch;patch=1 \
            file://small-gtkfilesel.patch;patch=1 \
            file://migration.patch;patch=1;pnum=0 \
-#           file://run-iconcache.patch;patch=1 \
+           file://run-iconcache.patch;patch=1 \
 #           file://hardcoded_libtool.patch;patch=1 \
            file://no-demos.patch;patch=1 \
            file://single-click.patch;patch=1 \