Skip to content

Commit 8c31f03

Browse files
committed
Merge pull request #3527 from laanwj/2014_01_gitian_win32_qt5
build: update win32 deps
2 parents f8b48ed + f4bb12e commit 8c31f03

File tree

6 files changed

+55
-68
lines changed

6 files changed

+55
-68
lines changed

contrib/gitian-descriptors/README.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,8 @@ Once you've got the right hardware and software:
2525
mkdir gitian-builder/inputs
2626
cd gitian-builder/inputs
2727

28-
# Inputs for Linux and Win32:
29-
wget -O miniupnpc-1.6.tar.gz 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz'
30-
wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
31-
32-
# Inputs for Win32: (Linux has packages for these)
33-
wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
34-
wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'
35-
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
36-
wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz'
37-
wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz'
38-
wget 'https://download.qt-project.org/archive/qt/4.8/4.8.3/qt-everywhere-opensource-src-4.8.3.tar.gz'
39-
wget 'http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
28+
# Get inputs (see doc/release-process.md for exact inputs needed and where to get them)
29+
...
4030
cd ../..
4131

4232
cd gitian-builder
@@ -87,4 +77,4 @@ Here's a description of Gavin's setup on OSX 10.6:
8777

8878
export USE_LXC=1
8979
git clone git://github.com/bitcoin/bitcoin.git
90-
... etc
80+
... etc

contrib/gitian-descriptors/deps-win32.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ packages:
1414
reference_datetime: "2011-01-30 00:00:00"
1515
remotes: []
1616
files:
17-
- "openssl-1.0.1c.tar.gz"
17+
- "openssl-1.0.1e.tar.gz"
1818
- "db-4.8.30.NC.tar.gz"
19-
- "miniupnpc-1.6.tar.gz"
20-
- "zlib-1.2.6.tar.gz"
21-
- "libpng-1.5.9.tar.gz"
22-
- "qrencode-3.2.0.tar.bz2"
19+
- "miniupnpc-1.8.tar.gz"
20+
- "zlib-1.2.8.tar.gz"
21+
- "libpng-1.6.8.tar.gz"
22+
- "qrencode-3.4.3.tar.bz2"
2323
script: |
2424
#
2525
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
@@ -28,17 +28,17 @@ script: |
2828
export INSTALLPREFIX=$OUTDIR/staging/deps
2929
export HOST=i686-w64-mingw32
3030
# Input Integrity Check
31-
echo "2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe openssl-1.0.1c.tar.gz" | sha256sum -c
31+
echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c
3232
echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c
33-
echo "bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994 miniupnpc-1.6.tar.gz" | sha256sum -c
34-
echo "21235e08552e6feba09ea5e8d750805b3391c62fb81c71a235c0044dc7a8a61b zlib-1.2.6.tar.gz" | sha256sum -c
35-
echo "b75dae26151f9b031062c8d2f577a094b08da0ae44fe8c11175d0b9ff434cc02 libpng-1.5.9.tar.gz" | sha256sum -c
36-
echo "03c4bc7cd9a75747c3815d509bbe061907d615764f2357923f0db948c567068f qrencode-3.2.0.tar.bz2" | sha256sum -c
33+
echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c
34+
echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c
35+
echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96 libpng-1.6.8.tar.gz" | sha256sum -c
36+
echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c
3737
3838
mkdir -p $INSTALLPREFIX
3939
40-
tar xzf openssl-1.0.1c.tar.gz
41-
cd openssl-1.0.1c
40+
tar xzf openssl-1.0.1e.tar.gz
41+
cd openssl-1.0.1e
4242
./Configure --cross-compile-prefix=$HOST- mingw --openssldir=$INSTALLPREFIX
4343
make
4444
make install_sw
@@ -51,11 +51,11 @@ script: |
5151
make install_lib install_include
5252
cd ../..
5353
#
54-
tar xzf miniupnpc-1.6.tar.gz
55-
cd miniupnpc-1.6
54+
tar xzf miniupnpc-1.8.tar.gz
55+
cd miniupnpc-1.8
5656
echo "
57-
--- miniupnpc-1.6/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000
58-
+++ miniupnpc-1.6/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000
57+
--- miniupnpc-1.8/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000
58+
+++ miniupnpc-1.8/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000
5959
@@ -67,8 +67,8 @@
6060
6161
wingenminiupnpcstrings.o: wingenminiupnpcstrings.c
@@ -75,26 +75,27 @@ script: |
7575
install libminiupnpc.a $INSTALLPREFIX/lib
7676
cd ..
7777
#
78-
tar xzf zlib-1.2.6.tar.gz
79-
cd zlib-1.2.6
78+
tar xzf zlib-1.2.8.tar.gz
79+
cd zlib-1.2.8
8080
CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static
8181
make
8282
make install
8383
cd ..
8484
#
85-
tar xzf libpng-1.5.9.tar.gz
86-
cd libpng-1.5.9
87-
CFLAGS="-I$INSTALLPREFIX/include" LDFLAGS="-L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
85+
tar xzf libpng-1.6.8.tar.gz
86+
cd libpng-1.6.8
87+
OPT="-O2"
88+
CPPFLAGS="${OPT} -I$INSTALLPREFIX/include" CFLAGS="${OPT} -I$INSTALLPREFIX/include" LDFLAGS="${OPT} -L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
8889
make $MAKEOPTS
8990
make install
9091
cd ..
9192
#
92-
tar xjf qrencode-3.2.0.tar.bz2
93-
cd qrencode-3.2.0
93+
tar xjf qrencode-3.4.3.tar.bz2
94+
cd qrencode-3.4.3
9495
png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=$HOST
9596
make
9697
make install
9798
cd ..
9899
#
99100
cd $INSTALLPREFIX
100-
zip -r $OUTDIR/bitcoin-deps-win32-gitian-r9.zip include lib
101+
zip -r $OUTDIR/bitcoin-deps-win32-gitian-r10.zip include lib

