- Disable tcmalloc, it causes problems with e.g. NVIDIA drivers, http://bugs.gentoo...

Changed files:
    chromium-browser.spec -> 1.197
    tcmalloc.patch -> 1.1

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 7300913104a9d752ee70a23377f21f2b5524b002..1a55e6e175a1220c25adcca31072aa7a64409084 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -12,6 +12,7 @@
 %bcond_with            selinux                 # with SELinux (need policy first)
 %bcond_with            shared_libs             # with shared libs
 %bcond_with            sse2                    # use SSE2 instructions
+%bcond_with            tcmalloc                # use tcmalloc
 %bcond_with            system_sqlite   # with system sqlite
 %bcond_without system_flac             # with system flac
 %bcond_without system_libwebp  # with system libwebp
@@ -75,7 +76,7 @@ Patch10:      %{name}-pulse.patch
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
 # libjpeg-turbo >= 1.1.90 supports that feature
 Patch11:       chromium-revert-jpeg-swizzle-r2.patch
-# https://code.google.com/p/chromium/issues/detail?id=119903
+Patch12:       tcmalloc.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -217,6 +218,7 @@ cd src
 %patch9 -p1
 %patch10 -p1
 %{!?with_libjpegturbo:%patch11 -p0}
+%patch12 -p0
 cd ..
 
 cd src
@@ -268,6 +270,7 @@ test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
        -Duse_system_libxml=1 \
        -Duse_system_libxslt=1 \
        -Duse_system_xdg_utils=1 \
+       %{!?with_tcmalloc:-Dlinux_use_tcmalloc=0} \
        -Dlinux_use_gold_binary=0 \
        -Dlinux_use_gold_flags=0
 

diff --git a/tcmalloc.patch b/tcmalloc.patch
new file mode 100644 (file)
index 0000000..852dbd6
--- /dev/null
+++ b/tcmalloc.patch
@@ -0,0 +1,59 @@
+from gentoo chromium-tcmalloc-r1.patch
+
+--- chrome/renderer/chrome_render_process_observer.cc.orig     2012-05-16 20:01:13.000000000 +0200
++++ chrome/renderer/chrome_render_process_observer.cc  2012-05-16 20:01:41.000000000 +0200
+@@ -32,8 +32,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/tcmalloc/chromium/src/gperftools/malloc_extension.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"
+@@ -47,6 +45,11 @@
+ #include "base/win/iat_patch_function.h"
+ #endif
+ 
++#if defined(USE_TCMALLOC)
++#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
++#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
++#endif
++
+ using WebKit::WebCache;
+ using WebKit::WebCrossOriginPreflightResultCache;
+ using WebKit::WebFontCache;
+--- content/renderer/render_thread_impl.cc.orig        2012-05-19 13:08:56.000000000 +0200
++++ content/renderer/render_thread_impl.cc     2012-05-19 13:09:29.000000000 +0200
+@@ -63,7 +63,6 @@
+ #include "media/base/media.h"
+ #include "net/base/net_errors.h"
+ #include "net/base/net_util.h"
+-#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
+ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
+@@ -98,6 +97,10 @@
+ #include "ipc/ipc_channel_posix.h"
+ #endif
+ 
++#if defined(USE_TCMALLOC)
++#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
++#endif
++
+ using WebKit::WebDocument;
+ using WebKit::WebFrame;
+ using WebKit::WebNetworkStateNotifier;
+--- chrome/browser/memory_purger.cc.orig       2012-05-19 16:02:27.000000000 +0200
++++ chrome/browser/memory_purger.cc    2012-05-19 16:02:50.000000000 +0200
+@@ -22,7 +22,10 @@
+ #include "net/proxy/proxy_service.h"
+ #include "net/url_request/url_request_context.h"
+ #include "net/url_request/url_request_context_getter.h"
++
++#if defined(USE_TCMALLOC)
+ #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
++#endif
+ 
+ using content::BrowserContext;
+ using content::BrowserThread;