* 020_immodules-files-d.patch, 021_loader-files-d.patch: read the

GDK_PIXBUF_MODULE_FILE and GTK_IM_MODULE_FILE variables before the 
  Debian directories. Thanks Thadeu Lima de Souza Cascardo.
  Closes: #439004.
This commit is contained in:
Josselin Mouette
2007-10-11 21:26:13 +00:00
parent 59c3e8b4a9
commit 2ca2e6d5ea
3 changed files with 9 additions and 3 deletions

8
debian/changelog vendored
View File

@ -20,7 +20,13 @@ gtk+2.0 (2.12.0-3) UNRELEASED; urgency=low
mention the age of the upstream libtool in released tarballs which make
relibtoolizing important for hurd-i386; GNOME #484426; Debian #445001.
-- Loic Minier <lool@dooz.org> Sun, 07 Oct 2007 17:59:39 +0200
[ Josselin Mouette ]
* 020_immodules-files-d.patch, 021_loader-files-d.patch: read the
GDK_PIXBUF_MODULE_FILE and GTK_IM_MODULE_FILE variables before the
Debian directories. Thanks Thadeu Lima de Souza Cascardo.
Closes: #439004.
-- Josselin Mouette <joss@debian.org> Thu, 11 Oct 2007 23:25:20 +0200
gtk+2.0 (2.12.0-2) unstable; urgency=low

View File

@ -70,8 +70,8 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c
+ int n;
+
+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+ im_module_file_str,
+ im_module_files_d_str,
+ im_module_file_str,
+ NULL);
+
+ files = pango_split_file_list (list_str);

View File

@ -257,8 +257,8 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
+
+#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);