From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 11 Jun 2010 14:45:56 +0000 (+0000)
Subject: Fix building with libpng14 wrt #323513 by Stephen Lewis. Enjoy your remotely exploita... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe8fbaf24d2df7585786dad41cf01944c326608c;p=gentoo.git

Fix building with libpng14 wrt #323513 by Stephen Lewis. Enjoy your remotely exploitable browser with state of the art png...
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 12568588918f..8a7373177d3a 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.217 2010/04/09 03:56:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.218 2010/06/11 14:45:56 ssuominen Exp $
+
+  11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  seamonkey-1.1.18.ebuild, +files/seamonkey-1.1.18-libpng14.patch:
+  Fix building with libpng14 wrt #323513 by Stephen Lewis.
 
 *seamonkey-2.0.4-r1 (09 Apr 2010)
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 23c648699e5b..459a92c53b27 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -6,6 +6,7 @@ AUX google.src 706 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 SHA1 462c353b
 AUX icon/seamonkey.desktop 154 RMD160 7e1712122cee7510bf058024338e0b75ea7a5e9a SHA1 6f5e33c702fbaa86974e139e398399927462e31e SHA256 78ebd5d753065f6ecf148a010cb59a4756a8c94447cfac6f4db502864bac5d8c
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 AUX seamonkey-1.1.17-fix-fno-strict-aliasing.patch 793 RMD160 07705e8c0bb41eb7af8e4339913e6f0c2f84eb8b SHA1 0da75e53380a3fe08de8cb617ef761ddd216078d SHA256 db3038447f22c9798d39b556714b197b95e150caca5e42c57c5b13f9c181b466
+AUX seamonkey-1.1.18-libpng14.patch 740 RMD160 998c1be16f972695ef9a719125027656dead793b SHA1 4a53d1aa02df0d248a7e44153a0af032ef0abb3b SHA256 7e91a69b93001de52d1a1f0152f8fb4f0b860be4c5631569862eb3872be81686
 AUX seamonkey-rebuild-databases.pl 2344 RMD160 27ae162b4028d80faeb802e575b41590f6ab314e SHA1 678cec60179997d1957a0c8ecb50169985f0b4e2 SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af
 DIST enigmail-0.96.0.tar.gz 1231329 RMD160 62fc1f4d8c5a12ca0b2e49f2aa7ddd28361e736f SHA1 ad9a28ab632a5480bd138a0f60e43a5c07a56646 SHA256 80ad781236f43d9a291205eefd92cf49e75a5836826198f46d3cb90b7eae09d1
 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
@@ -34,8 +35,8 @@ DIST seamonkey-2.0.4-sk.xpi 525635 RMD160 57536b877dbdabfd844e4bea84389d0150e839
 DIST seamonkey-2.0.4-sv-SE.xpi 508994 RMD160 888056bdace0aefbcd637373cfe8618f99ea8763 SHA1 b7cf7fc8ea6aac2a82923c54c169ca13eed6bf78 SHA256 a903969cb501125d2d048c19aecb492b062a4c63f4c4aac5628562a685050468
 DIST seamonkey-2.0.4-tr.xpi 493809 RMD160 6a109b14fa720117136b69bfe7e7e733e19e532c SHA1 ea11f4dfff7911b2f0cd1621259e75b9f48dc8de SHA256 5c0597fdad25a5f9a0c4e9a325779d4182c2807aa48d42c5d734c23ec1ec7251
 DIST seamonkey-2.0.4.source.tar.bz2 61574927 RMD160 ee0fd6efd1d14a84626f6d597c6dee17af946add SHA1 8bbf46520725b3fae0d057821a4e7cd89baa8031 SHA256 b0b08e801878abdb0b114f86f8aca0ea7c00c45e50c509cbd421932dd1ff858b
