Date: Tuesday, June 28, 2011 @ 16:35:14 Author: foutrelis Revision: 129557
upgpkg: chromium 12.0.742.112-1 New upstream release. Added: chromium/trunk/glibc-2.14.patch Modified: chromium/trunk/PKGBUILD ------------------+ PKGBUILD | 14 ++++++++++---- glibc-2.14.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-06-28 20:07:44 UTC (rev 129556) +++ PKGBUILD 2011-06-28 20:35:14 UTC (rev 129557) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=12.0.742.100 +pkgver=12.0.742.112 pkgrel=1 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') @@ -21,11 +21,13 @@ source=(http://build.chromium.org/official/chromium-$pkgver.tar.bz2 chromium.desktop chromium.sh - gcc-4.6.patch) -md5sums=('b4df4771c79e1ce2fa704bde2d501037' + gcc-4.6.patch + glibc-2.14.patch) +md5sums=('8a5b7b4b30f5fe8de10fcf7d984321b8' '075c3c2fa5902e16b8547dd31d437191' '096a46ef386817988250d2d7bddd1b34' - 'fb4b7b6871876a9180215c580fcf2cf5') + 'fb4b7b6871876a9180215c580fcf2cf5' + '543a32b09f138fd47858b9a4a7c82dfb') build() { cd "$srcdir/chromium-$pkgver" @@ -35,6 +37,10 @@ # http://code.google.com/p/chromium/issues/detail?id=70746 # http://code.google.com/p/chromium/issues/detail?id=46411 patch -Np0 -i "$srcdir/gcc-4.6.patch" + + # Fix build with glibc 2.14 + # http://code.google.com/p/chromium/issues/detail?id=86646 + patch -Np2 -i "$srcdir/glibc-2.14.patch" ### Configure Added: glibc-2.14.patch =================================================================== --- glibc-2.14.patch (rev 0) +++ glibc-2.14.patch 2011-06-28 20:35:14 UTC (rev 129557) @@ -0,0 +1,51 @@ +--- trunk/src/third_party/tcmalloc/chromium/src/tcmalloc.cc 2011/06/21 07:36:46 89799 ++++ trunk/src/third_party/tcmalloc/chromium/src/tcmalloc.cc 2011/06/21 07:37:01 89800 +@@ -150,6 +150,13 @@ + # define WIN32_DO_PATCHING 1 + #endif + ++// GLibc 2.14+ requires the hook functions be declared volatile, based on the ++// value of the define __MALLOC_HOOK_VOLATILE. For compatibility with ++// older/non-GLibc implementations, provide an empty definition. ++#if !defined(__MALLOC_HOOK_VOLATILE) ++#define __MALLOC_HOOK_VOLATILE ++#endif ++ + using std::max; + using tcmalloc::PageHeap; + using tcmalloc::SizeMap; +@@ -403,7 +410,7 @@ + return tc_malloc(size); + } + +-void* (*__malloc_hook)( ++void* (*__MALLOC_HOOK_VOLATILE __malloc_hook)( + size_t size, const void* caller) = tc_ptmalloc_malloc_hook; + + static void* tc_ptmalloc_realloc_hook( +@@ -411,14 +418,14 @@ + return tc_realloc(ptr, size); + } + +-void* (*__realloc_hook)( ++void* (*__MALLOC_HOOK_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 (*__MALLOC_HOOK_VOLATILE __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook; + + #endif + +@@ -1757,7 +1764,7 @@ + MallocHook::InvokeNewHook(result, size); + return result; + } +-void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride; ++void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t, size_t, const void *) = MemalignOverride; + #endif // #ifndef TCMALLOC_FOR_DEBUGALLOCATION + + // ---Double free() debugging implementation -----------------------------------
