Skip to content

Commit 1e3abb4

Browse files
laanwjlaanwj
committed
build: upgrade Qt used by windows build to 5.2.0
1 parent 2f158df commit 1e3abb4

File tree

4 files changed

+17
-21
lines changed

4 files changed

+17
-21
lines changed

‎contrib/gitian-descriptors/gitian-win32.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ 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"
2727
- "bitcoin-deps-win32-gitian-r10.zip"
2828
- "protobuf-win32-2.5.0-gitian-r3.zip"
@@ -34,7 +34,7 @@ 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
3939
unzip ../build/bitcoin-deps-win32-gitian-r10.zip
4040
unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip

‎contrib/gitian-descriptors/qt-win32.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ 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"
17+
- "qt-everywhere-opensource-src-5.2.0.tar.gz"
1818
- "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
@@ -30,36 +30,31 @@ script: |
3030
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Release Process
4848
wget 'https://downloads.sourceforge.net/project/boost/boost/1.54.0/boost_1_54_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)