Fix build failure with libpng-1.4, bug #310959 by loki_val.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

5 files changed, 31 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c493caa744d9..158d043786fd 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.74 2010/04/03 20:40:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.75 2010/04/03 20:45:49 phajdan.jr Exp $
+
+  03 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-libpng-1.4.patch, chromium-5.0.366.2.ebuild,
+  chromium-9999.ebuild:
+  Fix build failure with libpng-1.4, bug #310959 by loki_val.
 
   03 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-5.0.366.2.ebuild, chromium-9999.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8af9cf3ba7cd..c8a3b9dad594 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,6 +3,7 @@ AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af
 AUX chromium-ffmpeg.patch 994 RMD160 18382f56bf9df5926ead966de002ca39b73c70e9 SHA1 bbf217e4d0adc7eaeb11772fadebace8371291c1 SHA256 a10abccdd8c03ffc5ef016f41cbece38d7beff0df399bf8f3eb5f5ceb2d012cc
 AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
+AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.307.11.tar.bz2 153145874 RMD160 2e8820fae4bd2ca0b6e7c4c3f0d10eb0b4bcc2d3 SHA1 33b5a62501af3645076f3d48dba76356d4736471 SHA256 4578711c2359b9d6751c6fcecb541d0fb63c5bcde2a82346040d218c8de5a4ea
 DIST chromium-5.0.342.7.tar.bz2 155598620 RMD160 4afac79db21172596037c7aa03e797e722b1aaf4 SHA1 09fad49eb63863dcac515fc1c82aa51c8e2d7ebb SHA256 d3a2ad54b925da27dea290f421494b47a046123cb0659214f99502a0a86a4b3d
@@ -13,7 +14,7 @@ EBUILD chromium-5.0.307.11.ebuild 6141 RMD160 f457412c120d1d52c735a6a163d507ae05
 EBUILD chromium-5.0.342.7.ebuild 6449 RMD160 aa8a24a34332a43d1cb0284a9c9ee3a4209fda16 SHA1 d2e67b8bbe037d0105eedbe4f2cdb5ff118dec95 SHA256 2946eda059d79673013b7c235cf9d2a11baa56fd87ae049d630af79974fbe3f1
 EBUILD chromium-5.0.360.0.ebuild 6451 RMD160 86b1deeb8084b0c5eb388bca47bbe06ead1fc56d SHA1 b309bc663c4b6ef7c9e8076ba5e111e72503f82d SHA256 9ad943b3a68ef75841b0ee4242569452cb8c0d4f2e0da4fdb57ebff44d462e87
 EBUILD chromium-5.0.360.5.ebuild 6451 RMD160 825579af6bbcf0a8b37b31d46256b928fcf6cc83 SHA1 4952bf83c702edad474a59484b25c92b31d64ac3 SHA256 785ad6ed01dc26d8516b3d531e28ffcef443c34e9a3f4879402080a8c7718b0f
-EBUILD chromium-5.0.366.2.ebuild 6420 RMD160 d601725cbbc67361ea89be5f279e95e4e84d4840 SHA1 47411bd1ac08ec9445aedea4701ccfd5ea8a6357 SHA256 5cc26d537267bd87ddbfa186794fa18b0a0bd5fe8377d6ffcd1ddb1885f92089
-EBUILD chromium-9999.ebuild 8173 RMD160 5bb3caf7748ddb46213944c138ccb23fcb4ad644 SHA1 2af2cdde69a7248e2a4e26fd81ce7d21229dafdd SHA256 aa1aef082add4a158abb3be4fbc8c34f69af11c0158bc01071a0e6a7d4b8d54b
-MISC ChangeLog 17030 RMD160 2ccfca1e091dc3f4087686f8c047cb3c7838c7e8 SHA1 19a7538691a0c327f887ef6fd68913a7a1ce44d3 SHA256 e59f19d22195a92ce3536a920ff40a8f8272938b07adbf2ff67e7f8e5906471e
+EBUILD chromium-5.0.366.2.ebuild 6515 RMD160 4e45f2efeae24c67120b83cecec62a9c1b6a58d4 SHA1 d1d5d20b5c34fc69ee0892722b8dbddf1cbac39b SHA256 380cb130b4065963e37db7b18adcae0753b872f47251fe9430eaf7ed81bfb92a
+EBUILD chromium-9999.ebuild 8268 RMD160 7435478e5156aa17f47af317f1ccd2dfc5bb4143 SHA1 d80a44aa12f7b359f51dbc432b76b180ecf08fcb SHA256 dac8abde34a941175ee87111a1a4e4a8643d827c11c7a29e5dc9dcc0f48c3d73
+MISC ChangeLog 17235 RMD160 d8a98547ad4d73ba2b0cb012d43c7e24a0347fe1 SHA1 051f71f6c58158c1cd6bcc44ca83c4f902f604f0 SHA256 1a63f4e7c52a09b85b7f9aa6de23fb8fce45dc2e181d34ba3bc1df18aba5b6d5
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
diff --git a/www-client/chromium/chromium-5.0.366.2.ebuild b/www-client/chromium/chromium-5.0.366.2.ebuild
index fa835e2e833d..314ce1c680cd 100644
--- a/www-client/chromium/chromium-5.0.366.2.ebuild
+++ b/www-client/chromium/chromium-5.0.366.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.366.2.ebuild,v 1.2 2010/04/03 20:40:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.366.2.ebuild,v 1.3 2010/04/03 20:45:49 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -91,6 +91,8 @@ src_prepare() {
 		# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
 		epatch "${FILESDIR}"/${PN}-ffmpeg.patch
 	fi
+	# Fix build failure with libpng-1.4, bug 310959.
+	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
 	# Prevent the make build from filling entire disk space on some systems,
 	# bug 297273.
 	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 1f785df9cc82..0d60c8a77f6c 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.35 2010/04/03 20:40:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.36 2010/04/03 20:45:49 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -136,6 +136,8 @@ src_prepare() {
 		# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
 		epatch "${FILESDIR}"/${PN}-ffmpeg.patch
 	fi
+	# Fix build failure with libpng-1.4, bug 310959.
+	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
 	# Prevent the make build from filling entire disk space on some systems,
 	# bug 297273.
 	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
diff --git a/www-client/chromium/files/chromium-libpng-1.4.patch b/www-client/chromium/files/chromium-libpng-1.4.patch
new file mode 100644
index 000000000000..55b86198ae21
--- /dev/null
+++ b/www-client/chromium/files/chromium-libpng-1.4.patch
@@ -0,0 +1,15 @@
+--- third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp.orig	2010-04-03 18:37:29.000000000 +0200
++++ third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp	2010-04-03 18:38:20.000000000 +0200
+@@ -130,9 +130,9 @@
+     }
+ 
+     png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                 png_voidp_NULL,
+-                                                 png_error_ptr_NULL,
+-                                                 png_error_ptr_NULL);
++                                                 0,
++                                                 0,
++                                                 0);
+     if (!pngPtr)
+         return false;
+