up to 48.0.2564.103

[packages/chromium-browser.git] / get-source.sh

diff --git a/get-source.sh b/get-source.sh
index 76cff0a907704991cd525a4d5ac52f3429245b5b..89f2f6c86e0d46bf1bec95bd60ed84568ed1d64e 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -4,13 +4,14 @@ set -e
 # CHANNEL: any from CHANNELS_URL: stable, beta, dev
 CHANNEL=${1:-beta}
 
-CHANNELS_URL=http://omahaproxy.appspot.com/all
+CHANNELS_URL=https://omahaproxy.appspot.com/all
 PACKAGE_NAME=chromium-browser
 PROGRAM=${0##*/}
 WORK_DIR=$(cd "$(dirname "$0")"; pwd)
 LOCKFILE=$WORK_DIR/$PACKAGE_NAME-$CHANNEL.lock
-# Browse URL: http://gsdview.appspot.com/chromium-browser-official/
-OFFICIAL_URL=http://commondatastorage.googleapis.com/chromium-browser-official
+# Browse URL: https://gsdview.appspot.com/chromium-browser-official/
+OFFICIAL_URL=https://commondatastorage.googleapis.com/chromium-browser-official
+ALT_URL=https://github.com/zcbenz/chromium-source-tarball/releases/download
 DIST_DIR=$HOME/public_html/chromium-browser/src/$CHANNEL
 
 # skip package build if interactive
@@ -46,7 +47,14 @@ set -x
        (
        cd "$TMP_DIR"
        srctarball=$PACKAGE_NAME-$VERSION.tar.xz
-       wget -c -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.xz"
+
+       wget -nc -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.xz" || :
+       test -s $srctarball || rm $srctarball
+
+       wget -nc -nv -O $srctarball "$ALT_URL/$VERSION/chromium-$VERSION.tar.xz" || :
+       test -s $srctarball || rm $srctarball
+
+       test -f $srctarball
 
        # repackage cleaned up tarball
        test -d $PACKAGE_NAME-$VERSION || {
@@ -62,8 +70,10 @@ set -x
 
        awk '/^#define/ && /(MAJOR|MINOR)_VERSION|BUILD_NUMBER|PATCH_LEVEL/ { printf("%s=%s\n", $2, $3) }' v8/src/version.cc | tee -a v8.sh
 
-       if [ "$CHANNEL" != "dev" ]; then
-               sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0
+       if [ "$CHANNEL" = "stable" ]; then
+               patch -p1 < $WORK_DIR/remove_bundled_libraries-stale.patch
+               sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0 ffmpeg=0 protobuf=0
+               patch -p1 -R < $WORK_DIR/remove_bundled_libraries-stale.patch
        fi
 
        # do not keep REMOVED*.txt in tarball. they are visible in .log anyway
@@ -101,6 +111,7 @@ set -x
                current=$DIST_DIR/$PACKAGE_NAME-$VERSION.tar.$EXT
                if [ "$(basename $base)" != "$(basename $current)" ]; then
                        sh -x $WORK_DIR/make-diff-patch.sh $base $current
+                       chmod 644 $PACKAGE_NAME-$VERSION.patch.xz
                        mv $PACKAGE_NAME-$VERSION.patch.xz $DIST_DIR
                        # for beta and dev channels, update the diff pointer
                        if [ "$CHANNEL" != "stable" ]; then