[mingw-gtk2: 14/65] - Update to 2.17.9 - Rebuild against mingw32-libjpeg 7

[epienbro]

commit 7e910095571f00d9d7af4c05080415642c9b39c2
Author: epienbro <epienbro at fedoraproject.org>
Date:   Thu Aug 27 21:01:32 2009 +0000

    - Update to 2.17.9
    - Rebuild against mingw32-libjpeg 7

 .cvsignore                                |    2 +-
 mingw32-gtk2-libjpeg7-compatibility.patch |   38 +++++++++++++++++++++++++++++
 mingw32-gtk2.spec                         |   10 +++++++-
 sources                                   |    2 +-
 4 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 7f1a9b2..1ca3144 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk+-2.17.8.tar.bz2
+gtk+-2.17.9.tar.bz2
diff --git a/mingw32-gtk2-libjpeg7-compatibility.patch b/mingw32-gtk2-libjpeg7-compatibility.patch
new file mode 100644
index 0000000..793b68a
--- /dev/null
+++ b/mingw32-gtk2-libjpeg7-compatibility.patch
@@ -0,0 +1,38 @@
+--- gdk-pixbuf/io-jpeg.c.orig	2009-08-20 14:44:30.795114182 +0200
++++ gdk-pixbuf/io-jpeg.c	2009-08-20 14:45:14.220875249 +0200
+@@ -204,7 +204,7 @@
+ 
+   FILE * infile;		/* source stream */
+   JOCTET * buffer;		/* start of buffer */
+-  boolean start_of_file;	/* have we gotten any data yet? */
++  jpeg_boolean start_of_file;	/* have we gotten any data yet? */
+ } stdio_source_mgr;
+ 
+ typedef stdio_source_mgr * stdio_src_ptr;
+@@ -216,7 +216,7 @@
+   src->start_of_file = FALSE;
+ }
+ 
+-static boolean
++static jpeg_boolean
+ stdio_fill_input_buffer (j_decompress_ptr cinfo)
+ {
+   stdio_src_ptr src = (stdio_src_ptr) cinfo->src;
+@@ -605,7 +605,7 @@
+ 
+ /* for progressive loading (called "I/O Suspension" by libjpeg docs) */
+ /* we do nothing except return "FALSE"                               */
+-static boolean
++static jpeg_boolean
+ fill_input_buffer (j_decompress_ptr cinfo)
+ {
+ 	return FALSE;
+@@ -1068,7 +1068,7 @@
+         }
+ }
+ 
+-static boolean
++static jpeg_boolean
+ to_callback_empty_output_buffer (j_compress_ptr cinfo)
+ {
+ 	ToFunctionDestinationManager *destmgr;
diff --git a/mingw32-gtk2.spec b/mingw32-gtk2.spec
index 779d0c9..224b406 100644
--- a/mingw32-gtk2.spec
+++ b/mingw32-gtk2.spec
@@ -6,7 +6,7 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.17.8
+Version:        2.17.9
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -27,6 +27,9 @@ Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 # Enable building a static library of GTK
 Patch1001:      mingw32-gtk2-enable_static_build.patch
 
+# Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
+Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -87,6 +90,7 @@ Static version of the MinGW Windows Gtk2 library.
 
 %patch1000 -p1
 %patch1001 -p0
+%patch1002 -p0
 
 # Regenerate the configure script
 aclocal
@@ -328,6 +332,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 %changelog
+* Tue Aug 27 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.9-1
+- Update to 2.17.9
+- Rebuild against mingw32-libjpeg 7
+
 * Tue Aug 18 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.17.8-1
 - Update to 2.17.8
 
diff --git a/sources b/sources
index 9446c57..05fbd24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e0a37e4cc40f74963886031d0df2182  gtk+-2.17.8.tar.bz2
+44323cc81628be422c59059086e33353  gtk+-2.17.9.tar.bz2