Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/gtk2+/patches/gtk2+-2.14.6-multilib.patch

    Contents of /trunk/gtk2+/patches/gtk2+-2.14.6-multilib.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 740 - (show annotations) (download)
    Sun Dec 28 00:09:43 2008 UTC (15 years, 4 months ago) by niro
    File size: 2456 byte(s) 
    added patch to fix multilib build and pixbuf loaders
    1 diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am gtk+-2.8.0/gdk-pixbuf/Makefile.am
    2 --- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am 2005-07-09 01:10:11.000000000 +0100
    3 +++ gtk+-2.8.0/gdk-pixbuf/Makefile.am 2005-08-17 17:59:20.000000000 +0100
    4 @@ -271,6 +271,7 @@
    5 -I$(top_srcdir)/gdk-pixbuf \
    6 -I$(top_builddir)/gdk-pixbuf \
    7 -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
    8 + -DHOST=\"$(host_triplet)\" \
    9 -DGTK_VERSION=\"$(GTK_VERSION)\" \
    10 -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
    11 -DG_DISABLE_DEPRECATED \
    12 diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in gtk+-2.8.0/gdk-pixbuf/Makefile.in
    13 --- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in 2005-08-17 17:38:06.000000000 +0100
    14 +++ gtk+-2.8.0/gdk-pixbuf/Makefile.in 2005-08-17 17:59:35.000000000 +0100
    15 @@ -504,6 +504,7 @@
    16 -I$(top_srcdir)/gdk-pixbuf \
    17 -I$(top_builddir)/gdk-pixbuf \
    18 -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
    19 + -DHOST=\"$(host_triplet)\" \
    20 -DGTK_VERSION=\"$(GTK_VERSION)\" \
    21 -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
    22 -DG_DISABLE_DEPRECATED \
    23 diff -urN gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c
    24 --- gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c 2005-07-22 16:34:32.000000000 +0100
    25 +++ gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c 2005-08-17 17:44:48.000000000 +0100
    26 @@ -276,8 +276,15 @@
    27 gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
    28
    29 if (!result)
    30 - result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
    31 -
    32 + {
    33 + result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gdk-pixbuf.loaders", NULL);
    34 + if (!g_file_test (result, G_FILE_TEST_EXISTS))
    35 + {
    36 + g_free (result);
    37 +
    38 + result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
    39 + }
    40 + }
    41 return result;
    42 }
    43
    44 diff -urN gtk+-2.8.0.orig/gtk/gtkrc.c gtk+-2.8.0/gtk/gtkrc.c
    45 --- gtk+-2.8.0.orig/gtk/gtkrc.c 2005-04-06 14:49:28.000000000 +0100
    46 +++ gtk+-2.8.0/gtk/gtkrc.c 2005-08-17 17:54:36.000000000 +0100
    47 @@ -364,7 +364,15 @@
    48 if (im_module_file)
    49 result = g_strdup (im_module_file);
    50 else
    51 - result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
    52 + {
    53 + result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
    54 + if (!g_file_test (result, G_FILE_TEST_EXISTS))
    55 + {
    56 + g_free (result);
    57 +
    58 + result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
    59 + }
    60 + }
    61 }
    62
    63 return result;