/pidgin/main: 77d7303db326: Move all win32 deps from my dropbox ...

[Tomasz Wasilczyk]

Changeset: 77d7303db3260b4084e10e3460c7f322a741132f
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-01-04 20:51 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/77d7303db326

Description:

Move all win32 deps from my dropbox to pidgin.im

diffstat:

 pidgin/win32/nsis/generate_gtk_zip.sh |  16 ++++++++++------
 pidgin/win32/prepare-workspace.sh     |   5 ++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diffs (67 lines):

diff --git a/pidgin/win32/nsis/generate_gtk_zip.sh b/pidgin/win32/nsis/generate_gtk_zip.sh
--- a/pidgin/win32/nsis/generate_gtk_zip.sh
+++ b/pidgin/win32/nsis/generate_gtk_zip.sh
@@ -10,6 +10,12 @@ if [ ! -e $PIDGIN_BASE/ChangeLog ]; then
 	exit 1
 fi
 
+if [ ! -e $PIDGIN_BASE/VERSION ]; then
+	cd ../../..
+	make -f Makefile.mingw VERSION
+	cd - > /dev/null
+fi
+
 STAGE_DIR=`readlink -f $PIDGIN_BASE/pidgin/win32/nsis/gtk_runtime_stage`
 #Subdirectory of $STAGE_DIR
 INSTALL_DIR=Gtk
@@ -21,7 +27,7 @@ BUNDLE_VERSION=2.24.14.0
 BUNDLE_SHA1SUM="df28047f00934e6a00a5962387a1005114ec772e"
 ZIP_FILE="$PIDGIN_BASE/pidgin/win32/nsis/gtk-runtime-$BUNDLE_VERSION.zip"
 #BUNDLE_URL="https://pidgin.im/win32/download_redir.php?version=$PIDGIN_VERSION&gtk_version=$BUNDLE_VERSION&dl_pkg=gtk"
-BUNDLE_URL="https://dl.dropbox.com/u/5448886/pidgin-win32/gtk-runtime-2.24.14.0.zip"
+BUNDLE_URL="https://pidgin.im/~twasilczyk/win32/gtk-runtime-$BUNDLE_VERSION.zip"
 
 function download() {
 	if [ -e "$2" ]; then
@@ -75,9 +81,8 @@ else
 	exit 0
 fi
 
-#DOWNLOAD_HOST="http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.3/noarch/"
-#TODO: this is just a temporary mirror - Tomek Wasilczyk's <tomkiewicz at cpw.pidgin.im> Dropbox
-DOWNLOAD_HOST="https://dl.dropbox.com/u/5448886/pidgin-win32/runtime-deps/"
+# origin: http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.3/noarch/
+DOWNLOAD_HOST="https://pidgin.im/~twasilczyk/win32/runtime-deps/"
 
 ALL=""
 
@@ -252,8 +257,7 @@ mkdir $INSTALL_DIR
 #new CONTENTS file
 echo Bundle Version $BUNDLE_VERSION > $CONTENTS_FILE
 
-#TODO: temporary mirror also
-CPIO_URL="https://dl.dropbox.com/u/5448886/pidgin-win32/cpio/bsdcpio-3.0.3-1.4.tar.gz"
+CPIO_URL="https://pidgin.im/~twasilczyk/win32/devel-deps/cpio/bsdcpio-3.0.3-1.4.tar.gz"
 CPIO_SHA1SUM="0460c7a52f8c93d3c4822d6d1aaf9410f21bd4da"
 CPIO_DIR="bsdcpio"
 FILE="bsdcpio.tar.gz"
diff --git a/pidgin/win32/prepare-workspace.sh b/pidgin/win32/prepare-workspace.sh
--- a/pidgin/win32/prepare-workspace.sh
+++ b/pidgin/win32/prepare-workspace.sh
@@ -21,14 +21,13 @@ fi
 DEBUG_SKIP_DOWNLOADING=0
 DEBUG_SKIP_INSTALL=0
 
-#TODO: this is just a temporary mirror - Tomek Wasilczyk's <tomkiewicz at cpw.pidgin.im> Dropbox
-DOWNLOAD_HOST="https://dl.dropbox.com/u/5448886/pidgin-win32/devel-deps/"
+DOWNLOAD_HOST="https://pidgin.im/~twasilczyk/win32/devel-deps/"
 
 ARCHIVES=""
 OBS_SKIP="usr/i686-w64-mingw32/sys-root/mingw"
 
 # bsdcpio is used for extracting rpms
-ARC_CPI="https://dl.dropbox.com/u/5448886/pidgin-win32/cpio/bsdcpio-3.0.3-1.4.tar.gz;bsdcpio;3.0.3-1.4;0460c7a52f8c93d3c4822d6d1aaf9410f21bd4da;bsdcpio-3.0.3-1.4;bsdcpio"
+ARC_CPI="${DOWNLOAD_HOST}cpio/bsdcpio-3.0.3-1.4.tar.gz;bsdcpio;3.0.3-1.4;0460c7a52f8c93d3c4822d6d1aaf9410f21bd4da;bsdcpio-3.0.3-1.4;bsdcpio"
 ARCHIVES+="ARC_CPI "
 
 ARC_CSA="${DOWNLOAD_HOST}cyrus-sasl-2.1.25.tar.gz;Cyrus SASL;2.1.25;b9d7f510c0c5daa71ee5225daacdd58e948a8d19;cyrus-sasl-2.1.25;cyrus-sasl-2.1"