summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-01-31 10:11:46 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-01-31 10:11:46 +0000
commit98808f5caae23048c9175a903d64547c17f4ee53 (patch)
tree2566c779d87676aca09e0c986b5646ef78a06ee7 /www-client
parentclean unused ginac flag (diff)
downloadgentoo-2-98808f5caae23048c9175a903d64547c17f4ee53.tar.gz
gentoo-2-98808f5caae23048c9175a903d64547c17f4ee53.tar.bz2
gentoo-2-98808f5caae23048c9175a903d64547c17f4ee53.zip
Apply changes lost on recent bump.
(Portage version: 2.1.10.44/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/chromium-17.0.963.46.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8a1d905fe648..008500f47185 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
# 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.549 2012/01/31 00:25:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.550 2012/01/31 10:11:46 phajdan.jr Exp $
+
+ 31 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ chromium-17.0.963.46.ebuild:
+ Apply changes lost on recent bump.
*chromium-17.0.963.46 (31 Jan 2012)
diff --git a/www-client/chromium/chromium-17.0.963.46.ebuild b/www-client/chromium/chromium-17.0.963.46.ebuild
index 477288309e37..4c52f05d264d 100644
--- a/www-client/chromium/chromium-17.0.963.46.ebuild
+++ b/www-client/chromium/chromium-17.0.963.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-17.0.963.46.ebuild,v 1.1 2012/01/31 00:25:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.46.ebuild,v 1.2 2012/01/31 10:11:46 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -188,6 +188,9 @@ src_prepare() {
# Revert WebKit changeset responsible for Gentoo bug #393471.
epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r0.patch"
+ # Backport upstream fix for Gentoo bug #389479.
+ epatch "${FILESDIR}/${PN}-dev-shm-r0.patch"
+
epatch_user
# Remove most bundled libraries. Some are still needed.
@@ -380,8 +383,9 @@ src_test() {
# NetUtilTest: bug #361885.
# NetUtilTest.GenerateFileName: some locale-related mismatch.
# UDP: unstable, active development. We should revisit this later.
+ # CertDatabaseNSSTest.ImportCACertHierarchyTree: works in 18.x, broken here.
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
- '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*'
+ '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*:CertDatabaseNSSTest.ImportCACertHierarchyTree'
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
}