packages: crossmingw32-gdk-pixbuf2/crossmingw32-gdk-pixbuf2.spec, crossming...

[qboosh]

Author: qboosh                       Date: Thu Jan 26 18:53:02 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged png-nodep patch from native version: no need to have libpng as dependency of main libgdk-pixbuf
- release 2

---- Files affected:
packages/crossmingw32-gdk-pixbuf2:
   crossmingw32-gdk-pixbuf2.spec (1.4 -> 1.5) , gdk-pixbuf2-png-nodep.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/crossmingw32-gdk-pixbuf2/crossmingw32-gdk-pixbuf2.spec
diff -u packages/crossmingw32-gdk-pixbuf2/crossmingw32-gdk-pixbuf2.spec:1.4 packages/crossmingw32-gdk-pixbuf2/crossmingw32-gdk-pixbuf2.spec:1.5
--- packages/crossmingw32-gdk-pixbuf2/crossmingw32-gdk-pixbuf2.spec:1.4	Sun Dec 18 13:38:21 2011
+++ packages/crossmingw32-gdk-pixbuf2/crossmingw32-gdk-pixbuf2.spec	Thu Jan 26 19:52:57 2012
@@ -7,12 +7,13 @@
 Summary(pl.UTF-8):	Biblioteka ładująca i skalująca obrazki - wersja skrośna MinGW32
 Name:		crossmingw32-gdk-pixbuf2
 Version:	2.24.1
-Release:	1
+Release:	2
 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
-Patch0:		gdk-pixbuf2-gdip.patch
+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
@@ -84,6 +85,7 @@
 %prep
 %setup -q -n gdk-pixbuf-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -141,6 +143,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/01/26 18:52:57  qboosh
+- merged png-nodep patch from native version: no need to have libpng as dependency of main libgdk-pixbuf
+- release 2
+
 Revision 1.4  2011/12/18 12:38:21  qboosh
 - updated to 2.24.1
 - added gdip patch to fix undefined symbol in io-gdip-animation.c

================================================================
Index: packages/crossmingw32-gdk-pixbuf2/gdk-pixbuf2-png-nodep.patch
diff -u /dev/null packages/crossmingw32-gdk-pixbuf2/gdk-pixbuf2-png-nodep.patch:1.1
--- /dev/null	Thu Jan 26 19:53:02 2012
+++ packages/crossmingw32-gdk-pixbuf2/gdk-pixbuf2-png-nodep.patch	Thu Jan 26 19:52:57 2012
@@ -0,0 +1,44 @@
+--- gdk-pixbuf-2.24.1/gdk-pixbuf-2.0.pc.in.orig	2011-08-27 04:33:58.000000000 +0200
++++ gdk-pixbuf-2.24.1/gdk-pixbuf-2.0.pc.in	2011-12-26 21:54:19.189840017 +0100
+@@ -12,7 +12,7 @@
+ Description: Image loading and scaling
+ Version: @VERSION@
+ Requires: gobject-2.0
+-Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
++Requires.private: gmodule-no-export-2.0
+ Libs: -L${libdir} -lgdk_pixbuf- at GDK_PIXBUF_API_VERSION@
+ Libs.private: @GDK_PIXBUF_EXTRA_LIBS@
+ Cflags: -I${includedir}/gdk-pixbuf- at GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
+--- gdk-pixbuf-2.24.1/gdk-pixbuf-2.0-uninstalled.pc.in.orig	2011-08-16 03:45:14.000000000 +0200
++++ gdk-pixbuf-2.24.1/gdk-pixbuf-2.0-uninstalled.pc.in	2011-12-26 21:54:34.193173854 +0100
+@@ -6,6 +6,6 @@
+ Name: GdkPixbuf Uninstalled
+ Description: Image loading and scaling, Not Installed
+ Version: @VERSION@
+-Requires: gobject-2.0 gmodule-2.0 @PNG_DEP_CFLAGS_PACKAGES@
++Requires: gobject-2.0 gmodule-2.0
+ Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf- at GDK_PIXBUF_API_VERSION@.la @GDK_PIXBUF_EXTRA_LIBS@
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_PIXBUF_EXTRA_CFLAGS@
+--- gdk-pixbuf-2.24.1/configure.ac.orig	2011-12-26 19:47:09.966251231 +0100
++++ gdk-pixbuf-2.24.1/configure.ac	2011-12-26 21:55:25.193175561 +0100
+@@ -814,9 +814,7 @@
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
+   fi
+   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
+-    if test -z $PNG_DEP_CFLAGS_PACKAGES; then
+       STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+-    fi
+   fi
+   if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
+@@ -918,8 +916,8 @@
+ GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
+ GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
+ GDK_PIXBUF_EXTRA_CFLAGS=
+-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
++GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
++GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+ 
+ AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
+ AC_SUBST(GDK_PIXBUF_PACKAGES)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-gdk-pixbuf2/crossmingw32-gdk-pixbuf2.spec?r1=1.4&r2=1.5&f=u