[mingw32-gdk-pixbuf] Update to 2.25.0
epienbro
epienbro at fedoraproject.org
Tue Jan 31 18:20:44 UTC 2012
commit ffae938ce20bbc56c3aabd2d81a4fc2dd19cb1ef
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Jan 31 19:20:31 2012 +0100
Update to 2.25.0
- Update to 2.25.0
- Rebuild against libpng 1.5
.gitignore | 1 +
gdk-pixbuf-fix-gdiplus-compilation.patch | 14 ++++++++++++++
mingw32-gdk-pixbuf.spec | 23 +++++++++++++----------
sources | 2 +-
4 files changed, 29 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47d6ea3..2233a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/gdk-pixbuf-2.23.3.tar.bz2
/gdk-pixbuf-2.23.5.tar.bz2
/gdk-pixbuf-2.24.0.tar.xz
+/gdk-pixbuf-2.25.0.tar.xz
diff --git a/gdk-pixbuf-fix-gdiplus-compilation.patch b/gdk-pixbuf-fix-gdiplus-compilation.patch
new file mode 100644
index 0000000..e791ef9
--- /dev/null
+++ b/gdk-pixbuf-fix-gdiplus-compilation.patch
@@ -0,0 +1,14 @@
+--- gdk-pixbuf-2.25.0/gdk-pixbuf/io-gdip-animation.c.orig 2012-01-31 19:12:23.186199171 +0100
++++ gdk-pixbuf-2.25.0/gdk-pixbuf/io-gdip-animation.c 2012-01-31 19:16:51.996061453 +0100
+@@ -165,6 +165,11 @@
+ G_DEFINE_TYPE (GdkPixbufGdipAnimIter, gdk_pixbuf_gdip_anim_iter, GDK_TYPE_PIXBUF_ANIMATION_ITER);
+
+ static void
++gdk_pixbuf_gdip_anim_iter_init(GdkPixbufGdipAnimIter* iter)
++{
++}
++
++static void
+ gdk_pixbuf_gdip_anim_iter_class_init (GdkPixbufGdipAnimIterClass *klass)
+ {
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
diff --git a/mingw32-gdk-pixbuf.spec b/mingw32-gdk-pixbuf.spec
index 4e188f7..a057947 100644
--- a/mingw32-gdk-pixbuf.spec
+++ b/mingw32-gdk-pixbuf.spec
@@ -3,8 +3,8 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-gdk-pixbuf
-Version: 2.24.0
-Release: 2%{?dist}
+Version: 2.25.0
+Release: 1%{?dist}
Summary: MinGW Windows GDK Pixbuf library
License: LGPLv2+
@@ -16,12 +16,14 @@ Source0: http://download.gnome.org/sources/gdk-pixbuf/2.24/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
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
-
BuildRequires: mingw32-glib2
BuildRequires: mingw32-jasper
BuildRequires: mingw32-libjpeg
@@ -47,14 +49,12 @@ MinGW Windows GDK Pixbuf library.
%prep
%setup -q -n gdk-pixbuf-%{version}
+%patch0 -p1
%build
-# Need to run the correct version of glib-mkenums.
-PATH=%{_mingw32_bindir}:$PATH
-
%{_mingw32_configure} --with-libjasper
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
@@ -69,8 +69,8 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk_pixbuf-2.0.def
# only dlopen'ed by GTK they provide no additional value so they can be dropped
rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.dll.a
-# The same also applies to the .la files for the individual loaders
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.la
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
# The gtk-doc documentation and man pages can also be dropped as they're
# already provided by the native package
@@ -112,12 +112,15 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10
%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll
%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll
%{_mingw32_libdir}/libgdk_pixbuf-2.0.dll.a
-%{_mingw32_libdir}/libgdk_pixbuf-2.0.la
%{_mingw32_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
%{_mingw32_includedir}/gdk-pixbuf-2.0/
%changelog
+* 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
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 1548ed5..397ae7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd7c2a9d23b573db467e39833f12103d gdk-pixbuf-2.24.0.tar.xz
+21664f45510fa39c1b6d1f691510eb5c gdk-pixbuf-2.25.0.tar.xz
More information about the scm-commits
mailing list