contrib/gitian-descriptors/gitian-win32.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ remotes:
2222
- "url": "https://github.com/bitcoin/bitcoin.git"
2323
"dir": "bitcoin"
2424
files:
25-
- "qt-win32-4.8.3-gitian-r4.zip"
25+
- "qt-win32-5.2.0-gitian-r1.zip"
2626
- "boost-win32-1.55.0-gitian-r6.zip"
27-
- "bitcoin-deps-win32-gitian-r9.zip"
27+
- "bitcoin-deps-win32-gitian-r10.zip"
2828
- "protobuf-win32-2.5.0-gitian-r3.zip"
2929
script: |
3030
#
@@ -34,9 +34,9 @@ script: |
3434
#
3535
mkdir -p $STAGING
3636
cd $STAGING
37-
unzip ../build/qt-win32-4.8.3-gitian-r4.zip
37+
unzip ../build/qt-win32-5.2.0-gitian-r1.zip
3838
unzip ../build/boost-win32-1.55.0-gitian-r6.zip
39-
unzip ../build/bitcoin-deps-win32-gitian-r9.zip
39+
unzip ../build/bitcoin-deps-win32-gitian-r10.zip
4040
unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip
4141
cd $HOME/build/
4242
#

contrib/gitian-descriptors/qt-win32.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,51 @@ packages:
1010
- "zip"
1111
- "unzip"
1212
- "faketime"
13-
- "unzip"
13+
- "libz-dev"
1414
reference_datetime: "2011-01-30 00:00:00"
1515
remotes: []
1616
files:
17-
- "qt-everywhere-opensource-src-4.8.3.tar.gz"
18-
- "bitcoin-deps-win32-gitian-r9.zip"
17+
- "qt-everywhere-opensource-src-5.2.0.tar.gz"
18+
- "bitcoin-deps-win32-gitian-r10.zip"
1919
script: |
2020
#
2121
HOST=i686-w64-mingw32
2222
INSTDIR="$HOME/qt/"
2323
# Integrity Check
24-
echo "f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 qt-everywhere-opensource-src-4.8.3.tar.gz" | sha256sum -c
24+
echo "395ec72277c5786c65b8163ef5817fd03d0a1f524a6d47f53624baf8056f1081 qt-everywhere-opensource-src-5.2.0.tar.gz" | sha256sum -c
2525
2626
mkdir $INSTDIR
2727
mkdir -p $INSTDIR/host/bin
2828
#
2929
# Need mingw-compiled openssl from bitcoin-deps:
30-
unzip bitcoin-deps-win32-gitian-r9.zip
30+
unzip bitcoin-deps-win32-gitian-r10.zip
3131
DEPSDIR=`pwd`
3232
#
33-
tar xzf qt-everywhere-opensource-src-4.8.3.tar.gz
34-
cd qt-everywhere-opensource-src-4.8.3
33+
tar xzf qt-everywhere-opensource-src-5.2.0.tar.gz
34+
cd qt-everywhere-opensource-src-5.2.0
35+
SPECNAME="win32-g++"
36+
SPECFILE="qtbase/mkspecs/${SPECNAME}/qmake.conf"
3537
sed 's/$TODAY/2011-01-30/' -i configure
36-
sed "s/i686-pc-mingw32-/$HOST-/" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
37-
sed --posix "s|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/$HOST/include/ -frandom-seed=qtbuild|" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
38-
sed 's/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
39-
sed 's/QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads/QMAKE_LFLAGS_EXCEPTIONS_ON = -lmingwthrd/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
40-
sed --posix "s/QMAKE_MOC\t\t= $HOST-moc/QMAKE_MOC\t\t= moc/" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
41-
sed --posix "s/QMAKE_RCC\t\t= $HOST-rcc/QMAKE_RCC\t\t= rcc/" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
42-
sed --posix "s/QMAKE_UIC\t\t= $HOST-uic/QMAKE_UIC\t\t= uic/" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
38+
sed --posix "s|QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport|QMAKE_CFLAGS\t\t= -pipe -fno-keep-inline-dllexport -isystem /usr/$HOST/include/ -frandom-seed=qtbuild -I$DEPSDIR/include|" -i ${SPECFILE}
39+
sed --posix "s|QMAKE_LFLAGS =|QMAKE_LFLAGS\t\t= -L$DEPSDIR/lib|" -i ${SPECFILE}
4340
# ar adds timestamps to every object file included in the static library
4441
# providing -D as ar argument is supposed to solve it, but doesn't work as qmake strips off the arguments and adds -M to pass a script...
4542
# which somehow cannot be combined with other flags.
4643
# use faketime only for ar, as it confuses make/qmake into hanging sometimes
47-
sed --posix "s|QMAKE_LIB\t\t= $HOST-ar -ru|QMAKE_LIB\t\t= $HOME/ar -Dr|" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
44+
sed --posix "s|QMAKE_LIB = \\\$\\\${CROSS_COMPILE}ar -ru|QMAKE_LIB\t\t= $HOME/ar -Dr|" -i ${SPECFILE}
4845
echo '#!/bin/bash' > $HOME/ar
4946
echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ar
5047
echo "$HOST-ar \"\$@\"" >> $HOME/ar
5148
chmod +x $HOME/ar
5249
#export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
5350
export FAKETIME=$REFERENCE_DATETIME
5451
export TZ=UTC
52+
#
5553
# Compile static libraries, and use statically linked openssl (-openssl-linked):
56-
OPENSSL_LIBS="-L$DEPSDIR/lib -lssl -lcrypto -lgdi32" ./configure -prefix $INSTDIR -bindir $INSTDIR/host/bin -I $DEPSDIR/include -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -no-opengl -nomake examples -nomake demos -nomake docs -no-feature-style-plastique -no-feature-style-cleanlooks -no-feature-style-motif -no-feature-style-cde -no-feature-style-windowsce -no-feature-style-windowsmobile -no-feature-style-s60 -openssl-linked
57-
find . -name *.prl | xargs -l sed 's|/\.||' -i
58-
find . -name *.prl | xargs -l sed 's|/$||' -i
54+
OPENSSL_LIBS="-L$DEPSDIR/lib -lssl -lcrypto -lgdi32" ./configure -prefix $INSTDIR -bindir $INSTDIR/host/bin -confirm-license -release -opensource -static -xplatform $SPECNAME -device-option CROSS_COMPILE="$HOST-" -no-audio-backend -no-javascript-jit -no-sql-sqlite -no-sql-odbc -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-opengl -no-compile-examples -no-feature-style-windowsce -no-feature-style-windowsmobile -no-qml-debug -openssl-linked -skip qtsvg -skip qtwebkit -skip qtwebkit-examples -skip qtserialport -skip qtdeclarative -skip qtmultimedia -skip qtimageformats -skip qtlocation -skip qtsensors -skip qtquick1 -skip qtquickcontrols -skip qtactiveqt -skip qtconnectivity -skip qtwinextras -skip qtxmlpatterns -skip qtscript -skip qtdoc -system-libpng -system-zlib
5955
make $MAKEOPTS install
6056
cd $INSTDIR
61-
find . -name *.prl | xargs -l sed 's|/$||' -i
6257
6358
# as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
6459
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
65-
zip -r $OUTDIR/qt-win32-4.8.3-gitian-r4.zip *
60+
zip -r $OUTDIR/qt-win32-5.2.0-gitian-r1.zip *

