summaryrefslogtreecommitdiffstats
path: root/chromium-dev
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-07-17 14:18:47 +0000
committer Eric Hameleers <alien@slackware.com>2014-07-17 14:18:47 +0000
commit33a951113e310806025605d6825237df8b639fe2 (patch)
tree767543499f3d92951af5f6e62bdb40eaeacc146a /chromium-dev
parentf04d903065cd694e1def2eacf586e8cbf6009e1a (diff)
downloadasb-33a951113e310806025605d6825237df8b639fe2.tar.gz
asb-33a951113e310806025605d6825237df8b639fe2.tar.xz
Update to 36.0.1985.125
Diffstat (limited to 'chromium-dev')
-rwxr-xr-xchromium-dev/build/chromium.SlackBuild16
1 files changed, 11 insertions, 5 deletions
diff --git a/chromium-dev/build/chromium.SlackBuild b/chromium-dev/build/chromium.SlackBuild
index 275f4b13..94bc5fd7 100755
--- a/chromium-dev/build/chromium.SlackBuild
+++ b/chromium-dev/build/chromium.SlackBuild
@@ -78,6 +78,9 @@
# 35.0.1916.153-1:
# 10/jun/2014 by Eric Hameleers <alien@slackware.com>
# * Update comes with several security fixes.
+# 36.0.1985.125-1:
+# 16/jun/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 .
@@ -86,14 +89,14 @@
# -----------------------------------------------------------------------------
PRGNAM=chromium
-VERSION=${VERSION:-35.0.1916.153}
+VERSION=${VERSION:-36.0.1985.125}
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=12919
+TOOLREV=13104
# 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:
@@ -276,9 +279,9 @@ touch $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
+## Unneeded exit?
+#cat $SRCDIR/patches/chromium-gn-r0.patch | patch -Np0 --verbose \
+# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
# Adapt for Slackware's libelf include file location:
cat $SRCDIR/patches/chromium_libelf_includes.patch | patch -p0 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
@@ -355,6 +358,9 @@ build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
+build/download_nacl_toolchains.py --no-arm-trusted --keep \
+ 2>&1 | tee $OUTPUT/nacl_dl-${PRGNAM}.log
+
ninja $NUMJOBS -C out/Release chrome chrome_sandbox chromedriver
2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log