[mingw-gdk-pixbuf: 17/22] Update to 2.25.2
epienbro
epienbro at fedoraproject.org
Tue Mar 6 19:23:44 UTC 2012
commit 3f1fd9e678b297ce21627cc57efa73f59f42b805
Author: Kalev Lember <kalevlember at gmail.com>
Date: Thu Feb 9 14:17:16 2012 +0200
Update to 2.25.2
- Dropped upstreamed patches
.gitignore | 1 +
gdk-pixbuf-fix-gdiplus-compilation.patch | 14 ---
gdk-pixbuf.loaders | 146 +++++++++++++++---------------
mingw32-gdk-pixbuf.spec | 11 ++-
sources | 2 +-
5 files changed, 81 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2233a4b..e18b676 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/gdk-pixbuf-2.23.5.tar.bz2
/gdk-pixbuf-2.24.0.tar.xz
/gdk-pixbuf-2.25.0.tar.xz
+/gdk-pixbuf-2.25.2.tar.xz
diff --git a/gdk-pixbuf.loaders b/gdk-pixbuf.loaders
index 5b5c4c0..47491bc 100644
--- a/gdk-pixbuf.loaders
+++ b/gdk-pixbuf.loaders
@@ -1,14 +1,38 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.21.7
+# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.25.2
#
# LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gdk-pixbuf-2.0/2.10.0/loaders
#
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
+"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL"
+"image/x-pcx" ""
+"pcx" ""
+"\n \001" "" 100
+"\n\002\001" "" 100
+"\n\003\001" "" 100
+"\n\004\001" "" 100
+"\n\005\001" "" 100
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll"
+"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL"
+"image/x-quicktime" "image/qtif" ""
+"qtif" "qif" ""
+"abcdidsc" "xxxx " 100
+"abcdidat" "xxxx " 100
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gdk-pixbuf" "The JPEG 2000 image format" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+" jP" "!!!! " 100
+"\377O\377Q" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
"xpm" 4 "gdk-pixbuf" "The XPM image format" "LGPL"
@@ -17,7 +41,7 @@
"/* XPM */" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
-"bmp" 5 "gdk-pixbuf" "Het BMP-bestandsformaat" "LGPL"
+"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100
@@ -29,44 +53,18 @@
"MM *" " z " 100
"II* " " z" 100
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
-"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL"
-"image/x-pcx" ""
-"pcx" ""
-"\n \001" "" 100
-"\n\002\001" "" 100
-"\n\003\001" "" 100
-"\n\004\001" "" 100
-"\n\005\001" "" 100
-
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
-"wmf" 4 "gdk-pixbuf" "Het WMF-bestandsformaat" "LGPL"
+"wmf" 4 "gdk-pixbuf" "The WMF image format" "LGPL"
"image/x-wmf" ""
"wmf" "apm" ""
"\327\315\306\232" "" 100
"\001" "" 100
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
-"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
-"ico" 4 "gdk-pixbuf" "Het ICO-bestandsformaat" "LGPL"
-"image/x-icon" "image/x-ico" ""
-"ico" "cur" ""
-" \001 " "zz znz" 100
-" \002 " "zz znz" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
-"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL"
-"image/vnd.wap.wbmp" ""
-"wbmp" ""
-" " "zz" 1
-" `" "z " 1
-" @" "z " 1
-" " "z " 1
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
"pnm" 4 "gdk-pixbuf" "The PNM/PBM/PGM/PPM image format family" "LGPL"
@@ -85,13 +83,6 @@
"ani" ""
"RIFF ACON" " xxxx " 100
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll"
-"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL"
-"image/x-quicktime" "image/qtif" ""
-"qtif" "qif" ""
-"abcdidsc" "xxxx " 100
-"abcdidat" "xxxx " 100
-
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
"xbm" 4 "gdk-pixbuf" "The XBM image format" "LGPL"
"image/x-xbitmap" ""
@@ -99,33 +90,8 @@
"#define " "" 100
"/*" "" 50
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
-"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
-"image/x-icns" ""
-"icns" ""
-"icns" "" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
-"jpeg2000" 4 "gdk-pixbuf" "The JPEG 2000 image format" "LGPL"
-"image/jp2" "image/jpeg2000" "image/jpx" ""
-"jp2" "jpc" "jpx" "j2k" "jpf" ""
-" jP" "!!!! " 100
-"\377O\377Q" "" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
-"jpeg" 5 "gdk-pixbuf" "Het JPEG-bestandsformaat" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
-"gif" 5 "gdk-pixbuf" "Het GIF-bestandsformaat" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
-"emf" 4 "gdk-pixbuf" "Het EMF-bestandsformaat" "LGPL"
+"emf" 4 "gdk-pixbuf" "The EMF image format" "LGPL"
"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
"emf" ""
"\001" "" 100
@@ -139,6 +105,40 @@
" \002" "xz " 99
" \003" "xz " 100
" \n" "xz " 100
-" \013" "xz " 100
+" \v" "xz " 100
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
+"gif" 5 "gdk-pixbuf" "The GIF image format" "LGPL"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
+"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL"
+"image/vnd.wap.wbmp" ""
+"wbmp" ""
+" " "zz" 1
+" `" "z " 1
+" @" "z " 1
+" " "z " 1
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
+"ico" 4 "gdk-pixbuf" "The ICO image format" "LGPL"
+"image/x-icon" "image/x-ico" ""
+"ico" "cur" ""
+" \001 " "zz znz" 100
+" \002 " "zz znz" 100
+
+"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
+"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
diff --git a/mingw32-gdk-pixbuf.spec b/mingw32-gdk-pixbuf.spec
index 0936932..d2b30c0 100644
--- a/mingw32-gdk-pixbuf.spec
+++ b/mingw32-gdk-pixbuf.spec
@@ -3,7 +3,7 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-gdk-pixbuf
-Version: 2.25.0
+Version: 2.25.2
Release: 1%{?dist}
Summary: MinGW Windows GDK Pixbuf library
@@ -16,9 +16,6 @@ Source0: http://download.gnome.org/sources/gdk-pixbuf/2.25/gdk-pixbuf-%{v
# wine /usr/i686-pc-mingw32/sys-root/mingw/bin/gdk-pixbuf-query-loaders.exe | sed s@'Z:/usr/i686-pc-mingw32/sys-root/mingw'@'..'@ > gdk-pixbuf.loaders
Source1: gdk-pixbuf.loaders
-# https://bugzilla.gnome.org/show_bug.cgi?id=666927
-Patch0: gdk-pixbuf-fix-gdiplus-compilation.patch
-
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 68
@@ -50,7 +47,6 @@ MinGW Windows GDK Pixbuf library.
%prep
%setup -q -n gdk-pixbuf-%{version}
-%patch0 -p1
%build
@@ -87,6 +83,7 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10
%files -f %{name}.lang
%doc COPYING
%{_mingw32_bindir}/gdk-pixbuf-csource.exe
+%{_mingw32_bindir}/gdk-pixbuf-pixdata.exe
%{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe
%{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
%dir %{_mingw32_libdir}/gdk-pixbuf-2.0
@@ -118,6 +115,10 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10
%changelog
+* Wed Feb 08 2012 Kalev Lember <kalevlember at gmail.com> - 2.25.2-1
+- Update to 2.25.2
+- Dropped upstreamed patches
+
* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.25.0-1
- Update to 2.25.0
- Rebuild against libpng 1.5
diff --git a/sources b/sources
index 397ae7e..6e1cb0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21664f45510fa39c1b6d1f691510eb5c gdk-pixbuf-2.25.0.tar.xz
+1820180c64421eda6779133700cdcfd5 gdk-pixbuf-2.25.2.tar.xz
More information about the scm-commits
mailing list