[arch-commits] Commit in chromium/trunk (PKGBUILD nacl.gypi)

[Evangelos Foutras]

    Date: Wednesday, December 14, 2011 @ 02:42:30
  Author: foutrelis
Revision: 145009

upgpkg: chromium 16.0.912.63-1

New upstream release.

Modified:
  chromium/trunk/PKGBUILD
Deleted:
  chromium/trunk/nacl.gypi

-----------+
 PKGBUILD  |   33 ++++++++++++++++++++++-----------
 nacl.gypi |    8 --------
 2 files changed, 22 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-14 03:12:03 UTC (rev 145008)
+++ PKGBUILD	2011-12-14 07:42:30 UTC (rev 145009)
@@ -4,8 +4,12 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227 at 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=15.0.874.121
+pkgver=16.0.912.63
 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')
@@ -14,29 +18,30 @@
 depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent'
          'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
          'hicolor-icon-theme')
-makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring')
+makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
+             'elfutils')
+# Needed for the NaCl toolchain
+[[ $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
-        nacl.gypi
         fix-downloads-on-ntfs.patch)
-sha256sums=('4d3e340b43ca1f5dd7bd5b7b0c575dfe158eee3ba5163a1c42be53dfc7db5aec'
+sha256sums=('da806829adee04c0701444b1842975eec2e4b745956933d760153a414b53c588'
+            '964fe3a5ec56f2505649aba00f900abe4205674b7fdaa16772647d347173bb01'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             'c53bfc4db9dde684fbaed6a4bbecb207e3e7a0a2703233426fe076a6d3c557f3'
             '9c5e0803904d1a0e71ab7444c92a7046a34a9518eeba7a70f2eec7abecb8bf4e'
-            '25bddd2eee7821e18ddda06f6e69552c359e1c04a10971ac3985556c3d8ef059'
             '6364c464d1885b2ec21076f01f993725925ccc066805f1ecbbeaf6f79b93c209')
 
 build() {
   cd "$srcdir/chromium-$pkgver"
 
-  # NaCL build remains faily
-  cp "$srcdir/nacl.gypi" chrome/
-
   # Fix build with gcc 4.6
   # http://code.google.com/p/chromium/issues/detail?id=80071
   patch -Np0 -i "$srcdir/gcc-4.6.patch"
@@ -59,6 +64,13 @@
   ln -s /usr/bin/python2 "$srcdir/python2-path/python"
   export PATH="$srcdir/python2-path:$PATH"
 
+  pushd "$srcdir/nacl_sdk"
+  ./naclsdk update pepper_15
+  popd
+
+  ln -s "$srcdir/nacl_sdk/pepper_15/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)
@@ -81,7 +93,6 @@
     -Duse_system_yasm=1 \
     -Duse_system_zlib=1 \
     -Duse_gconf=0 \
-    -Ddisable_nacl=1 \
     $([[ $CARCH == i686 ]] && echo '-Ddisable_sse2=1')
 
   make chrome chrome_sandbox BUILDTYPE=Release
@@ -95,9 +106,9 @@
   install -Dm4755 -o root -g root out/Release/chrome_sandbox \
     "$pkgdir/usr/lib/chromium/chromium-sandbox"
 
-  # Add out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_x86_*.nexe} again
-  # when NaCl build is fixed
   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

Deleted: nacl.gypi
===================================================================
--- nacl.gypi	2011-12-14 03:12:03 UTC (rev 145008)
+++ nacl.gypi	2011-12-14 07:42:30 UTC (rev 145009)
@@ -1,8 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'nacl',
-      'type': 'static_library',
-    },
-  ],
-}