Fix building with libpng15 wrt #378173 by Diego Elio Pettenò. Make compatible with the gold linker.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

4 files changed, 34 insertions, 11 deletions

diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog
index 632deafb9f42..b5bb435c5783 100644
--- a/media-gfx/pornview/ChangeLog
+++ b/media-gfx/pornview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pornview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.40 2011/03/28 16:49:16 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.41 2011/08/08 17:15:56 ssuominen Exp $
+
+  08 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
+  pornview-0.2.0_pre1-r2.ebuild, +files/pornview-0.2.0_pre1-libpng15.patch:
+  Fix building with libpng15 wrt #378173 by Diego Elio Pettenò. Make
+  compatible with the gold linker.
 
   28 Mar 2011; Christoph Mende <angelos@gentoo.org>
   pornview-0.2.0_pre1-r1.ebuild, pornview-0.2.0_pre1-r2.ebuild:
diff --git a/media-gfx/pornview/Manifest b/media-gfx/pornview/Manifest
index db320dbdc2d4..e57cdfaacb80 100644
--- a/media-gfx/pornview/Manifest
+++ b/media-gfx/pornview/Manifest
@@ -5,17 +5,18 @@ AUX pornview-0.2.0_pre1-4.diff 1613 RMD160 ff0ee5a7c4abb9a8ab77fec31dba0af2cae4c
 AUX pornview-0.2.0_pre1-desktop-entry.patch 442 RMD160 e88c992f7fc53c731cd7800c52192ca3a6d07df9 SHA1 70a36d18947a562950bf8c53fefd622da6adf875 SHA256 03a67f65a122afcded52dc3e539e77ba591879069b83274d928a5d995726cb04
 AUX pornview-0.2.0_pre1-fix-array-boundaries.patch 451 RMD160 f0279bc2161927250900ff94bd9b501c49c26fc1 SHA1 9f1a1c5a007873842c56a390efb4b2851ca23eda SHA256 637ff0de51e7de5fce5cac9b955a36a4431299b78841d0484b1e2304467ee865
 AUX pornview-0.2.0_pre1-fix-segfault-comment.patch 611 RMD160 61427c138a138a64dcc4f9a317329857090e1c69 SHA1 7ac45c921401cf3acdc2cadd8b5097f2b64be45c SHA256 97d35e9813fa2744dab1dc40f38f82b61c03ee6c8ee08767a66e9bb2dbdfae34
+AUX pornview-0.2.0_pre1-libpng15.patch 255 RMD160 cc0ae007a8532e66dba7759a72270ef54d1ac2ae SHA1 b5351331827d1045075d9b3ce74cda366e5217e2 SHA256 4e8f60ed36bfee0b5df51254872e2b24c356193a7e5979339dcbb9cc7200b2c1
 AUX pornview-0.2.0_pre1-new-gtk-object-system.diff 2320 RMD160 dda1df23ba548e5d8e75e8d80ef9d36becb9608c SHA1 b5650b0d60e81da6bcbd6df0e6bbddc1f9d35481 SHA256 3ee556ad01d27f3166deed82bd2b14c42ef61548ee8dfe75c8541b7177920b60
 AUX traypatch.diff 15710 RMD160 5cdc5e7ad329eeac0a9359b1e0536f28b0d146ea SHA1 09a2bb140c672e499d2267dca0524d5f07a6ba13 SHA256 828f175a4942b795b131e4aa56966b1261a4899beb2e8a2f22ca137e533fffd7
 DIST pornview-0.2.0pre1.tar.gz 608864 RMD160 03a9d01235fafbfb9825da43e79fbfb66a2ecbfa SHA1 3a26412affac6e211da928cc471a4b1bbc55b2a0 SHA256 66502f936f743489dcff14e429a80e4670a60221187c34f58f87530229874fb9
 EBUILD pornview-0.2.0_pre1-r1.ebuild 1289 RMD160 8ac7ebd3209b7b2d7c0b707f7eef9fbfb96627d8 SHA1 4dabb2bd00792c4f074238729088c7a40c5dc672 SHA256 acb48eb0476ff806b2088a6abdc405e98e4ae5135719c33ae84565ea53dc2955
