Update for 41.0.2236.0

1 files changed, 15 insertions, 11 deletions

diff --git a/chromium-dev/build/chromium-dev.SlackBuild b/chromium-dev/build/chromium-dev.SlackBuild
index 018e0afb..42e5d073 100755
--- a/chromium-dev/build/chromium-dev.SlackBuild
+++ b/chromium-dev/build/chromium-dev.SlackBuild
@@ -43,6 +43,9 @@
 # 39.0.2145.4-1:
 #              06/sep/2014 by Eric Hameleers <alien@slackware.com>
 #              * Update.
+# 41.0.2236.0-1:
+#              09/dec/2014 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh chromium-dev.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -52,8 +55,8 @@
 
 SRCNAM=chromium
 SRCEXT=${SRCEXT:-"-dev"}
-PRGNAM=${SRCNAM}${SRCEXT}      # chromium-dev
-VERSION=${VERSION:-39.0.2145.4}
+PRGNAM=${SRCNAM}${SRCEXT}      # chromium or chromium-dev
+VERSION=${VERSION:-41.0.2236.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -224,19 +227,19 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xf ${SOURCE[0]}
 cd ${SRCNAM}-${VERSION}
 
+#if [ "$ARCH" != "x86_64" ]; then
+#  # For now, disable NaCl except on x86_64 because the precompiled toolchain is
+#  # only available for that architecture at the moment.
+#  echo "** Not building NaCL - architecture '$ARCH' is currently unsupported."
+#  USE_NACL=0
+#fi
+
 # Patches:
 touch $OUTPUT/patch-${PRGNAM}.log
-## Slackware specific patch:
-## (no longer applies)
-#cat $SRCDIR/patches/chromium_libelf_includes.patch | patch -p0 --verbose \
-#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Prevent crashes when accessing google.com and youtube.com just because
 # this is not an official build:
 cat $SRCDIR/patches/chromium_secure_referrer.patch | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# Add widevine cdm to this build:
-cat $SRCDIR/patches/chromium_widevine.patch | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Save configuration in ~/.config/chromium-dev":
 sed -e "s|'filename': 'chromium-browser'|'filename': '${PRGNAM}'|" \
@@ -361,11 +364,12 @@ install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chrome
 # Copy over the remaining binaries:
 cp -a \
   out/Release/{*.pak,libffmpegsumo.so,libpdf.so} \
+  out/Release/{natives_blob.bin,snapshot_blob.bin} \
   $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
 if [ ${USE_NACL} -eq 1 ]; then
   # Native Client files:
   cp -a \
-    out/Release/nacl_helper{,_bootstrap} \
+    out/Release/nacl_helper{,_bootstrap,_nonsfi} \
     out/Release/nacl_irt_*.nexe \
     $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
     # No longer built:
@@ -380,7 +384,7 @@ strip  --strip-unneeded \
   $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libpdf.so
 if [ ${USE_NACL} -eq 1 ]; then
   strip  --strip-unneeded \
-    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/nacl_helper{,_bootstrap}
+    $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/nacl_helper{,_bootstrap,_nonsfi}
     # No longer built:
     #$PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/libppGoogleNaClPluginChrome.so
 fi