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

[Evangelos Foutras]

    Date: Sunday, October 23, 2016 @ 12:18:05
  Author: foutrelis
Revision: 279170

Remove already disabled NaCL-related build options

Modified:
  chromium/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-23 11:05:29 UTC (rev 279169)
+++ PKGBUILD	2016-10-23 12:18:05 UTC (rev 279170)
@@ -27,7 +27,7 @@
 _launcher_ver=3
 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/"
+url="https://www.chromium.org/Home"
 license=('BSD')
 depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libexif' 'libgcrypt'
          'ttf-font' 'systemd' 'dbus' 'libpulse' 'perl' 'perl-file-basedir'
@@ -37,7 +37,6 @@
 optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
             'gnome-keyring: for storing passwords in GNOME keyring'
             'kwallet: for storing passwords in KWallet')
-options=('!strip')
 install=chromium.install
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
@@ -60,15 +59,6 @@
 _google_default_client_id=413772536636.apps.googleusercontent.com
 _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 
-# We can't build (P)NaCL on i686 because the toolchain is x86_64 only and the
-# instructions on how to build the toolchain from source don't work that well
-# (at least not from within the Chromium 39 source tree).
-# https://sites.google.com/a/chromium.org/dev/nativeclient/pnacl/building-pnacl-components-for-distribution-packagers
-_build_nacl=false
-if [[ $CARCH == i686 ]]; then
-  _build_nacl=false
-fi
-
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
@@ -98,14 +88,6 @@
   mkdir -p "$srcdir/python2-path"
   ln -sf /usr/bin/python2 "$srcdir/python2-path/python"
 
-  # Download the PNaCL toolchain on x86_64; i686 toolchain is no longer provided
-  if [[ $_build_nacl == true ]]; then
-    python2 build/download_nacl_toolchains.py \
-      --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
-      sync --extract
-    #python2 tools/clang/scripts/update.py
-  fi
-
   # Remove bundled libraries for which we will use the system copies; this
   # *should* do what the remove_bundled_libraries.py script does, with the
   # added benefit of not having to list all the remaining libraries
@@ -157,8 +139,8 @@
     'use_sysroot=false'
     'enable_hangout_services_extension=true'
     'enable_widevine=true'
-    "enable_nacl=$_build_nacl"
-    "enable_nacl_nonsfi=$_build_nacl"
+    'enable_nacl=false'
+    'enable_nacl_nonsfi=false'
     "google_api_key=\"${_google_api_key}\""
     "google_default_client_id=\"${_google_default_client_id}\""
     "google_default_client_secret=\"${_google_default_client_secret}\""
@@ -195,16 +177,6 @@
 
   ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
 
-  # Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
-  strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"{chromium,chrome-sandbox,chromedriver}
-  strip $STRIP_SHARED "$pkgdir/usr/lib/chromium/libwidevinecdmadapter.so"
-
-  if [[ $_build_nacl == true ]]; then
-    cp out/Release/nacl_helper{,_bootstrap} out/Release/nacl_irt_*.nexe \
-      "$pkgdir/usr/lib/chromium/"
-    strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"nacl_helper{,_bootstrap}
-  fi
-
   for size in 22 24 48 64 128 256; do
     install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
       "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"