[oe-commits] org.oe.dev gtk 2.10.7: rediffed run-iconcache.patch

[koen commit]

gtk 2.10.7: rediffed run-iconcache.patch

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6483d4d1753ce1d08be64fec9c95489015da580f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6483d4d1753ce1d08be64fec9c95489015da580f
Files:
1
packages/gtk+/gtk+-2.10.7/run-iconcache.patch
packages/gtk+/gtk+_2.10.7.bb
Diffs:

#
# mt diff -rfe7afda01b0900886e5c9d3d14655f2739680faf -r6483d4d1753ce1d08be64fec9c95489015da580f
#
# 
# 
# patch "packages/gtk+/gtk+-2.10.7/run-iconcache.patch"
#  from [cea5b9be8afbf9ec65fb24b3abeafdd6bfb28924]
#    to [2ab8f280d83e22b887247404cd6d7ac1afc3ed37]
# 
# patch "packages/gtk+/gtk+_2.10.7.bb"
#  from [19816b5f17b7d091cabac7596926b2e3cde6ca15]
#    to [77f58867c65f717164bdbcf6c8bf8f98026eaf5e]
# 
============================================================
--- packages/gtk+/gtk+-2.10.7/run-iconcache.patch	cea5b9be8afbf9ec65fb24b3abeafdd6bfb28924
+++ packages/gtk+/gtk+-2.10.7/run-iconcache.patch	2ab8f280d83e22b887247404cd6d7ac1afc3ed37
@@ -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)		\
============================================================
--- packages/gtk+/gtk+_2.10.7.bb	19816b5f17b7d091cabac7596926b2e3cde6ca15
+++ packages/gtk+/gtk+_2.10.7.bb	77f58867c65f717164bdbcf6c8bf8f98026eaf5e
@@ -15,7 +15,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
            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 \