-EBUILD seamonkey-1.1.18.ebuild 8466 RMD160 bb9a6edac01774c529f935debb12fe3035924448 SHA1 27d523923b685467a79ed5a9c9de68169011288c SHA256 ba5a5d1b72c4e157f8667e69457843b3ad6c02841c8cf75c67edb0752ef25938
+EBUILD seamonkey-1.1.18.ebuild 8511 RMD160 efd02bb0ee2609f8ead3c9d5bbfe2d0ea18a7577 SHA1 ef475ab79926c042e3845f47c3278804b8563708 SHA256 2628e62109fe3f704386cea63272c1d707f0b62ac3d2d9824047b5b60de66822
 EBUILD seamonkey-2.0.4-r1.ebuild 8049 RMD160 6abad8da036e9d2b00d3a89c676dbf7df8dc02a9 SHA1 119d1c8ebc11c7a683ce206d04d6576f0a78a16d SHA256 c65fc8e89454a4c763472d08bd1f9f5f0a017c64da083862420094636462803a
 EBUILD seamonkey-2.0.4.ebuild 7976 RMD160 ea41072721ffcdd10cc00507d98adf51885176be SHA1 ecc9bd4ee8eddc9f1afe4822e3a3c5d51d07922b SHA256 38159b5aa9711315a0655f6f09e3458935ee6347b5a6a30c41b6adb91065c3a9
-MISC ChangeLog 27409 RMD160 5e2c81149a0a39e5d93614a7a6b5c96372a7888f SHA1 e8c6e98bdf3ac4f5baac023262dcb397a1a69326 SHA256 988d77c5d8f3745f4b58cd06bb5385f1d450d7d7d44b19844035c3062f2587ca
+MISC ChangeLog 27587 RMD160 735c2aaaa04a2b21d19e193aac3d5296f492a1e8 SHA1 93f12a11e4f77fafcbf5778a4bf84fbd3f1d86b3 SHA256 eee6b94da93e2a7fd08ea6e746f72041dc98004a6a07fb379752e427fbae0ab9
 MISC metadata.xml 1460 RMD160 817d48a1d51261cd3ee2c5e453b71b3f379d87bf SHA1 fbaaf2d38c77d98df0a5a703ca6fb699a423f5b0 SHA256 48e24d8264172e410756f50e402142394363e31eb2c9250b9189f3ff63e3666e
diff --git a/www-client/seamonkey/files/seamonkey-1.1.18-libpng14.patch b/www-client/seamonkey/files/seamonkey-1.1.18-libpng14.patch
new file mode 100644
index 000000000000..ec388b35b9ff
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-1.1.18-libpng14.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/323513
+
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
+@@ -111,9 +111,9 @@
+ 
+   // initialize
+   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                png_voidp_NULL,
+-                                                png_error_ptr_NULL,
+-                                                png_error_ptr_NULL);
++                                                NULL,
++                                                NULL,
++                                                NULL);
+   if (! png_ptr)
+     return NS_ERROR_OUT_OF_MEMORY;
+   png_info* info_ptr = png_create_info_struct(png_ptr);
+
diff --git a/www-client/seamonkey/seamonkey-1.1.18.ebuild b/www-client/seamonkey/seamonkey-1.1.18.ebuild
index ef12c6543649..c83a22229348 100644
--- a/www-client/seamonkey/seamonkey-1.1.18.ebuild
+++ b/www-client/seamonkey/seamonkey-1.1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.18.ebuild,v 1.8 2009/10/03 16:11:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.18.ebuild,v 1.9 2010/06/11 14:45:56 ssuominen Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -65,9 +65,11 @@ src_unpack() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patch
 
-		# Fix crash without -fno-strict-aliasing, bug 265642
+	# Fix crash without -fno-strict-aliasing, bug 265642
 	epatch "${FILESDIR}/${PN}-1.1.17-fix-fno-strict-aliasing.patch"
 
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
 	# Unpack the enigmail plugin
 	if use crypt && ! use moznomail; then
 		cd "${S}"/mailnews/extensions || die