rpms/mingw32-gtk2/devel mingw32-gtk2-libjpeg7-compatibility.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 mingw32-gtk2.spec, 1.11, 1.12 sources, 1.7, 1.8

[epienbro]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9120

Modified Files:
	.cvsignore mingw32-gtk2.spec sources 
Added Files:
	mingw32-gtk2-libjpeg7-compatibility.patch 
Log Message:
* 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


mingw32-gtk2-libjpeg7-compatibility.patch:
 io-jpeg.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mingw32-gtk2-libjpeg7-compatibility.patch ---
--- 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;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Aug 2009 17:21:57 -0000	1.7
+++ .cvsignore	27 Aug 2009 21:01:31 -0000	1.8
@@ -1 +1 @@
-gtk+-2.17.8.tar.bz2
+gtk+-2.17.9.tar.bz2


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-gtk2.spec	18 Aug 2009 16:50:04 -0000	1.11
+++ mingw32-gtk2.spec	27 Aug 2009 21:01:31 -0000	1.12
@@ -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-xbut
 # 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
 
 %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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Aug 2009 17:21:57 -0000	1.7
+++ sources	27 Aug 2009 21:01:32 -0000	1.8
@@ -1 +1 @@
-7e0a37e4cc40f74963886031d0df2182  gtk+-2.17.8.tar.bz2
+44323cc81628be422c59059086e33353  gtk+-2.17.9.tar.bz2