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

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Nov  4 11:44:27 2007
New Revision: 13374

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13374
Log:
* 021_loader-files-d.patch: enclose process_module_file in correct 
  #ifdef's.

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=13374&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sun Nov  4 11:44:27 2007
@@ -21,8 +21,10 @@
   * Conflict against libeel2-2.18. Closes: #443701, #499070.
   * Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on 
     startup).
-
- -- Josselin Mouette <joss at debian.org>  Sat, 03 Nov 2007 23:04:02 +0100
+  * 021_loader-files-d.patch: enclose process_module_file in correct 
+    #ifdef's.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 04 Nov 2007 12:38:27 +0100
 
 gtk+2.0 (2.12.1-1) unstable; urgency=low
 

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=13374&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 Sun Nov  4 11:44:27 2007
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
+Index: gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c
 ===================================================================
---- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c	2007-06-06 13:43:15.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c	2007-06-13 11:57:45.000000000 +0200
+--- gtk+-2.12.1.orig/gdk-pixbuf/gdk-pixbuf-io.c	2007-11-04 12:35:24.378152677 +0100
++++ gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c	2007-11-04 12:38:15.659913468 +0100
 @@ -45,6 +45,9 @@
  #undef STRICT
  #endif
@@ -12,10 +12,12 @@
  static gint 
  format_check (GdkPixbufModule *module, guchar *buffer, int size)
  {
-@@ -284,87 +287,93 @@
+@@ -284,87 +287,95 @@ gdk_pixbuf_get_module_file (void)
  
  #endif	/* USE_GMODULE */
  
+-static void 
+-gdk_pixbuf_io_init (void)
 +/* FIXME this is a static copy of a public pango function which should really
 + * livein glib */
 +static char *
@@ -39,7 +41,7 @@
 + * livein glib */
 +char **
 +_ugly_copy_of_pango_split_file_list (const char *str)
-+{
+ {
 +  int i = 0;
 +  int j;
 +  char **files;
@@ -91,12 +93,12 @@
 +  return files;
 +}
 +
- static void 
--gdk_pixbuf_io_init (void)
+ #ifdef USE_GMODULE
+-	GIOChannel *channel;
++
++static void 
 +process_module_file (const gchar *filename, GIOChannel *channel)
- {
--#ifdef USE_GMODULE
--	GIOChannel *channel;
++{
  	gchar *line_buf;
  	gsize term;
  	GString *tmp_buf = g_string_new (NULL);
@@ -117,7 +119,7 @@
 -		file_formats = g_slist_prepend (file_formats, builtin_module);\
 -	else								\
 -		g_free (builtin_module)
--
+ 
 -#ifdef INCLUDE_ani
 -	load_one_builtin_module (ani);
 -#endif
@@ -162,7 +164,7 @@
 -#endif
 -
 -#undef load_one_builtin_module
- 
+-
 -#ifdef USE_GMODULE
 -	channel = g_io_channel_new_file (filename, "r",  &error);
 -	if (!channel) {
@@ -176,13 +178,15 @@
  	while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
  		const char *p;
  		
-@@ -497,8 +506,138 @@
+@@ -497,8 +508,140 @@ gdk_pixbuf_io_init (void)
  		g_free (line_buf);
  	}
  	g_string_free (tmp_buf, TRUE);
 -	g_io_channel_unref (channel);
 -	g_free (filename);
 +}
++
++#endif /* USE_GMODULE */
 +
 +static void 
 +gdk_pixbuf_io_init (void)