diff --git a/gtk+-2.13.5-lib64.patch b/gtk+-2.13.5-lib64.patch new file mode 100644 index 0000000..bbc4d32 --- /dev/null +++ b/gtk+-2.13.5-lib64.patch @@ -0,0 +1,55 @@ +diff -up gtk+-2.13.5/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.13.5/gdk-pixbuf/gdk-pixbuf-io.c +--- gtk+-2.13.5/gdk-pixbuf/gdk-pixbuf-io.c.lib64 2008-07-21 16:18:31.000000000 -0400 ++++ gtk+-2.13.5/gdk-pixbuf/gdk-pixbuf-io.c 2008-07-21 22:38:19.000000000 -0400 +@@ -285,7 +285,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.13.5/gdk-pixbuf/Makefile.am.lib64 gtk+-2.13.5/gdk-pixbuf/Makefile.am +--- gtk+-2.13.5/gdk-pixbuf/Makefile.am.lib64 2008-07-21 16:18:31.000000000 -0400 ++++ gtk+-2.13.5/gdk-pixbuf/Makefile.am 2008-07-21 22:43:23.000000000 -0400 +@@ -505,6 +505,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.13.5/gtk/gtkrc.c.lib64 gtk+-2.13.5/gtk/gtkrc.c +--- gtk+-2.13.5/gtk/gtkrc.c.lib64 2008-07-21 16:18:22.000000000 -0400 ++++ gtk+-2.13.5/gtk/gtkrc.c 2008-07-21 22:46:09.000000000 -0400 +@@ -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 64092d5..d8d64b5 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -24,7 +24,7 @@ Source1: update-gdk-pixbuf-loaders Source2: update-gtk-immodules # Biarch changes -Patch0: gtk+-2.4.1-lib64.patch +Patch0: gtk+-2.13.5-lib64.patch # Fedora patch Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch # a workaround for some brokenness in the flash plugin