fix build and ensure we install needed runtime components

diff -ruN gtk+-2.0.6.orig/configure gtk+-2.0.6/configure

--- gtk+-2.0.6.orig/configure	2002-08-31 03:49:07.000000000 +0900

+++ gtk+-2.0.6/configure	2002-08-31 03:52:45.000000000 +0900

@@ -7904,7 +7904,8 @@

 if test "$os_win32" != yes; then

     # libtool option to control which symbols are exported

     # right now, symbols starting with _ are not exported

-    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'

+    # Disabled until -export-symbols-regex works (RH patch)

+    LIBTOOL_EXPORT_OPTIONS=

 else

     # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)

     LIBTOOL_EXPORT_OPTIONS=

diff -ruN gtk+-2.0.6.orig/configure.in gtk+-2.0.6/configure.in

--- gtk+-2.0.6.orig/configure.in	2002-08-31 03:49:07.000000000 +0900

+++ gtk+-2.0.6/configure.in	2002-08-31 03:51:22.000000000 +0900

@@ -273,7 +273,8 @@

 if test "$os_win32" != yes; then

     # libtool option to control which symbols are exported

     # right now, symbols starting with _ are not exported

-    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'

+    # Disabled until -export-symbols-regex works (RH patch)

+    LIBTOOL_EXPORT_OPTIONS=

 else

     # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)

     LIBTOOL_EXPORT_OPTIONS=

diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.am gtk+-2.2.0/modules/input/Makefile.am

--- gtk+-2.2.0.orig/modules/input/Makefile.am	2003-01-06 23:40:37.000000000 +0900

+++ gtk+-2.2.0/modules/input/Makefile.am	2003-01-06 23:46:35.000000000 +0900

@@ -118,7 +118,12 @@

 	im-viqr.la

 gtk.immodules: Makefile.am $(module_LTLIBRARIES)

-	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules

+	@if $(RUN_QUERY_IMMODULES_TEST) ; then \

+	  $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ; \

+	else \

+	  touch $@ ; \

+	fi

+

 CLEANFILES = gtk.immodules

diff -ruN gtk+-2.2.0.orig/modules/input/Makefile.in gtk+-2.2.0/modules/input/Makefile.in

--- gtk+-2.2.0.orig/modules/input/Makefile.in	2003-01-06 23:39:08.000000000 +0900

+++ gtk+-2.2.0/modules/input/Makefile.in	2003-01-06 23:46:44.000000000 +0900

@@ -785,7 +785,11 @@

 	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules

 gtk.immodules: Makefile.am $(module_LTLIBRARIES)

-	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules

+	@if $(RUN_QUERY_IMMODULES_TEST) ; then \

+	  $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ; \

+	else \

+	  touch $@ ; \

+	fi

 @CROSS_COMPILING_FALSE@all-local: gtk.immodules

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff -Nur gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c gtk+-2.4.9/gdk-pixbuf/io-ico.c

--- gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c	2004-08-25 18:52:18.000000000 +0200

+++ gtk+-2.4.9/gdk-pixbuf/io-ico.c	2004-09-15 00:40:17.000000000 +0200

@@ -210,6 +210,14 @@

  	State->HeaderSize = 6 + IconCount*16;

+	if (State->HeaderSize < 0) {

+		g_set_error (error,

+			     GDK_PIXBUF_ERROR,

+			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,

+			     _("Invalid header in icon"));

+		return;

+	}

