X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=get-source.sh;h=9d5af7290aec463482b43eecae4da224e21025f2;hb=8f2c07aef874df43cc5d9c3fdb6293e5739cfc9c;hp=df738662415c2e3e23119670e1660eb7d1b59d99;hpb=ac64eb76576fae21b9f364ae160c4e9e36af60c1;p=packages%2Fchromium-browser.git diff --git a/get-source.sh b/get-source.sh index df73866..9d5af72 100755 --- a/get-source.sh +++ b/get-source.sh @@ -11,6 +11,7 @@ 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 +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,9 @@ 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" || : + wget -nc -nv -O $srctarball "$ALT_URL/$VERSION/chromium-$VERSION.tar.xz" || : + test -f $srctarball # repackage cleaned up tarball test -d $PACKAGE_NAME-$VERSION || { @@ -62,8 +65,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