Date: Wednesday, December 28, 2011 @ 14:12:20 Author: foutrelis Revision: 145724
upgpkg: chromium 16.0.912.63-2 Drop !buildflags option. Added: chromium/trunk/nacl-cflags-remove-fstack-protector.patch Modified: chromium/trunk/PKGBUILD -------------------------------------------+ PKGBUILD | 16 ++++++++++++---- nacl-cflags-remove-fstack-protector.patch | 11 +++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-12-28 18:31:54 UTC (rev 145723) +++ PKGBUILD 2011-12-28 19:12:20 UTC (rev 145724) @@ -10,7 +10,7 @@ pkgname=chromium pkgver=16.0.912.63 -pkgrel=1 +pkgrel=2 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" arch=('i686' 'x86_64') url="http://www.chromium.org/" @@ -24,20 +24,21 @@ [[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib') provides=('chromium-browser') conflicts=('chromium-browser') -options=('!buildflags') install=chromium.install source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2 http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/nacl_sdk.zip chromium.desktop chromium.sh gcc-4.6.patch - fix-downloads-on-ntfs.patch) + fix-downloads-on-ntfs.patch + nacl-cflags-remove-fstack-protector.patch) sha256sums=('da806829adee04c0701444b1842975eec2e4b745956933d760153a414b53c588' '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01' '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' 'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3' '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e' - '6364c464d1885b2ec21076f01f993725925ccc066805f1ecbbeaf6f79b93c209') + '6364c464d1885b2ec21076f01f993725925ccc066805f1ecbbeaf6f79b93c209' + '406f06a1a18fad4ba9e5d4e142509f1ac1512d176cc36c1744a7abf949991e2e') build() { cd "$srcdir/chromium-$pkgver" @@ -54,6 +55,10 @@ # http://code.google.com/p/chromium/issues/detail?id=102200 patch -Np2 -i "$srcdir/fix-downloads-on-ntfs.patch" + # Filter -fstack-protector out of cflags for nacl_helper_bootstrap + # http://code.google.com/p/chromium/issues/detail?id=104569 + patch -Np2 -i "$srcdir/nacl-cflags-remove-fstack-protector.patch" + # Use Python 2 find . -type f -exec sed -i -r \ -e 's|/usr/bin/python$|&2|g' \ @@ -75,6 +80,9 @@ # available in our nss package. # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312) + # CFLAGS are passed through release_extra_cflags below + export -n CFLAGS CXXFLAGS + build/gyp_chromium -f make build/all.gyp --depth=. \ -Dno_strict_aliasing=1 \ -Dwerror= \ Added: nacl-cflags-remove-fstack-protector.patch =================================================================== --- nacl-cflags-remove-fstack-protector.patch (rev 0) +++ nacl-cflags-remove-fstack-protector.patch 2011-12-28 19:12:20 UTC (rev 145724) @@ -0,0 +1,11 @@ +--- src/chromium-16.0.912.63/chrome/nacl.gypi.orig 2011-12-28 19:10:42.000000000 +0200 ++++ src/chromium-16.0.912.63/chrome/nacl.gypi 2011-12-28 19:11:09.000000000 +0200 +@@ -275,6 +275,8 @@ + 'cflags!': [ + '-fasan', + '-w', ++ '-fstack-protector', ++ '-fstack-protector-all', + ], + 'conditions': [ + ['clang==1', {