From a277143bce527a20385e1a034e7c27f5cfd47090 Mon Sep 17 00:00:00 2001
From: epienbro <epienbro@fedoraproject.org>
Date: Oct 17 2009 19:15:07 +0000
Subject: - Update to 2.18.3

- Drop upstreamed patch (GNOME BZ #597535)
- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
- This release contains a workaround for a rendering bug which got
    introduced during the CSW merge (GNOME BZ #598299)

---

diff --git a/.cvsignore b/.cvsignore
index 78f8546..6eac21e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk+-2.18.2.tar.bz2
+gtk+-2.18.3.tar.bz2
diff --git a/gdk-pixbuf.loaders b/gdk-pixbuf.loaders
index a129d8b..62a9132 100644
--- a/gdk-pixbuf.loaders
+++ b/gdk-pixbuf.loaders
@@ -1,6 +1,6 @@
 # GdkPixbuf Image Loader Modules file
 # Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.17.1
+# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.18.3
 #
 # LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gtk-2.0/2.10.0/loaders
 #
@@ -10,49 +10,24 @@
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
-"bmp" 5 "gtk20" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
-"tiff" 1 "gtk20" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-"II* \020   CR\002 " "   z zzz   z" 0
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
-"gif" 4 "gtk20" "The GIF image format" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
-"ico" 5 "gtk20" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
-"tga" 4 "gtk20" "The Targa image format" "LGPL"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \013" "xz " 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+"    jP" "!!!!  " 100
+"\377O\377Q" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
-"jpeg" 5 "gtk20" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
+"emf" 4 "gtk20" "Het EMF-bestandsformaat" "LGPL"
+"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
+"emf" ""
+"\001" "" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
 "wbmp" 4 "gtk20" "The WBMP image format" "LGPL"
@@ -63,24 +38,18 @@
 " @" "z " 1
 "  " "z " 1
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
-"xpm" 4 "gtk20" "The XPM image format" "LGPL"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
-"icns" 4 "gtk20" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
+"ico" 4 "gtk20" "Het ICO-bestandsformaat" "LGPL"
+"image/x-icon" "image/x-ico" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
-"jpeg2000" 4 "gtk20" "The JPEG 2000 image format" "LGPL"
-"image/jp2" "image/jpeg2000" "image/jpx" ""
-"jp2" "jpc" "jpx" "j2k" "jpf" ""
-"    jP" "!!!!  " 100
-"\377O\377Q" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gtk20" "The PNG image format" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
 "pcx" 4 "gtk20" "The PCX image format" "LGPL"
@@ -92,12 +61,6 @@
 "\n\004\001" "" 100
 "\n\005\001" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gtk20" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
 "pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
@@ -109,11 +72,30 @@
 "P5" "" 100
 "P6" "" 100
 
-"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
-"ras" 4 "gtk20" "The Sun raster image format" "LGPL"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
+"gif" 5 "gtk20" "Het GIF-bestandsformaat" "LGPL"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"icns" 4 "gtk20" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"xpm" 4 "gtk20" "The XPM image format" "LGPL"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll"
+"tiff" 5 "gtk20" "The TIFF image format" "LGPL"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
 
 "../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
 "xbm" 4 "gtk20" "The XBM image format" "LGPL"
@@ -122,3 +104,33 @@
 "#define " "" 100
 "/*" "" 50
 
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
+"jpeg" 5 "gtk20" "Het JPEG-bestandsformaat" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"tga" 4 "gtk20" "The Targa image format" "LGPL"
+"image/x-tga" ""
+"tga" "targa" ""
+" \001\001" "x  " 100
+" \001\t" "x  " 100
+"  \002" "xz " 99
+"  \003" "xz " 100
+"  \n" "xz " 100
+"  \013" "xz " 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
+"wmf" 4 "gtk20" "Het WMF-bestandsformaat" "LGPL"
+"image/x-wmf" ""
+"wmf" "apm" ""
+"\327\315\306\232" "" 100
+"\001" "" 100
+
+"../lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
+"bmp" 5 "gtk20" "Het BMP-bestandsformaat" "LGPL"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+
diff --git a/mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch b/mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
deleted file mode 100644
index f6f48e5..0000000
--- a/mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/gtkmain.c.orig	2009-10-06 13:02:01.666410756 +0200
-+++ gtk/gtkmain.c	2009-10-06 13:02:38.538412765 +0200
-@@ -686,7 +686,9 @@
- 
-   gettext_initialization ();
- 
-+#ifndef G_PLATFORM_WIN32
-   signal (SIGPIPE, SIG_IGN);
-+#endif
- 
-   if (g_fatal_warnings)
-     {
diff --git a/mingw32-gtk2.spec b/mingw32-gtk2.spec
index 558d0f1..1e5c7d9 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.18.2
+Version:        2.18.3
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
@@ -33,9 +33,6 @@ Patch1001:      mingw32-gtk2-enable_static_build.patch
 # Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
 Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
 
-# GNOME Bugzilla #597535
-Patch1003:      mingw32-gtk2-2.18.2-dont-use-SIGPIPE.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -97,7 +94,6 @@ Static version of the MinGW Windows Gtk2 library.
 %patch1000 -p1
 %patch1001 -p0
 %patch1002 -p0
-%patch1003 -p0
 
 # Regenerate the configure script
 aclocal
@@ -109,7 +105,7 @@ libtoolize
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --with-libjasper
+%{_mingw32_configure} --disable-cups --enable-static --enable-gdiplus --with-libjasper
 make %{?_smp_mflags}
 
 
@@ -156,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/gtk-demo.exe
 %{_mingw32_bindir}/gtk-query-immodules-2.0.exe
 %{_mingw32_bindir}/gtk-update-icon-cache.exe
+%{_mingw32_bindir}/gtk-update-icon-cache.exe.manifest
 %{_mingw32_bindir}/libgailutil-18.dll
 %{_mingw32_bindir}/libgdk-win32-2.0-0.dll
 %{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
@@ -207,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la
-%if 0
+%if 1
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.la
@@ -242,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %endif
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll.a
@@ -264,9 +264,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
@@ -321,26 +318,42 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
+%if 1
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.a
+%else
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
+%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
+%endif
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 
 %changelog
+* Sat Oct 17 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.18.3-1
+- Update to 2.18.3
+- Drop upstreamed patch (GNOME BZ #597535)
+- Re-enable GDI+ support as it's fixed upstream (GNOME BZ #552678)
+- This release contains a workaround for a rendering bug which got
+  introduced during the CSW merge (GNOME BZ #598299)
+
 * Tue Oct  6 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.18.2-1
 - Update to 2.18.2
 
diff --git a/sources b/sources
index 04f2013..fdf3a50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9477986b58d7ee5e559b96e7a124bead  gtk+-2.18.2.tar.bz2
+369e173600efc272131b53b1902679e8  gtk+-2.18.3.tar.bz2