diff options
author | Eric Hameleers <alien@slackware.com> | 2016-02-14 18:30:31 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-02-14 18:30:31 +0000 |
commit | 4c2b42eb17d208e5d3f959936da284fb409c8597 (patch) | |
tree | 064b1ee44d15c280443256fa8e37fc0b9934b0c7 /chromium | |
parent | c9cbf856f1789f4394d46138373ef6d97c4a7776 (diff) | |
download | asb-4c2b42eb17d208e5d3f959936da284fb409c8597.tar.gz asb-4c2b42eb17d208e5d3f959936da284fb409c8597.tar.xz |
chromium: updated to 48.0.2564.109.
Diffstat (limited to 'chromium')
-rwxr-xr-x | chromium/build/chromium.SlackBuild | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index b85c30ec..2966f258 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -207,8 +207,11 @@ # 48.0.2564.97-1: # 31/jan/2016 by Eric Hameleers <alien@slackware.com> # * Update. +# 48.0.2564.109-1: +# 13/feb/2016 by Eric Hameleers <alien@slackware.com> +# * Update. # -# +# ----------------------------------------------------------------------------- # # Run 'sh chromium.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -219,7 +222,7 @@ SRCNAM=chromium SRCEXT=${SRCEXT:-""} # could be "-dev" for development build PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev -VERSION=${VERSION:-48.0.2564.97} +VERSION=${VERSION:-48.0.2564.109} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -269,7 +272,7 @@ USE_HOTWORD=${USE_HOTWORD:-0} # as our chromium sources: # rpm2cpio ${SOURCE[1]} | cpio --to-stdout -i ./opt/google/chrome${BINTREE}/chrome 2>&1 | strings | grep -C 1 " (version:" | tail -1 RPMSUB=${RPMSUB:-"-1"} -WIDEVINE_VERSION="1.4.8.824" # CHROME_VERSION="48.0.2564.97" +WIDEVINE_VERSION="1.4.8.824" # CHROME_VERSION="48.0.2564.109" DOCS="AUTHORS DEPS LICENSE README*" @@ -389,7 +392,8 @@ umask 0022 # Source locations: SOURCE[0]="$SRCDIR/${SRCNAM}-${VERSION}.tar.xz" -SRCURL[0]="https://commondatastorage.googleapis.com/${SRCNAM}-browser-official/${SRCNAM}-${VERSION}.tar.xz" +#SRCURL[0]="https://commondatastorage.googleapis.com/${SRCNAM}-browser-official/${SRCNAM}-${VERSION}.tar.xz" +SRCURL[0]="https://github.com/zcbenz/chromium-source-tarball/releases/download/${VERSION}/${SRCNAM}-${VERSION}.tar.xz" if [ "$P1" == "--download" -a $USE_CDM -eq 1 ]; then SOURCE[1]="$SRCDIR/google-chrome-$RPMCHAN-$VERSION$RPMSUB.$RPMARCH.rpm" @@ -578,6 +582,22 @@ third_party/libaddressinput/chromium/tools/update-strings.py \ # Do not make the build fail, see https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion : touch chrome/test/data/webui/i18n_process_css_test.html +# Do not make the build fail: +if [ ! -f chrome/test/data/webui_test_resources.grd ]; then +cat <<EOF >chrome/test/data/webui_test_resources.grd +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="chrome/test/data/grit/webui_test_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="webui_test_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + </release> +</grit> +EOF +fi # Unbundle the libraries which we use from the system: build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log |