doc/release-process.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ Release Process
3939
Fetch and build inputs: (first time, or when dependency versions change)
4040

4141
mkdir -p inputs; cd inputs/
42-
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
43-
wget 'https://www.openssl.org/source/openssl-1.0.1c.tar.gz'
42+
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz
43+
wget 'https://www.openssl.org/source/openssl-1.0.1e.tar.gz'
4444
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
45-
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/zlib/zlib-1.2.6.tar.gz'
46-
wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng15/libpng-1.5.9.tar.gz'
47-
wget 'https://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
48-
wget 'https://downloads.sourceforge.net/project/boost/boost/1.54.0/boost_1_54_0.tar.bz2'
45+
wget 'http://zlib.net/zlib-1.2.8.tar.gz'
46+
wget 'ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-1.6.8.tar.gz'
47+
wget 'https://fukuchi.org/works/qrencode/qrencode-3.4.3.tar.bz2'
48+
wget 'https://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2'
4949
wget 'https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch' -O \
5050
boost-mingw-gas-cross-compile-2013-03-03.patch
51-
wget 'https://download.qt-project.org/archive/qt/4.8/4.8.3/qt-everywhere-opensource-src-4.8.3.tar.gz'
51+
wget 'https://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/qt-everywhere-opensource-src-5.2.0.tar.gz'
5252
wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
5353
cd ..
5454
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml

src/m4/bitcoin_qt.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
317317
])
318318
319319
BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,BITCOIN_QT_FAIL(zlib not found)))
320+
BITCOIN_QT_CHECK(AC_CHECK_LIB([png] ,[main],,BITCOIN_QT_FAIL(png not found)))
320321
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXCore not found)))
321322
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXGui not found)))
322323
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXNetwork not found)))

0 commit comments

Comments
 (0)