Author: arekm Date: Thu Jun 2 17:39:22 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 14.0.783.0-0.87572.1
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.116 -> 1.117) , chromium-browser-tcmalloc.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.116 packages/chromium-browser/chromium-browser.spec:1.117 --- packages/chromium-browser/chromium-browser.spec:1.116 Wed May 25 19:28:15 2011 +++ packages/chromium-browser/chromium-browser.spec Thu Jun 2 19:39:17 2011 @@ -30,18 +30,18 @@ # or: # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf -%define svndate 20110525 -%define svnver 86549 +%define svndate 20110602 +%define svnver 87572 %define rel 1 Summary: A WebKit powered web browser Name: chromium-browser -Version: 13.0.775.0 +Version: 14.0.783.0 Release: 0.%{svnver}.%{rel} License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz -# Source0-md5: cff6a537e923227d53cc76cba002c732 +# Source0-md5: 5e6950b191538c53cb591f35e44cff16 Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh @@ -56,6 +56,7 @@ Patch6: get-webkit_revision.patch Patch7: dlopen_sonamed_gl.patch Patch8: chromium_useragent.patch.in +Patch9: %{name}-tcmalloc.patch URL: http://code.google.com/chromium/ BuildRequires: GConf2-devel BuildRequires: OpenGL-GLU-devel @@ -190,6 +191,8 @@ %patch6 -p1 %patch7 -p1 +%patch9 -p1 + # drop bundled libs, from gentoo remove_bundled_lib() { echo "Removing bundled library $1 ..." @@ -346,6 +349,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.117 2011/06/02 17:39:17 arekm +- up to 14.0.783.0-0.87572.1 + Revision 1.116 2011/05/25 17:28:15 arekm - up to 13.0.775.0-0.86549.1 ================================================================ Index: packages/chromium-browser/chromium-browser-tcmalloc.patch diff -u /dev/null packages/chromium-browser/chromium-browser-tcmalloc.patch:1.1 --- /dev/null Thu Jun 2 19:39:22 2011 +++ packages/chromium-browser/chromium-browser-tcmalloc.patch Thu Jun 2 19:39:17 2011 @@ -0,0 +1,37 @@ +--- chromium-browser-14.0.783.0~svn20110602r87572/src/third_party/tcmalloc/chromium/src/tcmalloc.cc.org 2011-06-02 19:20:28.041396841 +0200 ++++ chromium-browser-14.0.783.0~svn20110602r87572/src/third_party/tcmalloc/chromium/src/tcmalloc.cc 2011-06-02 19:20:42.624730752 +0200 +@@ -375,7 +375,7 @@ + return tc_malloc(size); + } + +-void* (*__malloc_hook)( ++void* (* volatile __malloc_hook)( + size_t size, const void* caller) = tc_ptmalloc_malloc_hook; + + static void* tc_ptmalloc_realloc_hook( +@@ -383,14 +383,14 @@ + return tc_realloc(ptr, size); + } + +-void* (*__realloc_hook)( ++void* (* volatile __realloc_hook)( + void* ptr, size_t size, const void* caller) = tc_ptmalloc_realloc_hook; + + static void tc_ptmalloc_free_hook(void* ptr, const void* caller) { + tc_free(ptr); + } + +-void (*__free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook; ++void (* volatile __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook; + + #endif + +@@ -1584,7 +1584,7 @@ + MallocHook::InvokeNewHook(result, size); + return result; + } +-void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride; ++void *(* volatile __memalign_hook)(size_t, size_t, const void *) = MemalignOverride; + #endif // #ifndef TCMALLOC_FOR_DEBUGALLOCATION + + // ---Double free() debugging implementation ----------------------------------- ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.116&r2=1.117&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
