rpms/xcf-pixbuf-loader/F-13 0001-Add-support-for-BZ2-compression-using-GIO.patch, 1.1, 1.2

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/xcf-pixbuf-loader/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15809

Modified Files:
	0001-Add-support-for-BZ2-compression-using-GIO.patch 
Log Message:
Update patch for latest gio

0001-Add-support-for-BZ2-compression-using-GIO.patch:
 Makefile.am             |   12 ++
 configure.ac            |    8 +
 io-xcf.c                |  228 ++++++++++++++++++++++++++++--------------------
 yelp-bz2-decompressor.c |  173 ++++++++++++++++++++++++++++++++++++
 yelp-bz2-decompressor.h |   54 +++++++++++
 5 files changed, 381 insertions(+), 94 deletions(-)

Index: 0001-Add-support-for-BZ2-compression-using-GIO.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xcf-pixbuf-loader/F-13/0001-Add-support-for-BZ2-compression-using-GIO.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Add-support-for-BZ2-compression-using-GIO.patch	1 Mar 2010 17:18:55 -0000	1.1
+++ 0001-Add-support-for-BZ2-compression-using-GIO.patch	1 Mar 2010 17:28:19 -0000	1.2
@@ -1,4 +1,4 @@
-From 02bf06db15ceb579fceb672fc2c7849b821381b2 Mon Sep 17 00:00:00 2001
+From d3671f2929323eb593c526aa0a69854d92a7a649 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 27 Nov 2009 14:41:11 +0000
 Subject: [PATCH] Add support for BZ2 compression using GIO
@@ -6,10 +6,10 @@ Subject: [PATCH] Add support for BZ2 com
 ---
  Makefile.am             |   12 +++-
  configure.ac            |    8 ++-
- io-xcf.c                |  225 ++++++++++++++++++++++++++++------------------
- yelp-bz2-decompressor.c |  173 ++++++++++++++++++++++++++++++++++++
+ io-xcf.c                |  228 ++++++++++++++++++++++++++++-------------------
+ yelp-bz2-decompressor.c |  173 +++++++++++++++++++++++++++++++++++
  yelp-bz2-decompressor.h |   53 +++++++++++
- 5 files changed, 381 insertions(+), 90 deletions(-)
+ 5 files changed, 381 insertions(+), 93 deletions(-)
  create mode 100644 yelp-bz2-decompressor.c
  create mode 100644 yelp-bz2-decompressor.h
 
@@ -64,10 +64,10 @@ index 7b0c4aa..25269cb 100644
  AC_CHECK_HEADER(bzlib.h,,AC_MSG_ERROR(Can not find bzlib header))
  AC_CHECK_LIB(bz2,BZ2_bzDecompressInit,,AC_MSG_ERROR(Can not find libbz2))
 diff --git a/io-xcf.c b/io-xcf.c
-index e47e525..bc1d8a3 100644
+index e47e525..cb480e9 100644
 --- a/io-xcf.c
 +++ b/io-xcf.c
-@@ -36,6 +36,8 @@
+@@ -36,13 +36,13 @@
  
  #define GDK_PIXBUF_ENABLE_BACKEND
  
@@ -76,15 +76,15 @@ index e47e525..bc1d8a3 100644
  #include <gmodule.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
  #include <gio/gio.h>
-@@ -43,6 +45,7 @@
- #include <gio/gzlibcompressor.h>
- #include <gio/gunixinputstream.h>
- #include <gio/gunixoutputstream.h>
+ #if GIO_2_23
+-#include <gio/gzlibcompressor.h>
+-#include <gio/gunixinputstream.h>
+-#include <gio/gunixoutputstream.h>
 +#include "yelp-bz2-decompressor.h"
  #endif
  #include <math.h>
  #include <string.h>
-@@ -105,13 +108,13 @@
+@@ -105,13 +105,13 @@
  #define LAYERMODE_GRAINEXTRACT	20
  #define LAYERMODE_GRAINMERGE	21
  
@@ -105,7 +105,7 @@ index e47e525..bc1d8a3 100644
  
  typedef struct _XcfContext XcfContext;
  struct _XcfContext {
-@@ -1198,10 +1201,80 @@ xcf_image_load_real (FILE *f, XcfContext *context, GError **error)
+@@ -1198,10 +1198,80 @@ xcf_image_load_real (FILE *f, XcfContext *context, GError **error)
  static GdkPixbuf*
  xcf_image_load (FILE *f, GError **error)
  {
@@ -189,7 +189,7 @@ index e47e525..bc1d8a3 100644
  		gchar *tempname;
  		gint fd = g_file_open_tmp ("gdkpixbuf-xcf-tmp.XXXXXX", &tempname, NULL);
  		if (fd < 0) {
-@@ -1282,52 +1355,13 @@ xcf_image_load (FILE *f, GError **error)
+@@ -1282,52 +1352,13 @@ xcf_image_load (FILE *f, GError **error)
  		GdkPixbuf *pixbuf = xcf_image_load_real (file, NULL, error);
  		fclose (file);
  		return pixbuf;
@@ -248,7 +248,7 @@ index e47e525..bc1d8a3 100644
  }
  
  
-@@ -1387,22 +1421,9 @@ xcf_image_stop_load (gpointer data, GError **error)
+@@ -1387,22 +1418,9 @@ xcf_image_stop_load (gpointer data, GError **error)
  
  	g_return_val_if_fail (data, TRUE);
  
@@ -273,7 +273,7 @@ index e47e525..bc1d8a3 100644
  		g_object_unref (context->input);
  		context->input = NULL;
  
-@@ -1426,11 +1447,28 @@ xcf_image_stop_load (gpointer data, GError **error)
+@@ -1426,11 +1444,28 @@ xcf_image_stop_load (gpointer data, GError **error)
  			retval = FALSE;
  			goto bail;
  		}
@@ -302,7 +302,7 @@ index e47e525..bc1d8a3 100644
  	fflush (context->file);
  	rewind (context->file);
  	if (context->tempname) {
-@@ -1475,11 +1513,30 @@ xcf_image_load_increment (gpointer data,
+@@ -1475,11 +1510,30 @@ xcf_image_load_increment (gpointer data,
  	}
  
  	if (context->type == FILETYPE_UNKNOWN) { // first chunk
@@ -335,7 +335,7 @@ index e47e525..bc1d8a3 100644
  			//Initialize bzlib
  			context->bz_stream = g_new (bz_stream, 1);
  			context->bz_stream->bzalloc = NULL;
-@@ -1493,23 +1550,20 @@ xcf_image_load_increment (gpointer data,
+@@ -1493,23 +1547,20 @@ xcf_image_load_increment (gpointer data,
  				context->bz_stream = NULL;
  				return FALSE;
  			}
@@ -367,7 +367,7 @@ index e47e525..bc1d8a3 100644
  	case FILETYPE_XCF_BZ2:
  		outbuf = g_new (gchar, 65536);
  		context->bz_stream->next_in = (gchar*)buf;
-@@ -1563,11 +1617,6 @@ xcf_image_load_increment (gpointer data,
+@@ -1563,11 +1614,6 @@ xcf_image_load_increment (gpointer data,
  		   context->bz_stream = NULL;
  		}
  		break;