+

  	if (State->HeaderSize>State->BytesInHeaderBuf) {

  		guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);

 		if (!tmp) {

--- gtk+-2.8.10/gtk/gtkentry.c.set-invisible-char-to-bullet	2006-01-19 15:12:18.000000000 -0500

+++ gtk+-2.8.10/gtk/gtkentry.c	2006-01-19 15:36:51.000000000 -0500

@@ -542,7 +542,7 @@

                                    g_param_spec_unichar ("invisible-char",

 							 P_("Invisible character"),

 							 P_("The character to use when masking entry contents (in \"password mode\")"),

-							 '*',

+							 (gunichar) 0x25cf,

 							 GTK_PARAM_READWRITE));

   g_object_class_install_property (gobject_class,

@@ -1000,7 +1000,7 @@

   entry->editable = TRUE;

   entry->visible = TRUE;

-  entry->invisible_char = '*';

+  entry->invisible_char = (gunichar) 0x25cf;

   entry->dnd_position = -1;

   entry->width_chars = -1;

   entry->is_cell_renderer = FALSE;

@@ -4019,9 +4019,9 @@

  * gtk_entry_set_visibility() has been called to set text visibility

  * to %FALSE. i.e. this is the character used in "password mode" to

  * show the user how many characters have been typed. The default

- * invisible char is an asterisk ('*').  If you set the invisible char

- * to 0, then the user will get no feedback at all; there will be

- * no text on the screen as they type.

+ * invisible char is a small bullet (Unicode character 2022). If you

+ * set the invisible char to 0, then the user will get no feedback at

+ * all; there will be no text on the screen as they type.

  * 

  **/

 void

--- gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c~	2005-10-03 17:11:49.000000000 +0200

+++ gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c	2006-03-01 20:33:36.524552192 +0100

@@ -32,6 +32,7 @@

 #ifdef HAVE_UNISTD_H

 #include <unistd.h>

 #endif

+#include <sys/utsname.h>

 #include "gdk-pixbuf-private.h"

 #include "gdk-pixbuf-io.h"

@@ -276,8 +277,21 @@

   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);

+#if defined(__linux__) && defined (__i386__)

+	{

+	  struct utsname uts;

+	  uname(&uts);

+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL);

+	  if (strcmp("x86_64", uts.machine) || access(result, R_OK))

+	    {

+	      g_free(result);

+	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);

+	    }

+	}

+#else

+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);

+#endif

   return result;

 }

--- gtk+-2.8.13/gtk/gtkprivate.h~	2005-03-22 03:14:55.000000000 +0100

+++ gtk+-2.8.13/gtk/gtkprivate.h	2006-03-01 19:51:42.510740384 +0100

@@ -96,6 +96,13 @@

 #endif /* G_OS_WIN32 */

+#if defined(__linux__) && defined (__i386__)

+const gchar *_gtk_get_libdir ();

+

+#undef GTK_LIBDIR

+#define GTK_LIBDIR _gtk_get_libdir ()

+#endif

+

 gboolean _gtk_fnmatch (const char *pattern,

 		       const char *string,

 		       gboolean    no_leading_period);

--- gtk+-2.8.13/gtk/gtkmain.c~	2005-12-06 17:14:30.000000000 +0100

+++ gtk+-2.8.13/gtk/gtkmain.c	2006-03-01 20:36:05.175953744 +0100

@@ -42,6 +42,7 @@

 #include <unistd.h>

 #endif

 #include <sys/types.h>		/* For uid_t, gid_t */

+#include <sys/utsname.h>

 #ifdef G_OS_WIN32

 #define STRICT

@@ -336,6 +337,28 @@

 #endif /* G_OS_WIN32 */

+#if defined(__linux__) && defined (__i386__)

+const gchar *

+_gtk_get_libdir (void)

+{

+  static char *gtk_libdir = NULL;

+  if (gtk_libdir == NULL)

+    {

+#if defined(__linux__) && defined (__i386__)

+      struct utsname uts;

+

+      uname(&uts);

+      if (!strcmp("x86_64", uts.machine)

+	  && !access("/usr/lib32/gtk-2.0", R_OK|X_OK))

+	gtk_libdir = "/usr/lib32";

+      else

+#endif

+      gtk_libdir = "/usr/lib";

+    }

+  return gtk_libdir;

+}

+#endif

+

 static gboolean do_setlocale = TRUE;

 /**

--- gtk+-2.8.13/gtk/gtkrc.c~	2005-11-23 15:24:51.000000000 +0100

+++ gtk+-2.8.13/gtk/gtkrc.c	2006-03-01 20:33:25.952159440 +0100

@@ -38,6 +38,10 @@

 #include <string.h>

 #include <stdio.h>

 #include <stdlib.h>

+#ifdef HAVE_UNISTD_H

+#include <unistd.h>

+#endif

+#include <sys/utsname.h>

 #include <glib.h>

@@ -364,7 +368,21 @@

       if (im_module_file)

 	result = g_strdup (im_module_file);

       else

+#if defined(__linux__) && defined (__i386__)

+	{

+	  struct utsname uts;

+

+	  uname(&uts);

+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL);

+	  if (strcmp("x86_64", uts.machine) || access(result, R_OK))

+	    {

+	      g_free(result);

+	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);

+	    }

+	}

+#else

 	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);

+#endif

     }

   return result;