rpms/mingw32-gtk2/devel gdk-pixbuf.loaders, 1.3, 1.4 mingw32-gtk2.spec, 1.23, 1.24

[epienbro]

Author: epienbro

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

Modified Files:
	gdk-pixbuf.loaders mingw32-gtk2.spec 
Log Message:
Updated filelist and gdk-pixbuf.loaders file for GDI+ support



Index: gdk-pixbuf.loaders
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/gdk-pixbuf.loaders,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdk-pixbuf.loaders	20 Sep 2009 10:32:41 -0000	1.3
+++ gdk-pixbuf.loaders	17 Oct 2009 18:19:30 -0000	1.4
@@ -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
+


Index: mingw32-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gtk2/devel/mingw32-gtk2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- mingw32-gtk2.spec	17 Oct 2009 15:48:06 -0000	1.23
+++ mingw32-gtk2.spec	17 Oct 2009 18:19:30 -0000	1.24
@@ -152,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
@@ -327,7 +328,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_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 0
+%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