chromium:Bumped to latest (17.0.963.56).

1 files changed, 53 insertions, 44 deletions

diff --git a/abs/extra/community/chromium/PKGBUILD b/abs/extra/community/chromium/PKGBUILD
index e5518e9..df239af 100644
--- a/abs/extra/community/chromium/PKGBUILD
+++ b/abs/extra/community/chromium/PKGBUILD
@@ -1,54 +1,66 @@
-# $Id$
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# $Id: PKGBUILD 150259 2012-02-16 02:37:46Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
+# Building for x86_64 requires lib32-glibc & lib32-zlib from [multilib]. These
+# libraries are linked from the NaCl toolchain, and are only needed during
+# build time.
+
 pkgname=chromium
-pkgver=13.0.782.112
-pkgrel=1
+pkgver=17.0.963.56
+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/"
 license=('BSD')
 depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent'
-         'libxss' 'libxtst' 'ttf-dejavu' 'desktop-file-utils'
+         'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
          'hicolor-icon-theme')
-makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring')
-optdepends=('mozplugger-chromium: A Mozilla multimedia plugin for Chromium')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
+             'elfutils')
+optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
+            'mozplugger-chromium: A Mozilla multimedia plugin for Chromium')
+# Needed for the NaCl toolchain
+[[ $CARCH == x86_64 ]] && makedepends+=('lib32-zlib')
 provides=('chromium-browser')
 conflicts=('chromium-browser')
 replaces=('firefox' 'firefox-i18n' 'mozplugger')
 install=chromium.install
-source=(http://build.chromium.org/official/chromium-$pkgver.tar.bz2
+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
-        glibc-2.14.patch
-        make-hash-tools-use-if-instead-of-switch.patch)
+        nacl-cflags-remove-fstack-protector.patch
+        chromium-media-no-sse-r0.patch)
+sha256sums=('270be138d499c6c2092644af69acab8310cb05c3d06c3afe7891e488c29b020f'
+            '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01'
+            '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
+            'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
+            '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e'
+            '59e732880314333d6e9acf6ac99de467c98e8a92aa5c5292ae808a805e0f8d76'
+            '71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761')
 
 build() {
   cd "$srcdir/chromium-$pkgver"
 
-  # Patches to fix gcc 4.6 compilation from
+  # Fix build with gcc 4.6
   # http://code.google.com/p/chromium/issues/detail?id=80071
-  # 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"
 
-# Fix build with Perl 5.14
-  patch -d third_party/WebKit -Np2 -i \
-    "$srcdir/make-hash-tools-use-if-instead-of-switch.patch"
+  # Filter -fstack-protector out of cflags for nacl_helper_bootstrap
+  # http://code.google.com/p/chromium/issues/detail?id=104569
+  patch -d native_client -Np1 -i \
+    "$srcdir/nacl-cflags-remove-fstack-protector.patch"
 
-### Configure
+  # Remove unconditional use of SSE3 (patch from Gentoo)
+  patch -Np0 -i "$srcdir/chromium-media-no-sse-r0.patch"
 
   # Use Python 2
   find . -type f -exec sed -i -r \
-    -e 's|/usr/bin/python$|\02|g' \
+    -e 's|/usr/bin/python$|&2|g' \
     -e 's|(/usr/bin/python2)\.4$|\1|g' \
     {} +
   # There are still a lot of relative calls which need a workaround
@@ -56,12 +68,21 @@ build() {
   ln -s /usr/bin/python2 "$srcdir/python2-path/python"
   export PATH="$srcdir/python2-path:$PATH"
 
+  pushd "$srcdir/nacl_sdk"
+  ./naclsdk update pepper_16
+  popd
+
+  ln -s "$srcdir/nacl_sdk/pepper_16/toolchain/linux_x86_newlib" \
+    native_client/toolchain/linux_x86_newlib
+
   # We need to disable system_ssl until "next protocol negotiation" support is
   # 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=. \
-    -Dgcc_version=45 \
     -Dno_strict_aliasing=1 \
     -Dwerror= \
     -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
@@ -69,21 +90,18 @@ build() {
     -Drelease_extra_cflags="$CFLAGS" \
     -Dffmpeg_branding=Chrome \
     -Dproprietary_codecs=1 \
-    -Duse_system_libjpeg=1 \
-    -Duse_system_libxslt=0 \
-    -Duse_system_libxml=0 \
     -Duse_system_bzip2=1 \
-    -Duse_system_zlib=1 \
-    -Duse_system_libpng=1 \
     -Duse_system_ffmpeg=0 \
-    -Duse_system_yasm=1 \
     -Duse_system_libevent=1 \
+    -Duse_system_libjpeg=0 \
+    -Duse_system_libpng=1 \
+    -Duse_system_libxml=0 \
     -Duse_system_ssl=0 \
+    -Duse_system_yasm=1 \
+    -Duse_system_zlib=1 \
     -Duse_gconf=0 \
     $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1')
 
-### Build
-
   make chrome chrome_sandbox BUILDTYPE=Release
 }
 
@@ -95,13 +113,10 @@ package() {
   install -Dm4755 -o root -g root out/Release/chrome_sandbox \
     "$pkgdir/usr/lib/chromium/chromium-sandbox"
 
-  install -Dm644 out/Release/chrome.pak "$pkgdir/usr/lib/chromium/chrome.pak"
-
-  install -Dm644 out/Release/resources.pak \
-    "$pkgdir/usr/lib/chromium/resources.pak"
-
-  install -D out/Release/libffmpegsumo.so \
-    "$pkgdir/usr/lib/chromium/libffmpegsumo.so"
+  cp out/Release/{{chrome,resources}.pak,libffmpegsumo.so} \
+    out/Release/nacl_helper{,_bootstrap} \
+    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_x86_*.nexe} \
+    "$pkgdir/usr/lib/chromium/"
 
   # These links are only needed when building with system ffmpeg
   #ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/
@@ -128,9 +143,3 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('a0ddccb65b0075419d089087a9de785c'
-         '075c3c2fa5902e16b8547dd31d437191'
-         '096a46ef386817988250d2d7bddd1b34'
-         '690f2be42bf2a31755753a466653eb33'
-         '543a32b09f138fd47858b9a4a7c82dfb'
-         '9d9e66c8365d7333e55305796b49fd77')