summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2010-04-26 11:43:49 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2010-04-26 11:43:49 +0000
commitd0b9ba6c6b41ed4517b6ae996f82eacd933ef4c9 (patch)
tree9b843bda70957863c2ac56dcc2c893d4df9d3ace /www-client
parentDisable static libraries, since they would get removed anyway. (diff)
downloadgentoo-2-d0b9ba6c6b41ed4517b6ae996f82eacd933ef4c9.tar.gz
gentoo-2-d0b9ba6c6b41ed4517b6ae996f82eacd933ef4c9.tar.bz2
gentoo-2-d0b9ba6c6b41ed4517b6ae996f82eacd933ef4c9.zip
GCC 4.5 patch for beta channel by truedfx in bug #317155
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/chromium-5.0.342.9.ebuild5
-rw-r--r--www-client/chromium/files/chromium-gcc45.patch13
3 files changed, 22 insertions, 2 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c6e3a2e5fbe3..248afe4ac5b6 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# 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.89 2010/04/20 07:55:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.90 2010/04/26 11:43:49 voyageur Exp $
+
+ 26 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+ +files/chromium-gcc45.patch, chromium-5.0.342.9.ebuild:
+ GCC 4.5 patch for beta channel by truedfx in bug #317155
20 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
chromium-5.0.375.9.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/chromium-5.0.342.9.ebuild b/www-client/chromium/chromium-5.0.342.9.ebuild
index 0be03dd26fa8..1e7723b4a934 100644
--- a/www-client/chromium/chromium-5.0.342.9.ebuild
+++ b/www-client/chromium/chromium-5.0.342.9.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.342.9.ebuild,v 1.2 2010/04/14 13:05:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.9.ebuild,v 1.3 2010/04/26 11:43:49 voyageur Exp $
EAPI="2"
inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -94,6 +94,9 @@ src_prepare() {
fi
# Fix build failure with libpng-1.4, bug 310959.
epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
+ # GCC 4.5 support, bug #317155
+ epatch "${FILESDIR}"/${PN}-gcc45.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-gcc45.patch b/www-client/chromium/files/chromium-gcc45.patch
new file mode 100644
index 000000000000..2438a1b515e1
--- /dev/null
+++ b/www-client/chromium/files/chromium-gcc45.patch
@@ -0,0 +1,13 @@
+--- chromium/sandbox/linux/seccomp/sandbox.cc
++++ chromium/sandbox/linux/seccomp/sandbox.cc
+@@ -444,8 +444,8 @@
+ }
+ processFdPub_ = pair[0];
+ cloneFdPub_ = pair[2];
+- SecureMemArgs::Args* secureMem = createTrustedProcess(pair[0], pair[1],
+- pair[2], pair[3]);
++ SecureMemArgs* secureMem = createTrustedProcess(pair[0], pair[1],
++ pair[2], pair[3]);
+
+ // We find all libraries that have system calls and redirect the system
+ // calls to the sandbox. If we miss any system calls, the application will be