5 files changed, 21 insertions, 63 deletions
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
index 307fd6fc2f77..f2ac7216d525 100644
--- a/x11-toolkits/gtk20/files/patch-Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Wed Aug  3 18:09:32 2005
-+++ Makefile.in	Wed Aug  3 18:10:01 2005
-@@ -288,7 +288,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig	2010-06-27 12:13:41.000000000 +0200
++++ Makefile.in	2010-06-27 12:14:23.000000000 +0200
+@@ -456,7 +456,7 @@
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
  
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
  
  # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index 0a4e1022fa27..a9d1d5f214c3 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	2009-09-05 11:17:44.000000000 +0200
-+++ docs/reference/Makefile.in	2009-09-05 11:18:15.000000000 +0200
-@@ -359,7 +359,7 @@ XVFB_START = \
+--- docs/reference/Makefile.in.orig	2010-06-27 12:22:03.000000000 +0200
++++ docs/reference/Makefile.in	2010-06-27 12:22:37.000000000 +0200
+@@ -354,7 +354,7 @@
  	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
  
--SUBDIRS = gdk-pixbuf gdk gtk libgail-util
-+SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+-SUBDIRS = gdk gtk libgail-util
++SUBDIRS = #gdk gtk libgail-util
  GITIGNOREFILES = */*.1
  all: all-recursive
  
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
deleted file mode 100644
index 04ce78984f84..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdk-pixbuf/Makefile.in.orig	2009-09-05 11:19:07.000000000 +0200
-+++ gdk-pixbuf/Makefile.in	2009-09-05 11:20:19.000000000 +0200
-@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
- test_gdk_pixbuf_LDADD = $(LDADDS)
- gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
--gdk_pixbuf_csource_LDADD = $(LDADDS)
-+gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
--gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
- gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
- 
- #
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
deleted file mode 100644
index cca139d6b99a..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gdk-pixbuf/io-png.c.orig	2010-05-02 05:14:27.000000000 +0200
-+++ gdk-pixbuf/io-png.c	2010-05-15 17:30:35.000000000 +0200
-@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+        guint icc_profile_size;
-+#else
-         gulong icc_profile_size;
-+#endif
-         guint32 retval;
-         gint compression_type;
- 
-@@ -607,7 +611,11 @@ png_info_callback   (png_structp png_rea
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+        guint icc_profile_size;
-+#else
-         gulong icc_profile_size;
-+#endif
-         guint32 retval;
-         gint compression_type;
- 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 25056ecf7e03..60254041d668 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- gtk/Makefile.in.orig	2009-12-25 20:27:57.000000000 +0100
-+++ gtk/Makefile.in	2009-12-25 20:29:14.000000000 +0100
-@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig	2010-06-27 12:26:58.000000000 +0200
++++ gtk/Makefile.in	2010-06-27 12:28:14.000000000 +0200
+@@ -1350,9 +1350,9 @@
  # gtk-update-icon-cache.exe doesn't require any special privileges.
  @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
  gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_2_0_LDADD = $(LDADDS)
 +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
  gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- gtk_update_icon_cache_LDADD = \
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
--	$(GDK_PIXBUF_DEP_LIBS)
-+	$(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
- 
- gtk_update_icon_cache_SOURCES = \
- 	updateiconcache.c 
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c 
+ STOCK_ICONS = \
+ 	stock-icons/16/document-open-recent.png		\