3 files changed, 21 insertions, 8 deletions
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index 4d2c63f0d2e2..b6a6a71721f5 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,6 +1,6 @@
---- docs/Makefile.in.orig	2010-01-18 01:13:15.000000000 -0500
-+++ docs/Makefile.in	2010-01-18 01:14:29.000000000 -0500
-@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@
+--- 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@
diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure
new file mode 100644
index 000000000000..06a6f7b9fa22
--- /dev/null
+++ b/x11-toolkits/gtk30/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/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 348bb57b8fdb..25056ecf7e03 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig	2010-01-18 01:17:13.000000000 -0500
-+++ gtk/Makefile.in	2010-01-18 01:18:40.000000000 -0500
-@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- 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-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)
@@ -10,8 +10,7 @@
  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)
++	$(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
  
  gtk_update_icon_cache_SOURCES = \
  	updateiconcache.c