Author: qboosh Date: Tue Dec 27 06:30:29 2011 GMT Module: packages Tag: HEAD ---- Log message: - added png-nodep patch to avoid propagation of libpng dependency through .pc and .la (only png loader needs to be linked with libpng) - release 2
---- Files affected: packages/gdk-pixbuf2: gdk-pixbuf2.spec (1.22 -> 1.23) , gdk-pixbuf2-png-nodep.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gdk-pixbuf2/gdk-pixbuf2.spec diff -u packages/gdk-pixbuf2/gdk-pixbuf2.spec:1.22 packages/gdk-pixbuf2/gdk-pixbuf2.spec:1.23 --- packages/gdk-pixbuf2/gdk-pixbuf2.spec:1.22 Sun Dec 18 13:02:43 2011 +++ packages/gdk-pixbuf2/gdk-pixbuf2.spec Tue Dec 27 07:30:23 2011 @@ -10,11 +10,12 @@ Summary(pl.UTF-8): Biblioteka ładująca i skalująca obrazki Name: gdk-pixbuf2 Version: 2.24.1 -Release: 1 +Release: 2 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-%{version}.tar.xz # Source0-md5: 72f39b34b20f68148c1609bd27415412 +Patch0: %{name}-png-nodep.patch URL: http://developer.gnome.org/gdk-pixbuf/ BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.10 @@ -87,6 +88,8 @@ %prep %setup -q -n gdk-pixbuf-%{version} +%patch0 -p1 + sed -i s#^io## po/LINGUAS %{__rm} po/io.po @@ -180,6 +183,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2011/12/27 06:30:23 qboosh +- added png-nodep patch to avoid propagation of libpng dependency through .pc and .la (only png loader needs to be linked with libpng) +- release 2 + Revision 1.22 2011/12/18 12:02:43 qboosh - gdk_pixbuf_xlib is now rarely used, so we could consider subpackaging ================================================================ Index: packages/gdk-pixbuf2/gdk-pixbuf2-png-nodep.patch diff -u /dev/null packages/gdk-pixbuf2/gdk-pixbuf2-png-nodep.patch:1.1 --- /dev/null Tue Dec 27 07:30:29 2011 +++ packages/gdk-pixbuf2/gdk-pixbuf2-png-nodep.patch Tue Dec 27 07:30:23 2011 @@ -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-@GDK_PIXBUF_API_VERSION@ + Libs.private: @GDK_PIXBUF_EXTRA_LIBS@ + Cflags: -I${includedir}/gdk-pixbuf-@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-@[email protected] @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/gdk-pixbuf2/gdk-pixbuf2.spec?r1=1.22&r2=1.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
