Update to 34.0.1847.116. Switch from 'make' to 'ninja'. Add chromedriver.

1 files changed, 22 insertions, 11 deletions

diff --git a/chromium-dev/build/chromium.SlackBuild b/chromium-dev/build/chromium.SlackBuild
index 4ffa02be..2a9ced88 100755
--- a/chromium-dev/build/chromium.SlackBuild
+++ b/chromium-dev/build/chromium.SlackBuild
@@ -29,8 +29,9 @@
 # For:         chromium
 # Descr:       Open Source version of Chrome Web Browser
 # URL:         http://www.chromium.org/
-# Build needs: multilib gcc & glibc for compiling the Native Client (64-bit)
-#              libelf with '-D_FILE_OFFSET_BITS=64' added to CFLAGS (32-bit)
+# Build needs: multilib gcc & glibc for compiling the Native Client (64-bit);
+#              libelf with '-D_FILE_OFFSET_BITS=64' added to CFLAGS (32-bit);
+#              ninja.
 # Needs:       
 # Changelog:   
 # 31.0.1650.57-1:
@@ -62,6 +63,9 @@
 # 33.0.1750.152-1:
 #              18/mar/2014 by Eric Hameleers <alien@slackware.com>
 #              * Update comes with several security fixes.
+# 34.0.1847.116-1:
+#              09/apr/2014 by Eric Hameleers <alien@slackware.com>
+#              * Update comes with several security fixes.
 # 
 # Run 'sh chromium.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -70,14 +74,14 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=chromium
-VERSION=${VERSION:-33.0.1750.152}
+VERSION=${VERSION:-34.0.1847.116}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
 # For an indication of what toolchain version to use, you can check the
 # PNACL_VERSION value in chromium's "native_client/TOOL_REVISIONS" file.
-TOOLREV=12526
+TOOLREV=12772
 
 # You can build without NaCl (native client) if you set USE_NACL to "0",
 # but you'll lose some Chrome functionality like using in-browser applications:
@@ -257,10 +261,9 @@ cd ${PRGNAM}-${VERSION}
 
 # Patches:
 touch $OUTPUT/patch-${PRGNAM}.log
-# Fix build with system ICU:
-# Upstreamed:
-#cat $SRCDIR/patches/chromium-system-icu-r0.patch | patch -Np0 --verbose \
-#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Un-confuse find_depot_tools:
+cat $SRCDIR/patches/chromium-depot_tools.patch | patch -Np0 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Unneeded exit?
 cat $SRCDIR/patches/chromium-gn-r0.patch | patch -Np0 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
@@ -338,10 +341,10 @@ _chromium_conf=(
 
 build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-build/gyp_chromium -f make --depth=. "${_chromium_conf[@]}" \
+build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
   2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
-make $NUMJOBS chrome chrome_sandbox BUILDTYPE=Release V=1 \
-  2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+ninja $NUMJOBS  -C out/Release chrome chrome_sandbox chromedriver
+  2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log
 
 # Manually install everything:
 
@@ -352,6 +355,10 @@ install -D out/Release/chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromium
 install -D -m4755 -o root -g root out/Release/chrome_sandbox \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox
 
+# The Chromium implementation of the WebDriver wire protocol
+# (automated testing of web apps):
+install -D out/Release/chromedriver $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromedriver
+
 # Copy over the remaining binaries:
 cp -a \
   out/Release/{*.pak,libffmpegsumo.so} \
@@ -367,6 +374,7 @@ fi
 # Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
 strip  --strip-unneeded \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/{chromium,chrome-sandbox} \
+  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromedriver \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libffmpegsumo.so
 if [ ${USE_NACL} -eq 1 ]; then
   strip  --strip-unneeded \
@@ -387,6 +395,9 @@ install -D -m0644 out/Release/chrome.1 $PKG/usr/man/man1/chromium.1
 install -D -m0755 $SRCDIR/chromium.sh $PKG/usr/bin/chromium
 sed -i -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" $PKG/usr/bin/chromium
 
+# Make the chromedriver available in the $PATH :
+ln -s ../lib${LIBDIRSUFFIX}/chromium/chromedriver $PKG/usr/bin/
+
 # Install desktop icons:
 for size in 16 32; do
   install -D -m0644 \