Skip to content

Commit f9901cb

Browse files
author
VanOrton
committed
fix Debian Qt build (now requiring Ubuntu 20 for Qt > 5.11)
1 parent 61e0240 commit f9901cb

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

debian.qt/build-in-docker.sh

+6-8
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@ set -e
44

55
debuild -S
66

7-
finish() {
8-
docker stop $container >/dev/null
9-
docker container rm $container >/dev/null
10-
}
7+
#finish() {
8+
# docker stop $container >/dev/null
9+
# docker container rm $container >/dev/null
10+
#}
1111

1212
docker pull ubuntu:20.04
1313
container=`docker run -dit ubuntu:20.04`
14-
trap finish EXIT
14+
#trap finish EXIT
1515

1616
docker cp ./debian/updateunattended.sh $container:/root/
1717
docker exec $container /root/updateunattended.sh
18-
#docker exec $container apt-get -y update
19-
#docker exec $container apt-get -y install apt-utils devscripts sudo #dpkg-dev
20-
#docker exec $container apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools
2118
docker exec $container mkdir -p /root/repo
2219
docker exec $container useradd user
2320
docker exec $container mkdir /home/user
@@ -36,3 +33,4 @@ docker exec $container chmod -R a+rX /root/repo
3633
docker exec -w /home/user/build $container sudo -u user apt-get -y source bitgesell-qt
3734
docker exec -w /home/user/build/bitgesell-qt-0.1.9 $container sudo -u user debuild -b
3835
docker cp $container:/home/user/build/bitgesell-qt_0.1.9_amd64.deb bitgesell-qt_0.1.9_amd64.deb
36+
docker cp $container:/home/user/build/bitgesell-qt-dbg_0.1.9_amd64.deb bitgesell-qt-dbg_0.1.9_amd64.deb

debian.qt/control

+13-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,19 @@ Homepage: https://github.com/wu-emma/bitgesell
99
Package: bitgesell-qt
1010
Architecture: any
1111
Depends: libc6 (>= 2.27), libstdc++6 (>= 8.4.0), libbz2-1.0 (>= 1.0.6), liblzma5 (>= 5.2.2), zlib1g (>= 1:1.1.4),
12-
libqt5core5a (>= 5.1.1), libqt5dbus5 (>= 5.1.1), libqt5network5 (>= 5.1.1), libqt5gui5 (>= 5.1.1),
13-
openssl, perl-modules-5.26 | perl-modules-5.28 | perl-modules-5.30, ${misc:Depends}
12+
libqt5core5a (>= 5.11.0), libqt5dbus5 (>= 5.11.0), libqt5network5 (>= 5.11.0), libqt5gui5 (>= 5.11.0),
13+
openssl, ${misc:Depends}
14+
Description: BGL is an experimental digital currency that enables instant payments to anyone, anywhere in the world
15+
BGL is an experimental digital currency that enables instant payments to anyone,
16+
anywhere in the world. BGL uses peer-to-peer technology to operate with no central authority:
17+
managing transactions and issuing money are carried out collectively by the network.
18+
BGL Core is the name of open source software which enables the use of this currency.
19+
20+
Package: bitgesell-qt-dbg
21+
Architecture: any
22+
Depends: libc6 (>= 2.27), libstdc++6 (>= 8.4.0), libbz2-1.0 (>= 1.0.6), liblzma5 (>= 5.2.2), zlib1g (>= 1:1.1.4),
23+
libqt5core5a (>= 5.11.0), libqt5dbus5 (>= 5.11.0), libqt5network5 (>= 5.11.0), libqt5gui5 (>= 5.11.0),
24+
openssl, ${misc:Depends}
1425
Description: BGL is an experimental digital currency that enables instant payments to anyone, anywhere in the world
1526
BGL is an experimental digital currency that enables instant payments to anyone,
1627
anywhere in the world. BGL uses peer-to-peer technology to operate with no central authority:

debian.qt/rules

+13-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
builddir = $(shell pwd)
44
destdir = $(builddir)/debian/bitgesell-qt
55

6-
CC = gcc-8
7-
CXX = g++-8
6+
CC = gcc-9
7+
CXX = g++-9
88

99
.PHONY: distrib download-distrib unpack-distrib berkeleydb libevent miniupnpc
1010

@@ -80,16 +80,27 @@ override_dh_auto_configure:
8080
--with-gui=yes \
8181
--with-boost="$(builddir)/distrib/tmp/libboost"
8282

83+
#override dh_auto_install:
84+
# make -j1 install DESTDIR=$(destdir) AM_UPDATE_INFO_DIR=no
85+
8386
override_dh_auto_test:
8487
DEB_BUILD_OPTIONS=nocheck dh_auto_test
8588

8689
override_dh_install:
8790
dh_install
91+
# In compat 15 or later, dh_auto_install will use debian/tmp as the
92+
# default --destdir and should be moved from there to the
93+
# appropriate package build directory using dh_install(1) or
94+
# similar tools/
8895
mkdir -p $(destdir)/usr/lib/bitgesell-qt
96+
cp -r $(builddir)/debian/tmp/usr $(destdir)
8997
cp -a distrib/tmp/libboost/lib/* $(destdir)/usr/lib/bitgesell-qt/
9098
cp -a distrib/tmp/libdb/lib/* $(destdir)/usr/lib/bitgesell-qt/
9199
cp -a distrib/tmp/libevent/lib/* $(destdir)/usr/lib/bitgesell-qt/
92100
cp -a distrib/tmp/miniupnpc/usr/lib/* $(destdir)/usr/lib/bitgesell-qt/
93101

94102
override_dh_shlibdeps:
95103
dh_shlibdeps -l/usr/lib/bitgesell-qt
104+
105+
override_dh_strip:
106+
dh_strip --dbg-package=bitgesell-qt-dbg

debian.qt/updateunattended.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ export TZ=Etc/UTC
44
apt-get update && apt-get install -y tzdata
55
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
66
dpkg-reconfigure --frontend noninteractive tzdata
7-
apt-get -y update
7+
#apt-get -y update
88
apt-get -y install apt-utils devscripts sudo #dpkg-dev
99
apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools

0 commit comments

Comments
 (0)