From 15f49231fa899923a9d0ae95289599f0a2a48ede Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 1 Dec 2009 02:34:02 +0000
Subject: [PATCH] avoid autoreconf

---
 gtk-lib64.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++
 gtk2.spec       | 12 +--------
 2 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 gtk-lib64.patch

diff --git a/gtk-lib64.patch b/gtk-lib64.patch
new file mode 100644
index 0000000..c3f7a52
--- /dev/null
+++ b/gtk-lib64.patch
@@ -0,0 +1,66 @@
+diff -up gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c
+--- gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64	2009-11-30 13:10:35.000000000 -0500
++++ gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c	2009-11-30 20:54:21.842859303 -0500
+@@ -305,7 +305,17 @@ gdk_pixbuf_get_module_file (void)
+   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
+ 
+   if (!result)
+-	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
++  {
++	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
++				     HOST, "gdk-pixbuf.loaders", NULL);
++	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
++	  {
++		  g_free (result);
++		  
++		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
++					     "gdk-pixbuf.loaders", NULL);
++	  }
++  }
+ 
+   return result;
+ }
+diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.am
+--- gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64	2009-11-26 01:35:49.000000000 -0500
++++ gtk+-2.19.1/gdk-pixbuf/Makefile.am	2009-11-30 20:54:21.842859303 -0500
+@@ -521,6 +521,7 @@ INCLUDES = \
+ 	-I$(top_srcdir)/gdk-pixbuf 		\
+ 	-I$(top_builddir)/gdk-pixbuf 		\
+ 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
++	-DHOST=\"$(host_triplet)\"              \
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DGTK_PREFIX=\"$(prefix)\"		\
+diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.in
+--- gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64	2009-11-30 20:54:58.058857713 -0500
++++ gtk+-2.19.1/gdk-pixbuf/Makefile.in	2009-11-30 20:55:21.902591753 -0500
+@@ -1344,6 +1344,7 @@ INCLUDES = \
+ 	-I$(top_srcdir)/gdk-pixbuf 		\
+ 	-I$(top_builddir)/gdk-pixbuf 		\
+ 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
++	-DHOST=\"$(host_triplet)\"              \
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DGTK_PREFIX=\"$(prefix)\"		\
+diff -up gtk+-2.19.1/gtk/gtkrc.c.lib64 gtk+-2.19.1/gtk/gtkrc.c
+--- gtk+-2.19.1/gtk/gtkrc.c.lib64	2009-11-26 01:35:50.000000000 -0500
++++ gtk+-2.19.1/gtk/gtkrc.c	2009-11-30 20:54:21.844826383 -0500
+@@ -450,7 +450,17 @@ gtk_rc_get_im_module_file (void)
+       if (im_module_file)
+ 	result = g_strdup (im_module_file);
+       else
+-	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++        {
++          result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, 
++                                     "gtk.immodules", NULL);
++          if (!g_file_test (result, G_FILE_TEST_EXISTS))
++            {
++              g_free (result);
++             
++              result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", 
++                                        "gtk.immodules", NULL);
++            }
++        }
+     }
+ 
+   return result;
diff --git a/gtk2.spec b/gtk2.spec
index d893d60..167660c 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -26,7 +26,7 @@ Source2: update-gtk-immodules
 Source3: im-cedilla.conf
 
 # Biarch changes
-Patch0: gtk+-2.13.5-lib64.patch
+Patch0: gtk-lib64.patch
 Patch1: system-python.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=583273
 Patch2: icon-padding.patch
@@ -160,16 +160,6 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch15 -p1 -b .filesystemref
 
 %build
-libtoolize --force --copy
-
-# Patch0 modifies gdk-pixbuf/Makefile.am
-autoreconf
-
-if ! pkg-config --exists pangoxft ; then
-        echo "No pangoxft.pc!"
-        exit 1
-fi
-
 %configure --with-xinput=xfree 		\
 	   --enable-debug		\
 	   --disable-gtk-doc 		\