diff options
| author | Matt Corallo <git@bluematt.me> | 2012-10-28 21:40:49 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2012-10-29 15:43:18 -0400 |
| commit | 325a064c68cfd340903573987da2809b450d4983 (patch) | |
| tree | bd2e7067b0497a952c3589b01757c0f6b0b89c33 /contrib | |
| parent | f53b125507ed85a7b7974525bbefc8f7db88c7aa (diff) | |
Upgrade to Qt 4.8.3 (because 4.8.2 was removed from qt repos?)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/README | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 6 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/qt-win32.yml | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/contrib/gitian-descriptors/README b/contrib/gitian-descriptors/README index 1d3910b994..46c7668ab9 100644 --- a/contrib/gitian-descriptors/README +++ b/contrib/gitian-descriptors/README @@ -31,7 +31,7 @@ Once you've got the right hardware and software: wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz' wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz' - wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz' + wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz' cd ../.. cd gitian-builder diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index c5979614d3..5271601ed2 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -12,17 +12,17 @@ packages: - "faketime" reference_datetime: "2011-01-30 00:00:00" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" +- "url": "https://github.com/TheBlueMatt/bitcoin.git" "dir": "bitcoin" files: -- "qt-win32-4.8.2-gitian-r1.zip" +- "qt-win32-4.8.3-gitian-r1.zip" - "boost-win32-1.50.0-gitian2.zip" - "bitcoin-deps-0.0.5.zip" script: | # mkdir $HOME/qt cd $HOME/qt - unzip ../build/qt-win32-4.8.2-gitian-r1.zip + unzip ../build/qt-win32-4.8.3-gitian-r1.zip cd $HOME/build/ export PATH=$PATH:$HOME/qt/bin/ # diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml index 87887dec87..0b711790e6 100644 --- a/contrib/gitian-descriptors/qt-win32.yml +++ b/contrib/gitian-descriptors/qt-win32.yml @@ -11,15 +11,15 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "qt-everywhere-opensource-src-4.8.2.tar.gz" +- "qt-everywhere-opensource-src-4.8.3.tar.gz" script: | INSTDIR="$HOME/qt/" mkdir $INSTDIR SRCDIR="$INSTDIR/src/" mkdir $SRCDIR # - tar xzf qt-everywhere-opensource-src-4.8.2.tar.gz - cd qt-everywhere-opensource-src-4.8.2 + tar xzf qt-everywhere-opensource-src-4.8.3.tar.gz + cd qt-everywhere-opensource-src-4.8.3 sed 's/$TODAY/2011-01-30/' -i configure sed 's/i686-pc-mingw32-/i586-mingw32msvc-/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf sed --posix 's|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/i586-mingw32msvc/include/ -frandom-seed=qtbuild|' -i mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -51,4 +51,4 @@ script: | # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - zip -r $OUTDIR/qt-win32-4.8.2-gitian-r1.zip * + zip -r $OUTDIR/qt-win32-4.8.3-gitian-r1.zip * |