summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2012-05-16 15:13:01 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2012-05-16 15:13:01 +0000
commit575bbbf87bcf0a3080bf04165482d2af981852a3 (patch)
tree53c0a2c16869e33ec190071d0494e7768f48a06e /www-client
parentStable for HPPA (bug #410611). (diff)
downloadgentoo-2-575bbbf87bcf0a3080bf04165482d2af981852a3.tar.gz
gentoo-2-575bbbf87bcf0a3080bf04165482d2af981852a3.tar.bz2
gentoo-2-575bbbf87bcf0a3080bf04165482d2af981852a3.zip
Version bump for dev channel release. Disable tcmalloc (fixes bug #413637 by Paul Volkov; helpful feedback by Julien Sanchez, Mike Gilbert, Gerard Neil, and especially Ambroz Bizjak who suggested the fix). Remove old.
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog11
-rw-r--r--www-client/chromium/chromium-20.0.1132.8.ebuild (renamed from www-client/chromium/chromium-20.0.1130.1.ebuild)14
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild7
-rw-r--r--www-client/chromium/files/chromium-tcmalloc-r0.patch21
4 files changed, 47 insertions, 6 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 977a0101c2a6..3283be7eccb2 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
# 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.632 2012/05/15 16:49:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.633 2012/05/16 15:13:01 phajdan.jr Exp $
+
+*chromium-20.0.1132.8 (16 May 2012)
+
+ 16 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ +files/chromium-tcmalloc-r0.patch, -chromium-20.0.1130.1.ebuild,
+ +chromium-20.0.1132.8.ebuild, chromium-9999-r1.ebuild:
+ Version bump for dev channel release. Disable tcmalloc (fixes bug #413637 by
+ Paul Volkov; helpful feedback by Julien Sanchez, Mike Gilbert, Gerard Neil,
+ and especially Ambroz Bizjak who suggested the fix). Remove old.
15 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
chromium-19.0.1084.46.ebuild:
diff --git a/www-client/chromium/chromium-20.0.1130.1.ebuild b/www-client/chromium/chromium-20.0.1132.8.ebuild
index 6ae69e63932b..6561115b46be 100644
--- a/www-client/chromium/chromium-20.0.1130.1.ebuild
+++ b/www-client/chromium/chromium-20.0.1132.8.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.1130.1.ebuild,v 1.1 2012/05/09 13:58:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1132.8.ebuild,v 1.1 2012/05/16 15:13:01 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -109,6 +109,12 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
+ # Backport upstream fix for Gentoo bug #415601.
+ epatch "${FILESDIR}/${PN}-unistd-r0.patch"
+
+ # Fix build without tcmalloc. To be upstreamed.
+ epatch "${FILESDIR}/${PN}-tcmalloc-r0.patch"
+
epatch_user
# Remove most bundled libraries. Some are still needed.
@@ -129,7 +135,6 @@ src_prepare() {
\! -path 'third_party/json_minify/*' \
\! -path 'third_party/khronos/*' \
\! -path 'third_party/launchpad_translations/*' \
- \! -path 'third_party/leveldb/*' \
\! -path 'third_party/leveldatabase/*' \
\! -path 'third_party/libjingle/*' \
\! -path 'third_party/libphonenumber/*' \
@@ -151,7 +156,6 @@ src_prepare() {
\! -path 'third_party/smhasher/*' \
\! -path 'third_party/speex/speex.h' \
\! -path 'third_party/sqlite/*' \
- \! -path 'third_party/tcmalloc/*' \
\! -path 'third_party/tlslite/*' \
\! -path 'third_party/undoview/*' \
\! -path 'third_party/v8-i18n/*' \
@@ -187,6 +191,10 @@ src_configure() {
# additions, bug #336871.
myconf+=" -Ddisable_sse2=1"
+ # Disable tcmalloc, it causes problems with e.g. NVIDIA
+ # drivers, bug #413637.
+ myconf+=" -Dlinux_use_tcmalloc=0"
+
# Use system-provided libraries.
# TODO: use_system_ffmpeg
# TODO: use_system_hunspell (upstream changes needed).
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index a15d6ae63d42..04cff859b008 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-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-9999-r1.ebuild,v 1.111 2012/05/14 12:31:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.112 2012/05/16 15:13:01 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -204,7 +204,6 @@ src_prepare() {
\! -path 'third_party/smhasher/*' \
\! -path 'third_party/speex/speex.h' \
\! -path 'third_party/sqlite/*' \
- \! -path 'third_party/tcmalloc/*' \
\! -path 'third_party/tlslite/*' \
\! -path 'third_party/undoview/*' \
\! -path 'third_party/v8-i18n/*' \
@@ -240,6 +239,10 @@ src_configure() {
# additions, bug #336871.
myconf+=" -Ddisable_sse2=1"
+ # Disable tcmalloc, it causes problems with e.g. NVIDIA
+ # drivers, bug #413637.
+ myconf+=" -Dlinux_use_tcmalloc=0"
+
# Use system-provided libraries.
# TODO: use_system_ffmpeg
# TODO: use_system_hunspell (upstream changes needed).
diff --git a/www-client/chromium/files/chromium-tcmalloc-r0.patch b/www-client/chromium/files/chromium-tcmalloc-r0.patch
new file mode 100644
index 000000000000..547cdc35ba86
--- /dev/null
+++ b/www-client/chromium/files/chromium-tcmalloc-r0.patch
@@ -0,0 +1,21 @@
+--- chrome/renderer/chrome_render_process_observer.cc.orig 2012-05-16 11:13:01.000000000 +0200
++++ chrome/renderer/chrome_render_process_observer.cc 2012-05-16 11:17:57.000000000 +0200
+@@ -35,7 +35,6 @@
+ #include "net/base/net_errors.h"
+ #include "net/base/net_module.h"
+ #include "third_party/sqlite/sqlite3.h"
+-#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
+@@ -49,6 +48,10 @@
+ #include "base/win/iat_patch_function.h"
+ #endif
+
++#if defined(USE_TCMALLOC)
++#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
++#endif
++
+ using WebKit::WebCache;
+ using WebKit::WebCrossOriginPreflightResultCache;
+ using WebKit::WebFontCache;