[tor-commits] [tor-browser-bundle/master] Bug #9830: Bump mingw-w64 version to fix compile issue with Firefox 24 ESR

[mikeperry at torproject.org]

commit 6a581a2b05666d13e5c87144f4d6aa2fb77cb68a
Author: Georg Koppen <georg at getfoxyproxy.org>
Date:   Wed Nov 27 20:50:23 2013 -0800

    Bug #9830: Bump mingw-w64 version to fix compile issue with Firefox 24 ESR
    
    Only bump the version for FF24 builds for now.
---
 gitian/fetch-inputs.sh |   19 ++++++++++++++++---
 gitian/versions.alpha  |    4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 82a0b50..5831002 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -99,6 +99,12 @@ update_git() {
   fi
 }
 
+checkout_mingw() {
+  svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1
+  # XXX: Path
+  ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn
+}
+
 ##############################################################################
 # Get package files from mirror
 
@@ -173,9 +179,16 @@ wget -U "" -N ${NOSCRIPT_URL}
 # So is mingw:
 if [ ! -f mingw-w64-svn-snapshot.zip ];
 then
-  svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1
-  # XXX: Path
-  ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn
+  checkout_mingw
+else
+  # We do have mingw-w64 already but is it the correct revision? We check the
+  # hash of the zip archive as it has to be changed as well if a new revision
+  # should be used.
+   if ! echo "${MINGW_HASH}  ${MINGW_PACKAGE}" | sha256sum -c -; then
+     # We need to update the local mingw-w64 copy
+     rm -rf mingw-w64-svn*
+     checkout_mingw
+   fi
 fi
 
 # Verify packages with weak or no signatures via direct sha256 check
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 3649fe7..ab6e9cb 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -12,7 +12,7 @@ HTTPSE_TAG=3.4.2
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
-MINGW_REV=5830
+MINGW_REV=6184
 
 GITIAN_TAG=tor-browser-builder-3.0-4
 
@@ -38,7 +38,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f
-MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b
+MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 
 ## Non-git package URLs