r15662 - in /desktop/unstable/gtk+2.0/debian: changelog patches/021_loader-files-d.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Apr 17 10:39:09 2008
New Revision: 15662

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15662
Log:
Flip back gdkpixbuf_module_files_d_str after gdkpixbuf_module_file_str in
  patch 021_loader-files-d; this fixes config of gdk loaders and hence the
  current ia32-libs implementation; the change in 2.12.0-3 was incorrect in
  that it flipped the order for im modules and pixbuf loaders, but only im
  modules had to be flipped; the reason im modules had to be flipped is that
  the first list of modules wins for im modules as there is some duplicate
  checking, while in the case of gdk pixbufs, the last file wins.  What
  remains to be done here is:
  - biarch support, similar to pango, by loading /usr/lib32 and /usr/lib64
    stuff before /usr/lib; allows dropping the config file hack in
    ia32-libs.
  - loading of modules from multiarch locations (not multiarch); allows
    dropping the config file hack in ia32-libs.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=15662&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Thu Apr 17 10:39:09 2008
@@ -1,3 +1,21 @@
+gtk+2.0 (2.12.9-4) UNRELEASED; urgency=low
+
+  * Flip back gdkpixbuf_module_files_d_str after gdkpixbuf_module_file_str in
+    patch 021_loader-files-d; this fixes config of gdk loaders and hence the
+    current ia32-libs implementation; the change in 2.12.0-3 was incorrect in
+    that it flipped the order for im modules and pixbuf loaders, but only im
+    modules had to be flipped; the reason im modules had to be flipped is that
+    the first list of modules wins for im modules as there is some duplicate
+    checking, while in the case of gdk pixbufs, the last file wins.  What
+    remains to be done here is:
+    - biarch support, similar to pango, by loading /usr/lib32 and /usr/lib64
+      stuff before /usr/lib; allows dropping the config file hack in
+      ia32-libs.
+    - loading of modules from multiarch locations (not multiarch); allows
+      dropping the config file hack in ia32-libs.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 17 Apr 2008 12:34:24 +0200
+
 gtk+2.0 (2.12.9-3) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/021_loader-files-d.patch?rev=15662&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/021_loader-files-d.patch Thu Apr 17 10:39:09 2008
@@ -261,8 +261,8 @@
 +
 +#ifdef USE_GMODULE
 +	list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++			      gdkpixbuf_module_file_str,
 +			      gdkpixbuf_module_files_d_str,
-+			      gdkpixbuf_module_file_str,
 +			      NULL);
 +
 +	files = _ugly_copy_of_pango_split_file_list (list_str);