Update to 2.32.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14919 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 382 insertions, 0 deletions

diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
new file mode 100644
index 000000000..f2ac7216d
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- 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 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-ah b/x11-toolkits/gtk20/files/patch-ah
new file mode 100644
index 000000000..b6a6a7172
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	2009-12-25 20:26:59.000000000 +0100
++++ docs/Makefile.in	2009-12-25 20:27:35.000000000 +0100
+@@ -241,7 +241,7 @@
+ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+ LT_VERSION_INFO = @LT_VERSION_INFO@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MATH_LIB = @MATH_LIB@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
new file mode 100644
index 000000000..a9d1d5f21
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -0,0 +1,11 @@
+--- 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 gtk libgail-util
++SUBDIRS = #gdk gtk libgail-util
+ GITIGNOREFILES = */*.1
+ all: all-recursive
+ 
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
new file mode 100644
index 000000000..7f8e0eb0c
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,11 @@
+--- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
++++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
+@@ -315,7 +315,7 @@
+ #
+ # Rule to install gdkconfig.h header file
+ #
+-configexecincludedir = $(libdir)/gtk-2.0/include
++configexecincludedir = $(prefix)/include/gtk-2.0
+ 
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure
new file mode 100644
index 000000000..06a6f7b9f
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2009-12-26 21:41:27.000000000 +0100
++++ configure	2009-12-26 21:51:04.000000000 +0100
+@@ -33884,9 +33884,9 @@
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
+        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
new file mode 100644
index 000000000..82740da0a
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -0,0 +1,280 @@
+Stock icons. This was removed in 2.21.x, however it is used by atleast firefox.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629878
+
+--- gtk/Makefile.in.orig	2010-11-21 16:06:15.000000000 +0100
++++ gtk/Makefile.in	2010-11-21 16:36:39.000000000 +0100
+@@ -1352,9 +1352,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 = $(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		\
+@@ -1595,7 +1595,171 @@
+ 	stock-icons/24/folder-remote.png 		\
+ 	stock-icons/24/user-home.png 			\
+ 	stock-icons/24/user-desktop.png 		\
+-	stock-icons/24/text-x-generic.png
++	stock-icons/24/text-x-generic.png               \
++	stock-icons/16/gtk-quit.png                     \
++	stock-icons/16/gtk-info.png                     \
++	stock-icons/16/gtk-file.png                     \
++	stock-icons/16/gtk-open.png                     \
++	stock-icons/16/gtk-print-preview.png            \
++	stock-icons/16/gtk-print.png                    \
++	stock-icons/16/gtk-properties.png               \
++	stock-icons/16/gtk-revert-to-saved-ltr.png      \
++	stock-icons/16/gtk-revert-to-saved-rtl.png      \
++	stock-icons/16/gtk-save-as.png                  \
++	stock-icons/16/gtk-new.png                      \
++	stock-icons/16/gtk-harddisk.png                 \
++	stock-icons/16/gtk-clear.png                    \
++	stock-icons/16/gtk-copy.png                     \
++	stock-icons/16/gtk-cut.png                      \
++	stock-icons/16/gtk-delete.png                   \
++	stock-icons/16/gtk-find-and-replace.png         \
++	stock-icons/16/gtk-find.png                     \
++	stock-icons/16/gtk-paste.png                    \
++	stock-icons/16/gtk-redo-ltr.png                 \
++	stock-icons/16/gtk-redo-rtl.png                 \
++	stock-icons/16/gtk-select-all.png               \
++	stock-icons/16/gtk-undo-ltr.png                 \
++	stock-icons/16/gtk-undo-rtl.png                 \
++	stock-icons/16/gtk-directory.png                \
++	stock-icons/16/gtk-unindent-ltr.png             \
++	stock-icons/16/gtk-unindent-rtl.png             \
++	stock-icons/16/gtk-indent-ltr.png               \
++	stock-icons/16/gtk-indent-rtl.png               \
++	stock-icons/16/gtk-justify-center.png           \
++	stock-icons/16/gtk-justify-fill.png             \
++	stock-icons/16/gtk-justify-left.png             \
++	stock-icons/16/gtk-justify-right.png            \
++	stock-icons/16/gtk-bold.png                     \
++	stock-icons/16/gtk-italic.png                   \
++	stock-icons/16/gtk-strikethrough.png            \
++	stock-icons/16/gtk-underline.png                \
++	stock-icons/16/gtk-goto-bottom.png              \
++	stock-icons/16/gtk-go-down.png                  \
++	stock-icons/16/gtk-goto-first-ltr.png           \
++	stock-icons/16/gtk-home.png                     \
++	stock-icons/16/gtk-jump-to-ltr.png              \
++	stock-icons/16/gtk-jump-to-rtl.png              \
++	stock-icons/16/gtk-goto-last-ltr.png            \
++	stock-icons/16/gtk-go-forward-ltr.png           \
++	stock-icons/16/gtk-go-back-ltr.png              \
++	stock-icons/16/gtk-goto-top.png                 \
++	stock-icons/16/gtk-go-up.png                    \
++	stock-icons/16/gtk-about.png                    \
++	stock-icons/16/gtk-help.png                     \
++	stock-icons/16/gtk-missing-image.png            \
++	stock-icons/16/gtk-add.png                      \
++	stock-icons/16/gtk-remove.png                   \
++	stock-icons/16/gtk-floppy.png                   \
++	stock-icons/16/gtk-cdrom.png                    \
++	stock-icons/16/gtk-media-pause.png              \
++	stock-icons/16/gtk-media-play-ltr.png           \
++	stock-icons/16/gtk-media-play-rtl.png           \
++	stock-icons/16/gtk-media-stop.png               \
++	stock-icons/16/gtk-media-record.png             \
++	stock-icons/16/gtk-media-rewind-ltr.png         \
++	stock-icons/16/gtk-media-forward-ltr.png        \
++	stock-icons/16/gtk-media-previous-ltr.png       \
++	stock-icons/16/gtk-media-next-ltr.png           \
++	stock-icons/16/gtk-network.png                  \
++	stock-icons/16/gtk-print-error.png              \
++	stock-icons/16/gtk-print-report.png             \
++	stock-icons/16/gtk-print-paused.png             \
++	stock-icons/16/gtk-print-warning.png            \
++	stock-icons/16/gtk-stop.png                     \
++	stock-icons/16/gtk-execute.png                  \
++	stock-icons/16/gtk-spell-check.png              \
++	stock-icons/16/gtk-fullscreen.png               \
++	stock-icons/16/gtk-refresh.png                  \
++	stock-icons/16/gtk-leave-fullscreen.png         \
++	stock-icons/16/gtk-sort-ascending.png           \
++	stock-icons/16/gtk-sort-descending.png          \
++	stock-icons/16/gtk-close.png                    \
++	stock-icons/16/gtk-zoom-fit.png                 \
++	stock-icons/16/gtk-zoom-in.png                  \
++	stock-icons/16/gtk-zoom-100.png                 \
++	stock-icons/16/gtk-zoom-out.png                 \
++	stock-icons/24/gtk-quit.png                     \
++	stock-icons/24/gtk-info.png                     \
++	stock-icons/24/gtk-file.png                     \
++	stock-icons/24/gtk-open.png                     \
++	stock-icons/24/gtk-print-preview.png            \
++	stock-icons/24/gtk-print.png                    \
++	stock-icons/24/gtk-properties.png               \
++	stock-icons/24/gtk-revert-to-saved-ltr.png      \
++	stock-icons/24/gtk-revert-to-saved-rtl.png      \
++	stock-icons/24/gtk-save-as.png                  \
++	stock-icons/24/gtk-new.png                      \
++	stock-icons/24/gtk-harddisk.png                 \
++	stock-icons/24/gtk-clear.png                    \
++	stock-icons/24/gtk-copy.png                     \
++	stock-icons/24/gtk-cut.png                      \
++	stock-icons/24/gtk-delete.png                   \
++	stock-icons/24/gtk-find-and-replace.png         \
++	stock-icons/24/gtk-find.png                     \
++	stock-icons/24/gtk-paste.png                    \
++	stock-icons/24/gtk-redo-ltr.png                 \
++	stock-icons/24/gtk-redo-rtl.png                 \
++	stock-icons/24/gtk-select-all.png               \
++	stock-icons/24/gtk-undo-ltr.png                 \
++	stock-icons/24/gtk-undo-rtl.png                 \
++	stock-icons/24/gtk-directory.png                \
++	stock-icons/24/gtk-unindent-ltr.png             \
++	stock-icons/24/gtk-unindent-rtl.png             \
++	stock-icons/24/gtk-indent-ltr.png               \
++	stock-icons/24/gtk-indent-rtl.png               \
++	stock-icons/24/gtk-justify-center.png           \
++	stock-icons/24/gtk-justify-fill.png             \
++	stock-icons/24/gtk-justify-left.png             \
++	stock-icons/24/gtk-justify-right.png            \
++	stock-icons/24/gtk-bold.png                     \
++	stock-icons/24/gtk-italic.png                   \
++	stock-icons/24/gtk-strikethrough.png            \
++	stock-icons/24/gtk-underline.png                \
++	stock-icons/24/gtk-goto-bottom.png              \
++	stock-icons/24/gtk-go-down.png                  \
++	stock-icons/24/gtk-goto-first-ltr.png           \
++	stock-icons/24/gtk-home.png                     \
++	stock-icons/24/gtk-jump-to-ltr.png              \
++	stock-icons/24/gtk-jump-to-rtl.png              \
++	stock-icons/24/gtk-goto-last-ltr.png            \
++	stock-icons/24/gtk-go-forward-ltr.png           \
++	stock-icons/24/gtk-go-back-ltr.png              \
++	stock-icons/24/gtk-goto-top.png                 \
++	stock-icons/24/gtk-go-up.png                    \
++	stock-icons/24/gtk-about.png                    \
++	stock-icons/24/gtk-help.png                     \
++	stock-icons/24/gtk-missing-image.png            \
++	stock-icons/24/gtk-add.png                      \
++	stock-icons/24/gtk-remove.png                   \
++	stock-icons/24/gtk-floppy.png                   \
++	stock-icons/24/gtk-cdrom.png                    \
++	stock-icons/24/gtk-media-pause.png              \
++	stock-icons/24/gtk-media-play-ltr.png           \
++	stock-icons/24/gtk-media-play-rtl.png           \
++	stock-icons/24/gtk-media-stop.png               \
++	stock-icons/24/gtk-media-record.png             \
++	stock-icons/24/gtk-media-rewind-ltr.png         \
++	stock-icons/24/gtk-media-forward-ltr.png        \
++	stock-icons/24/gtk-media-previous-ltr.png       \
++	stock-icons/24/gtk-media-next-ltr.png           \
++	stock-icons/24/gtk-network.png                  \
++	stock-icons/24/gtk-print-error.png              \
++	stock-icons/24/gtk-print-report.png             \
++	stock-icons/24/gtk-print-paused.png             \
++	stock-icons/24/gtk-print-warning.png            \
++	stock-icons/24/gtk-stop.png                     \
++	stock-icons/24/gtk-execute.png                  \
++	stock-icons/24/gtk-spell-check.png              \
++	stock-icons/24/gtk-fullscreen.png               \
++	stock-icons/24/gtk-refresh.png                  \
++	stock-icons/24/gtk-leave-fullscreen.png         \
++	stock-icons/24/gtk-sort-ascending.png           \
++	stock-icons/24/gtk-sort-descending.png          \
++	stock-icons/24/gtk-close.png                    \
++	stock-icons/24/gtk-zoom-fit.png                 \
++	stock-icons/24/gtk-zoom-in.png                  \
++	stock-icons/24/gtk-zoom-100.png                 \
++	stock-icons/24/gtk-zoom-out.png
+ 
+ @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
+ @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
+@@ -2866,6 +3030,88 @@
+ 	   && $(LN_S) folder.png user-desktop.png 			\
+ 	   && $(RM) text-x-generic.png 					\
+ 	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
++	   && $(LN_S) application-exit.png gtk-quit.png                 \
++	   && $(LN_S) dialog-info.png gtk-info.png                      \
++	   && $(LN_S) document-new.png gtk-file.png                     \
++	   && $(LN_S) document-open.png gtk-open.png                    \
++	   && $(LN_S) document-print-preview.png gtk-print-preview.png                  \
++	   && $(LN_S) document-print.png gtk-print.png                  \
++	   && $(LN_S) document-properties.png gtk-properties.png                        \
++	   && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png                       \
++	   && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png                       \
++	   && $(LN_S) document-save-as.png gtk-save-as.png                      \
++	   && $(LN_S) document-x-generic.png gtk-new.png                        \
++	   && $(LN_S) drive-harddisk.png gtk-harddisk.png                       \
++	   && $(LN_S) edit-clear.png gtk-clear.png                      \
++	   && $(LN_S) edit-copy.png gtk-copy.png                        \
++	   && $(LN_S) edit-cut.png gtk-cut.png                  \
++	   && $(LN_S) edit-delete.png gtk-delete.png                    \
++	   && $(LN_S) edit-find-replace.png gtk-find-and-replace.png                    \
++	   && $(LN_S) edit-find.png gtk-find.png                        \
++	   && $(LN_S) edit-paste.png gtk-paste.png                      \
++	   && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png                        \
++	   && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png                        \
++	   && $(LN_S) edit-select-all.png gtk-select-all.png                    \
++	   && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png                        \
++	   && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png                        \
++	   && $(LN_S) folder.png gtk-directory.png                      \
++	   && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png                   \
++	   && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png                   \
++	   && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png                     \
++	   && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png                     \
++	   && $(LN_S) format-justify-center.png gtk-justify-center.png                  \
++	   && $(LN_S) format-justify-fill.png gtk-justify-fill.png                      \
++	   && $(LN_S) format-justify-left.png gtk-justify-left.png                      \
++	   && $(LN_S) format-justify-right.png gtk-justify-right.png                    \
++	   && $(LN_S) format-text-bold.png gtk-bold.png                 \
++	   && $(LN_S) format-text-italic.png gtk-italic.png                     \
++	   && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png                       \
++	   && $(LN_S) format-text-underline.png gtk-underline.png                       \
++	   && $(LN_S) go-bottom.png gtk-goto-bottom.png                 \
++	   && $(LN_S) go-down.png gtk-go-down.png                       \
++	   && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png                   \
++	   && $(LN_S) go-home.png gtk-home.png                  \
++	   && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png                       \
++	   && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png                       \
++	   && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png                     \
++	   && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png                    \
++	   && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png                   \
++	   && $(LN_S) go-top.png gtk-goto-top.png                       \
++	   && $(LN_S) go-up.png gtk-go-up.png                   \
++	   && $(LN_S) help-about.png gtk-about.png                      \
++	   && $(LN_S) help-contents.png gtk-help.png                    \
++	   && $(LN_S) image-missing.png gtk-missing-image.png                   \
++	   && $(LN_S) list-add.png gtk-add.png                  \
++	   && $(LN_S) list-remove.png gtk-remove.png                    \
++	   && $(LN_S) media-floppy.png gtk-floppy.png                   \
++	   && $(LN_S) media-optical.png gtk-cdrom.png                   \
++	   && $(LN_S) media-playback-pause.png gtk-media-pause.png                      \
++	   && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png                       \
++	   && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png                       \
++	   && $(LN_S) media-playback-stop.png gtk-media-stop.png                        \
++	   && $(LN_S) media-record.png gtk-media-record.png                     \
++	   && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png                      \
++	   && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png                      \
++	   && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png                    \
++	   && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png                 \
++	   && $(LN_S) network-idle.png gtk-network.png                  \
++	   && $(LN_S) printer-error.png gtk-print-error.png                     \
++	   && $(LN_S) printer-info.png gtk-print-report.png                     \
++	   && $(LN_S) printer-paused.png gtk-print-paused.png                   \
++	   && $(LN_S) printer-warning.png gtk-print-warning.png                 \
++	   && $(LN_S) process-stop.png gtk-stop.png                     \
++	   && $(LN_S) system-run.png gtk-execute.png                    \
++	   && $(LN_S) tools-check-spelling.png gtk-spell-check.png                      \
++	   && $(LN_S) view-fullscreen.png gtk-fullscreen.png                    \
++	   && $(LN_S) view-refresh.png gtk-refresh.png                  \
++	   && $(LN_S) view-restore.png gtk-leave-fullscreen.png                 \
++	   && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png                    \
++	   && $(LN_S) view-sort-descending.png gtk-sort-descending.png                  \
++	   && $(LN_S) window-close.png gtk-close.png                    \
++	   && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png                        \
++	   && $(LN_S) zoom-in.png gtk-zoom-in.png                       \
++	   && $(LN_S) zoom-original.png gtk-zoom-100.png                        \
++	   && $(LN_S) zoom-out.png gtk-zoom-out.png                     \
+ 	) done 								\
+ 	&& touch stamp-icons
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkbuilderparser.c b/x11-toolkits/gtk20/files/patch-gtk_gtkbuilderparser.c
new file mode 100644
index 000000000..2a2c4aa06
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkbuilderparser.c
@@ -0,0 +1,20 @@
+--- gtk/gtkbuilderparser.c.dist	2010-06-08 14:11:06.000000000 -0500
++++ gtk/gtkbuilderparser.c	2010-06-08 14:11:33.000000000 -0500
+@@ -1051,7 +1051,7 @@
+ /* Called for character data */
+ /* text is not nul-terminated */
+ static void
+-text (GMarkupParseContext *context,
++XXXtext (GMarkupParseContext *context,
+       const gchar         *text,
+       gsize                text_len,
+       gpointer             user_data,
+@@ -1106,7 +1106,7 @@
+ static const GMarkupParser parser = {
+   start_element,
+   end_element,
+-  text,
++  XXXtext,
+   NULL,
+   NULL
+ };
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
new file mode 100644
index 000000000..c687dec40
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
@@ -0,0 +1,13 @@
+--- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
++++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
+@@ -29,7 +29,9 @@
+ #ifndef __GTK_SIGNAL_H__
+ #define __GTK_SIGNAL_H__
+ 
+-#include <gtk/gtk.h>
++#include <gtk/gtkenums.h>
++#include <gtk/gtktypeutils.h>
++#include <gtk/gtkobject.h>
+ #include <gtk/gtkmarshal.h>
+ 
+ G_BEGIN_DECLS
diff --git a/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
new file mode 100644
index 000000000..206257551
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
@@ -0,0 +1,11 @@
+--- gtk/updateiconcache.c.orig	2009-05-11 18:05:35.000000000 +0200
++++ gtk/updateiconcache.c	2009-05-30 12:03:39.000000000 +0200
+@@ -1505,7 +1505,7 @@ opentmp:
+   if (!validate_file (tmp_cache_path))
+     {
+       g_printerr (_("The generated cache was invalid.\n"));
+-      /*g_unlink (tmp_cache_path);*/
++      g_unlink (tmp_cache_path);
+       exit (1);
+     }
+