Backport upstream patch to fix bug #415601 by Baptiste Wicht.

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

5 files changed, 33 insertions, 9 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 008155c74acd..08cae3d2eda8 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.630 2012/05/14 12:31:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.631 2012/05/15 06:44:40 phajdan.jr Exp $
+
+  15 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-unistd-r0.patch, chromium-19.0.1084.46.ebuild,
+  chromium-20.0.1132.3.ebuild:
+  Backport upstream patch to fix bug #415601 by Baptiste Wicht.
 
 *chromium-20.0.1132.3 (14 May 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e13e8add917e..ab5efdc2b61c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -9,6 +9,7 @@ AUX chromium-media-no-sse-r0.patch 519 RMD160 8ef93ccacc63e22aa508b5a6a5fe82c48c
 AUX chromium-revert-jpeg-swizzle-r2.patch 2233 RMD160 b9347dd8a95b6972621779d97f27b35f6dba57fd SHA1 7b1d39243de3ae30dd99cf9b640f4a6ae0118ed6 SHA256 d99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2
 AUX chromium-selinux-r0.patch 411 RMD160 76227dd5270a2bd49dd099709db6d43dbd5d59b3 SHA1 acf0b7b14a963447d5ab716927135ab7a1876580 SHA256 f6ea97bbbc36579a74790338aebea8d090a0729a3f3cfc36086338007a4f9545
 AUX chromium-svnversion-r0.patch 480 RMD160 0f6d600cb813427ca1848f7ac10547e84c169465 SHA1 605bfaa4c9cc6c908591a4bd84550756a7a6c2ae SHA256 f265a9ea756810f623289523d58b0c58b4ea1a001a693321b9cec4810fdc46de
+AUX chromium-unistd-r0.patch 354 RMD160 d88d5eb1759a3f8deaeffad084f885a65d2af918 SHA1 ddea5167880c91689a645da48752bb43e4c2eacf SHA256 45c11f845424a7e197e3ea826066a5987fff6b309f4091a9a775038543a0656d
 AUX chromium-webkit-zlib-r0.patch 1750 RMD160 de8b0de89c3ffd497ce12d5d4b6c5c9ce3c4e007 SHA1 b97a0c30d1849160ea6f490206d00e5d34230586 SHA256 7a44c63d96b6fd4b12afcd06a81f410ff1202be5cf24278509d7cfec1668316c
 AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1cdcbcd4a3517f70ba67c749da95c2a307971846 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9
 AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
@@ -19,17 +20,17 @@ DIST chromium-20.0.1130.1.tar.bz2 185292564 RMD160 95b7e03ebb22d317aed426ba8bf2d
 DIST chromium-20.0.1132.3.tar.bz2 185152584 RMD160 2eed213a710aab5cbc3b0edea0edc69a96bb8ea8 SHA1 affdc40ba5472ad4dea3831d7c2a3dd70345feb7 SHA256 eb96648fd3adc9dbe5029ea1024f39192d00ae65b0e48602e60858ef251cd25b
 EBUILD chromium-18.0.1025.168.ebuild 13972 RMD160 aeeea6ddbfc322a1c72e5639e41109861edda09e SHA1 733347f928f1f5f4eb4c8b1cce34ea8f07fa3999 SHA256 19593b8f85f6e5ec6f6a057e75ce73f248d111f7a23f0c518aff67ec9c877002
 EBUILD chromium-19.0.1084.41.ebuild 13483 RMD160 7cfb205cff001abedeefaa65cdf83ab8621f8442 SHA1 55877061f40181122b4be546af2bedfc55040256 SHA256 b32555e205cc73e550e3bf9fe5c9d3b0e0799699c8fee6a755dfa8b2453f317a
-EBUILD chromium-19.0.1084.46.ebuild 13480 RMD160 7d484973790dd0efbb9caaeb7b3db9f161c2d1fe SHA1 36ec06be170a60422d8c944a291b3d424d7413b5 SHA256 1b32e9411ea5c8e7ad481f5dc175a3d5f730106ed1b94917fb44484b47a14b9e
+EBUILD chromium-19.0.1084.46.ebuild 13577 RMD160 1d66122a316d04d758a3414d8cbe484c9dfcebb1 SHA1 25f083c656ab8f8a39f724e5d4a3f0ffb4e3cc4a SHA256 ef3011442cc1ad5b8aa374e21dabac08ed37a51e5080f57567dbcd62bc83d8aa
 EBUILD chromium-20.0.1130.1.ebuild 13173 RMD160 ceb24833c2daa36c88ae8b37aa5757a9c61ff3bf SHA1 5aa566aa771f4cd91cf50785ce5e8cd40cdf197e SHA256 1e66df6a8c0ccae24df05f320b5142200fddccc959fe2b6d1796b09d59dde282
-EBUILD chromium-20.0.1132.3.ebuild 13136 RMD160 5318470dc8dfec4d222594af3560aa252fa2de41 SHA1 1fd6ab333641809e2f0e67fb215cff6f26a31ac3 SHA256 26cf27e49d8d9a011eb3a29264cff5d19b3b758ce854a168149572eeeceae231
+EBUILD chromium-20.0.1132.3.ebuild 13230 RMD160 fa97284b33803a2d6bd9c693ca9823d0f0b9eea5 SHA1 a925d8bbb45d4114f0627050cac4363bfafe2ec7 SHA256 bbbe8a4f45e76dfda95c5a10ac0c33e396b757dc0d048db5e1313759dde33cc5
 EBUILD chromium-9999-r1.ebuild 14725 RMD160 e883bb591ad8981316b4992d54f504fa97c1a576 SHA1 b0113cd222cb92e1a84bb96ce84cccf9c78b5256 SHA256 3fceab396da04772826b855c7332e4cba99eac3d0525044be6f0900b2e5cd4c0
-MISC ChangeLog 20624 RMD160 90807a28cdb3a1342c05e502f7547483fc1deb1d SHA1 f8aa69abbf3ffbc6c5f0542af1c382372f1cb340 SHA256 10df928d565464ce2a12b79360d754fbc16a122e0482cc956c8ff77a3c7dac2b
+MISC ChangeLog 20840 RMD160 299468854ca78ac86b34f3c7859668df66b5682f SHA1 c6cfabb531f0a0fdf3820d264999453981f5419a SHA256 9c6507b28e4b6de3bc819fef69aa0738e271b14e8f8ca9fdc88120d6315e5eda
 MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+w+ygACgkQuUQtlDBCeQKb2gCfc6TZOpcfehUdsAsI8OBR1Dgb
-nSgAn1QsW2tCzrr5RmjsSwliiQNyoOX6
-=K93R
+iEUEAREKAAYFAk+x+2gACgkQuUQtlDBCeQKVPQCYpegsveDpauMfu6jwUtYD5g45
+GACeKUU+XKgxkRACapxo825s2PgpoxU=
+=/uU/
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-19.0.1084.46.ebuild b/www-client/chromium/chromium-19.0.1084.46.ebuild
index 04fdf8620d04..7101aa3d9a05 100644
--- a/www-client/chromium/chromium-19.0.1084.46.ebuild
+++ b/www-client/chromium/chromium-19.0.1084.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.46.ebuild,v 1.1 2012/05/10 03:00:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.46.ebuild,v 1.2 2012/05/15 06:44:40 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -106,6 +106,9 @@ src_prepare() {
 		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
 		chrome/common/zip*.cc || die
 
+	# Backport upstream fix for Gentoo bug #415601.
+	epatch "${FILESDIR}/${PN}-unistd-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
diff --git a/www-client/chromium/chromium-20.0.1132.3.ebuild b/www-client/chromium/chromium-20.0.1132.3.ebuild
index 03701b332316..7cc241c3d649 100644
--- a/www-client/chromium/chromium-20.0.1132.3.ebuild
+++ b/www-client/chromium/chromium-20.0.1132.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1132.3.ebuild,v 1.1 2012/05/14 12:31:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1132.3.ebuild,v 1.2 2012/05/15 06:44:40 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -109,6 +109,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
 
+	# Backport upstream fix for Gentoo bug #415601.
+	epatch "${FILESDIR}/${PN}-unistd-r0.patch"
+
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
diff --git a/www-client/chromium/files/chromium-unistd-r0.patch b/www-client/chromium/files/chromium-unistd-r0.patch
new file mode 100644
index 000000000000..a84b2cac3a08
--- /dev/null
+++ b/www-client/chromium/files/chromium-unistd-r0.patch
@@ -0,0 +1,12 @@
+Index: base/message_pump_libevent.cc
+===================================================================
+--- base/message_pump_libevent.cc	(revision 136854)
++++ base/message_pump_libevent.cc	(working copy)
+@@ -6,6 +6,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "base/auto_reset.h"
+ #include "base/compiler_specific.h"