summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-05-17 06:17:54 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-05-17 06:17:54 +0000
commita931828a3cd5acc16428d68a8455eec278c62543 (patch)
tree7919ff4f6ac4ed4e3092245510be8f02b95d889c /www-client/chromium
parentcontinue to work with ode-0.12 (diff)
downloadgentoo-2-a931828a3cd5acc16428d68a8455eec278c62543.tar.gz
gentoo-2-a931828a3cd5acc16428d68a8455eec278c62543.tar.bz2
gentoo-2-a931828a3cd5acc16428d68a8455eec278c62543.zip
Also apply the fix for bug #413637 to 19.x. Remove old.
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/chromium-19.0.1084.46-r1.ebuild (renamed from www-client/chromium/chromium-19.0.1084.41.ebuild)8
2 files changed, 14 insertions, 2 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 3283be7eccb2..7582bb1c5547 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# 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.633 2012/05/16 15:13:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.634 2012/05/17 06:17:54 phajdan.jr Exp $
+
+*chromium-19.0.1084.46-r1 (17 May 2012)
+
+ 17 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-19.0.1084.41.ebuild, +chromium-19.0.1084.46-r1.ebuild:
+ Also apply the fix for bug #413637 to 19.x. Remove old.
*chromium-20.0.1132.8 (16 May 2012)
diff --git a/www-client/chromium/chromium-19.0.1084.41.ebuild b/www-client/chromium/chromium-19.0.1084.46-r1.ebuild
index ea6c97006674..ac4137508275 100644
--- a/www-client/chromium/chromium-19.0.1084.41.ebuild
+++ b/www-client/chromium/chromium-19.0.1084.46-r1.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.41.ebuild,v 1.3 2012/05/07 15:06:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.46-r1.ebuild,v 1.1 2012/05/17 06:17:54 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -106,6 +106,12 @@ 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"
+
+ # Fix build without tcmalloc. To be upstreamed.
+ epatch "${FILESDIR}/${PN}-tcmalloc-r1.patch"
+
epatch_user
# Remove most bundled libraries. Some are still needed.