Skip to content

Commit c5071e1

Browse files
committed
Build with QT5 on Debian-based systems using contrib/debian
1 parent a8e9286 commit c5071e1

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

contrib/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
bitcoin (0.14.1-trusty3) trusty; urgency=medium
2+
3+
* Build with qt5 if we are on a non-Ubuntu (ie non-Unity) distro.
4+
5+
-- Matt Corallo (BlueMatt) <[email protected]> Thu, 04 May 2017 17:13:00 -0400
6+
17
bitcoin (0.14.1-trusty2) trusty; urgency=medium
28

39
* Bump minimum boost version in deps.

contrib/debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Build-Depends: debhelper,
1818
libboost-thread1.48-dev | libboost-thread-dev (>> 1.47),
1919
libboost-test1.48-dev | libboost-test-dev (>> 1.47),
2020
libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.47),
21-
qt4-qmake,
22-
libqt4-dev,
21+
qt4-qmake, libqt4-dev,
22+
qttools5-dev-tools, qttools5-dev,
2323
libqrencode-dev,
2424
libprotobuf-dev, protobuf-compiler,
2525
python,

contrib/debian/rules

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ override_dh_auto_clean:
1212
if [ -f Makefile ]; then $(MAKE) distclean; fi
1313
rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
1414

15+
QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5)
16+
1517
# Yea, autogen should be run on the source archive, but I like doing git archive
1618
override_dh_auto_configure:
1719
./autogen.sh
18-
./configure --without-miniupnpc --with-gui=qt4
20+
./configure --without-miniupnpc --with-gui=$(QT)
1921

2022
override_dh_auto_test:
2123
make check

0 commit comments

Comments
 (0)