-EBUILD pornview-0.2.0_pre1-r2.ebuild 1303 RMD160 ddea4c3f13a182ba9235931c59fd18b3309fb0a7 SHA1 f9529058879b62bba0e41d34d7263abeb05df7ee SHA256 f121251388a357520aa81ca88dadbcb11fd5885000ecbcbd7ccd5e0a2ed17049
-MISC ChangeLog 5204 RMD160 50cf2e9589e3c7caf172d69bb8d362be2ad60f13 SHA1 f95d42f0f42e8923a244260da866b35692036cc0 SHA256 d78b3d098859ad62e54510789285db73ed8a40032610e99b65541ada6dba6e78
+EBUILD pornview-0.2.0_pre1-r2.ebuild 1525 RMD160 3a6c70d7304b3fc30b88e284f5e0dbbce2aec6c6 SHA1 80cdcfdc9ccc6a56c0d98f4e6b8877d7ded4b84b SHA256 73b46932c2756243e2f34f32f8eb6d13b499fff88ae33e8568a01ece0c7d8a00
+MISC ChangeLog 5442 RMD160 eb27877a3c0faf65ccf8a48162cbb1d3fa10a0b0 SHA1 d083fd21621de8e73a0da99dfeeaefe625c761d0 SHA256 4e873b338a48027f36c75ffff569383bed71fab2a37012a2f933763f8b316d89
 MISC metadata.xml 234 RMD160 eba4806545de0d7dfd954fe889ac8e82f7be1484 SHA1 03dd609a4efde867c4b12eaae5eb5cc44f7ebd53 SHA256 5085e7eb7655a7c639d97404f04d8732cbf17e72688a61ecd2e0967ac2a5711d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2Qrd4ACgkQmWq1bYTyC0MNAwEAh0Hwoj5w9qCKWfdT0xcva9TB
-nWsZhwnfvcr5smXPlM4A/041C9awhXad8cjyNSujogjT4p+qcj2mNkFTr8ktm2f9
-=NoJK
+iF4EAREIAAYFAk5AGcwACgkQXkR9YqOcLPF44wEAj3udfe+RrlLCj5gGUpULATzU
+1pw4WuTLUeNXG5SegaYA/1F2q7HtbYH02AO6U5/LtHesu2yCati1Ao1KllST0HAs
+=/R26
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch
new file mode 100644
index 000000000000..8830a03edee9
--- /dev/null
+++ b/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch
@@ -0,0 +1,11 @@
+--- src/support/pixbuf_utils.c
++++ src/support/pixbuf_utils.c
+@@ -60,7 +60,7 @@
+ 	return FALSE;
+     }
+ 
+-    if (setjmp (png_ptr->jmpbuf))
++    if (setjmp (png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_write_struct (&png_ptr, &info_ptr);
+ 	fclose (handle);
diff --git a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
index 4445f629271c..096702133a8d 100644
--- a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
+++ b/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild,v 1.2 2011/03/28 16:49:16 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild,v 1.3 2011/08/08 17:15:56 ssuominen Exp $
 
 EAPI=3
 inherit eutils toolchain-funcs
@@ -25,14 +25,20 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/_/}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-4.diff \
+	epatch \
+		"${FILESDIR}"/${P}-4.diff \
 		"${FILESDIR}"/traypatch.diff \
 		"${FILESDIR}"/${P}-desktop-entry.patch \
 		"${FILESDIR}"/${P}-new-gtk-object-system.diff \
 		"${FILESDIR}"/${P}-fix-array-boundaries.patch \
-		"${FILESDIR}"/${P}-fix-segfault-comment.patch
-		#Bug 325879
-		sed -i -e '1i #pragma GCC optimize ("O0")' src/comment.c || die
+		"${FILESDIR}"/${P}-fix-segfault-comment.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	# $X_LIBS fails to bring in -lX11 and the build fails with undefined
+	# references with strict linker
+	sed -i -e 's:view_LDADD =:view_LDADD = -lX11:' src/Makefile.{am,in} || die
+	#Bug 325879
+	sed -i -e '1i #pragma GCC optimize ("O0")' src/comment.c || die
 }
 
 src_configure() {