package/libgtk2/0815_ia32-hack.patch

   1 --- gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c~     2005-10-03 17:11:49.000000000 +0200
   2 +++ gtk+-2.8.13/gdk-pixbuf/gdk-pixbuf-io.c      2006-03-01 20:33:36.524552192 +0100
   3 @@ -32,6 +32,7 @@
   4  #ifdef HAVE_UNISTD_H
   5  #include <unistd.h>
   6  #endif
   7 +#include <sys/utsname.h>
   8
   9  #include "gdk-pixbuf-private.h"
  10  #include "gdk-pixbuf-io.h"
  11 @@ -276,8 +277,21 @@
  12    gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
  13
  14    if (!result)
  15 -         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
  16 +#if defined(__linux__) && defined (__i386__)
  17 +       {
  18 +         struct utsname uts;
  19
  20 +         uname(&uts);
  21 +         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL);
  22 +         if (strcmp("x86_64", uts.machine) || access(result, R_OK))
  23 +           {
  24 +             g_free(result);
  25 +             result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
  26 +           }
  27 +       }
  28 +#else
  29 +         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
  30 +#endif
  31    return result;
  32  }
  33
  34 --- gtk+-2.8.13/gtk/gtkprivate.h~       2005-03-22 03:14:55.000000000 +0100
  35 +++ gtk+-2.8.13/gtk/gtkprivate.h        2006-03-01 19:51:42.510740384 +0100
  36 @@ -96,6 +96,13 @@
  37
  38  #endif /* G_OS_WIN32 */
  39
  40 +#if defined(__linux__) && defined (__i386__)
  41 +const gchar *_gtk_get_libdir ();
  42 +
  43 +#undef GTK_LIBDIR
  44 +#define GTK_LIBDIR _gtk_get_libdir ()
  45 +#endif
  46 +
  47  gboolean _gtk_fnmatch (const char *pattern,
  48                        const char *string,
  49                        gboolean    no_leading_period);
  50 --- gtk+-2.8.13/gtk/gtkmain.c~  2005-12-06 17:14:30.000000000 +0100
  51 +++ gtk+-2.8.13/gtk/gtkmain.c   2006-03-01 20:36:05.175953744 +0100
  52 @@ -42,6 +42,7 @@
  53  #include <unistd.h>
  54  #endif
  55  #include <sys/types.h>         /* For uid_t, gid_t */
  56 +#include <sys/utsname.h>
  57
  58  #ifdef G_OS_WIN32
  59  #define STRICT
  60 @@ -336,6 +337,28 @@
  61
  62  #endif /* G_OS_WIN32 */
  63
  64 +#if defined(__linux__) && defined (__i386__)
  65 +const gchar *
  66 +_gtk_get_libdir (void)
  67 +{
  68 +  static char *gtk_libdir = NULL;
  69 +  if (gtk_libdir == NULL)
  70 +    {
  71 +#if defined(__linux__) && defined (__i386__)
  72 +      struct utsname uts;
  73 +
  74 +      uname(&uts);
  75 +      if (!strcmp("x86_64", uts.machine)
  76 +         && !access("/usr/lib32/gtk-2.0", R_OK|X_OK))
  77 +       gtk_libdir = "/usr/lib32";
  78 +      else
  79 +#endif
  80 +      gtk_libdir = "/usr/lib";
  81 +    }
  82 +  return gtk_libdir;
  83 +}
  84 +#endif
  85 +
  86  static gboolean do_setlocale = TRUE;
  87
  88  /**
  89 --- gtk+-2.8.13/gtk/gtkrc.c~    2005-11-23 15:24:51.000000000 +0100
  90 +++ gtk+-2.8.13/gtk/gtkrc.c     2006-03-01 20:33:25.952159440 +0100
  91 @@ -38,6 +38,10 @@
  92  #include <string.h>
  93  #include <stdio.h>
  94  #include <stdlib.h>
  95 +#ifdef HAVE_UNISTD_H
  96 +#include <unistd.h>
  97 +#endif
  98 +#include <sys/utsname.h>
  99
 100
 101  #include <glib.h>
 102 @@ -364,7 +368,21 @@
 103        if (im_module_file)
 104         result = g_strdup (im_module_file);
 105        else
 106 +#if defined(__linux__) && defined (__i386__)
 107 +       {
 108 +         struct utsname uts;
 109 +
 110 +         uname(&uts);
 111 +         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL);
 112 +         if (strcmp("x86_64", uts.machine) || access(result, R_OK))
 113 +           {
 114 +             g_free(result);
 115 +             result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
 116 +           }
 117 +       }
 118 +#else
 119         result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
 120 +#endif
 121      }
 122
 123    return result;