rpms/gdk-pixbuf2/devel 0001-Fix-linking-when-libpng-loader-is-builtin.patch, NONE, 1.1 gdk-pixbuf2.spec, 1.9, 1.10

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gdk-pixbuf2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29668

Modified Files:
	gdk-pixbuf2.spec 
Added Files:
	0001-Fix-linking-when-libpng-loader-is-builtin.patch 
Log Message:
* Mon Jul 19 2010 Bastien Nocera <bnocera at redhat.com> 2.21.6-3
- Require libpng for linking


0001-Fix-linking-when-libpng-loader-is-builtin.patch:
 configure.ac                     |    1 +
 gdk-pixbuf-2.0-uninstalled.pc.in |    2 +-
 gdk-pixbuf-2.0.pc.in             |    3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Fix-linking-when-libpng-loader-is-builtin.patch ---
>From 644dd10729b86c8d21697c65e65d833e235cacfa Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 19 Jul 2010 10:30:54 +0100
Subject: [PATCH] Fix linking when libpng loader is builtin

When the libpng loader is builtin to gdk-pixbuf, we need to
require libpng itself, or the linking will fail:
/usr/bin/ld: cannot find -lpng12

https://bugzilla.gnome.org/show_bug.cgi?id=624712
---
 configure.ac                     |    1 +
 gdk-pixbuf-2.0-uninstalled.pc.in |    2 +-
 gdk-pixbuf-2.0.pc.in             |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e7424c3..b71737e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -917,6 +917,7 @@ 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 $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
 
+AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
 AC_SUBST(GDK_PIXBUF_PACKAGES)
 AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
 AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
diff --git a/gdk-pixbuf-2.0-uninstalled.pc.in b/gdk-pixbuf-2.0-uninstalled.pc.in
index 8aac11a..32b4818 100644
--- a/gdk-pixbuf-2.0-uninstalled.pc.in
+++ b/gdk-pixbuf-2.0-uninstalled.pc.in
@@ -6,6 +6,6 @@ gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache
 Name: GdkPixbuf Uninstalled
 Description: Image loading and scaling, Not Installed
 Version: @VERSION@
-Requires: gobject-2.0,gmodule-2.0
+Requires: gobject-2.0 gmodule-2.0 @PNG_DEP_CFLAGS_PACKAGES@
 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@
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index 167e1ea..7e61775 100644
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -11,7 +11,7 @@ gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache
 Name: GdkPixbuf
 Description: Image loading and scaling
 Version: @VERSION@
-Requires: gobject-2.0,gmodule-no-export-2.0
+Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
 Libs: -L${libdir} -lgdk_pixbuf- at GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
 Cflags: -I${includedir}/gdk-pixbuf- at GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
 
-- 
1.7.0.1



Index: gdk-pixbuf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdk-pixbuf2/devel/gdk-pixbuf2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gdk-pixbuf2.spec	15 Jul 2010 18:52:40 -0000	1.9
+++ gdk-pixbuf2.spec	19 Jul 2010 09:37:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gdk-pixbuf2
 Version:        2.21.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An image loading library
 
 Group:          System Environment/Libraries
@@ -29,6 +29,9 @@ Requires: shared-mime-info
 # gdk-pixbuf was included in gtk2 until 2.21.2
 Conflicts: gtk2 <= 2.21.2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=624712
+Patch0: 0001-Fix-linking-when-libpng-loader-is-builtin.patch
+
 %description
 gdk-pixbuf is an image loading library that can be extended by loadable
 modules for new image formats. It is used by toolkits such as GTK+ or
@@ -50,7 +53,7 @@ for writing applications that are using 
 
 %prep
 %setup -q -n gdk-pixbuf-%{version}
-
+%patch0 -p1 -b .libpng-linking
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -114,6 +117,9 @@ fi
 
 
 %changelog
+* Mon Jul 19 2010 Bastien Nocera <bnocera at redhat.com> 2.21.6-3
+- Require libpng for linking
+
 * Thu Jul 15 2010 Colin Walters <walters at verbum.org> - 2.21.6-2
 - Rebuild with new gobject-introspection