- updated to 2.26.1

- added gdip patch (change libgdiplus linking hack so that it works with current libtool/as-needed

Changed files:
    crossmingw32-gdk-pixbuf2.spec -> 1.7
    gdk-pixbuf2-gdip.patch -> 1.3

diff --git a/crossmingw32-gdk-pixbuf2.spec b/crossmingw32-gdk-pixbuf2.spec
index 40ab20ad8d47a7a1155cb441930f0e0e7814a8cf..15f7ee6c8ec4916bfde3b301173556f9b9af1025 100644 (file)
--- a/crossmingw32-gdk-pixbuf2.spec
+++ b/crossmingw32-gdk-pixbuf2.spec
@@ -5,19 +5,24 @@
 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.26.0
+Version:       2.26.1
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-%{version}.tar.xz
-# Source0-md5: 1c186f9903a20e96587b9afb27944b40
+# Source0-md5: 82197921c651a81ae28178aa9adfc0e6
 Patch0:                gdk-pixbuf2-png-nodep.patch
+Patch1:                gdk-pixbuf2-gdip.patch
 URL:           http://developer.gnome.org/gdk-pixbuf/
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-glib2 >= 2.32.0
 BuildRequires: crossmingw32-jasper
 BuildRequires: crossmingw32-libpng
+BuildRequires: gettext-devel >= 0.17
 BuildRequires: gtk-doc >= 1.11
+BuildRequires: libtool >= 2:2.2.6
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
@@ -83,8 +88,15 @@ Biblioteki DLL gdk-pixbuf dla Windows.
 %prep
 %setup -q -n gdk-pixbuf-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %configure \
        --target=%{target} \

diff --git a/gdk-pixbuf2-gdip.patch b/gdk-pixbuf2-gdip.patch
new file mode 100644 (file)
index 0000000..b23ae68
--- /dev/null
+++ b/gdk-pixbuf2-gdip.patch
@@ -0,0 +1,101 @@
+--- gdk-pixbuf-2.26.1/gdk-pixbuf/Makefile.am.orig      2012-04-14 20:11:34.000000000 +0200
++++ gdk-pixbuf-2.26.1/gdk-pixbuf/Makefile.am   2012-04-15 18:03:52.776039347 +0200
+@@ -208,7 +208,7 @@
+ # create a partial one that's enough for our use.
+ 
+ libgdiplus = libgdiplus.dll.a
+-gdiplus_ldflag = -Wl,$(libgdiplus)
++gdiplus_ldflag = -L. -lgdiplus # -Wl,$(libgdiplus)
+ 
+ libgdiplus.dll.a: gdiplus.def
+       $(DLLTOOL) --kill-at --dllname gdiplus.dll --input-def $(srcdir)/gdiplus.def --output-lib $@
+@@ -265,7 +265,7 @@
+       libpixbufloader-gdip-jpeg.la \
+       libpixbufloader-gdip-tiff.la
+ 
+-libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
++libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_ico_la_SOURCES =         \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+@@ -274,9 +274,9 @@
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-ico.c
+-libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32)
++libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
+ 
+-libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
++libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_wmf_la_SOURCES =         \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+@@ -285,9 +285,9 @@
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-wmf.c
+-libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32)
++libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
+ 
+-libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
++libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_emf_la_SOURCES =         \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+@@ -296,9 +296,9 @@
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-emf.c
+-libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32)
++libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
+ 
+-libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
++libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_bmp_la_SOURCES =         \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+@@ -307,9 +307,9 @@
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-bmp.c
+-libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32)
++libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
+ 
+-libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
++libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_gif_la_SOURCES =         \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+@@ -318,9 +318,9 @@
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-gif.c
+-libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32)
++libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
+ 
+-libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
++libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_jpeg_la_SOURCES =        \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+@@ -329,9 +329,9 @@
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-jpeg.c
+-libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
++libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
+ 
+-libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
++libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
+ libpixbufloader_gdip_tiff_la_SOURCES =        \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+@@ -340,7 +340,7 @@
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-tiff.c
+-libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32)
++libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) $(gdiplus_ldflag)
+ 
+ endif
+