- updated to 2.26.0

- removed obsolete gdip patch

Changed files:
    crossmingw32-gdk-pixbuf2.spec -> 1.6
    gdk-pixbuf2-gdip.patch -> 1.2

diff --git a/crossmingw32-gdk-pixbuf2.spec b/crossmingw32-gdk-pixbuf2.spec
index 6811e05f89b703d1d767ae23a49b198bf44188cc..40ab20ad8d47a7a1155cb441930f0e0e7814a8cf 100644 (file)
--- a/crossmingw32-gdk-pixbuf2.spec
+++ b/crossmingw32-gdk-pixbuf2.spec
@@ -5,17 +5,16 @@
 Summary:       An image loading and scaling library - cross MinGW32 version
 Summary(pl.UTF-8):     Biblioteka ładująca i skalująca obrazki - wersja skrośna MinGW32
 Name:          crossmingw32-gdk-pixbuf2
-Version:       2.24.1
-Release:       2
+Version:       2.26.0
+Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-%{version}.tar.xz
-# Source0-md5: 72f39b34b20f68148c1609bd27415412
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-%{version}.tar.xz
+# Source0-md5: 1c186f9903a20e96587b9afb27944b40
 Patch0:                gdk-pixbuf2-png-nodep.patch
-Patch1:                gdk-pixbuf2-gdip.patch
 URL:           http://developer.gnome.org/gdk-pixbuf/
 BuildRequires: crossmingw32-gcc
-BuildRequires: crossmingw32-glib2 >= 2.28.0
+BuildRequires: crossmingw32-glib2 >= 2.32.0
 BuildRequires: crossmingw32-jasper
 BuildRequires: crossmingw32-libpng
 BuildRequires: gtk-doc >= 1.11
@@ -26,7 +25,7 @@ BuildRequires:        xz
 BuildRequires: crossmingw32-libjpeg
 BuildRequires: crossmingw32-libtiff
 %endif
-Requires:      crossmingw32-glib2 >= 2.28.0
+Requires:      crossmingw32-glib2 >= 2.32.0
 Conflicts:     crossmingw32-gtk+2 < 2.22.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,7 +70,7 @@ Ten pakiet zawiera wersję skrośną dla Win32.
 Summary:       DLL gdk-pixbuf libraries for Windows
 Summary(pl.UTF-8):     Biblioteki DLL gdk-pixbuf dla Windows
 Group:         Applications/Emulators
-Requires:      crossmingw32-glib2-dll >= 2.28.0
+Requires:      crossmingw32-glib2-dll >= 2.32.0
 Requires:      wine
 Conflicts:     crossmingw32-gtk+2-dll < 2.22.0
 
@@ -84,7 +83,6 @@ Biblioteki DLL gdk-pixbuf dla Windows.
 %prep
 %setup -q -n gdk-pixbuf-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -93,6 +91,7 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
        --host=%{target} \
        --disable-gtk-doc \
        --disable-man \
+       --disable-silent-rules \
        --with-libjasper \
        %{!?with_gdiplus:--without-gdiplus}
 

diff --git a/gdk-pixbuf2-gdip.patch b/gdk-pixbuf2-gdip.patch
deleted file mode 100644 (file)
index 9009d79..0000000
--- a/gdk-pixbuf2-gdip.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdk-pixbuf-2.24.1/gdk-pixbuf/io-gdip-animation.c.orig      2011-12-16 22:43:53.000000000 +0100
-+++ gdk-pixbuf-2.24.1/gdk-pixbuf/io-gdip-animation.c   2011-12-18 13:37:04.929030474 +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 *anim)
-+{
-+}
-+
-+static void
- gdk_pixbuf_gdip_anim_iter_class_init (GdkPixbufGdipAnimIterClass *klass)
- {
-         GObjectClass *object_class = G_OBJECT_CLASS (klass);