Skip to content

Commit

Permalink
locale cleanup and Linux Docker .deb Qt build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
VanOrton committed Dec 19, 2022
1 parent 2e8c139 commit 61e0240
Show file tree
Hide file tree
Showing 31 changed files with 36 additions and 43,932 deletions.
20 changes: 11 additions & 9 deletions debian.qt/build-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@ finish() {
docker container rm $container >/dev/null
}

docker pull ubuntu:18.04
container=`docker run -dit ubuntu:18.04`
docker pull ubuntu:20.04
container=`docker run -dit ubuntu:20.04`
trap finish EXIT

docker exec $container apt-get -y update
docker exec $container apt-get -y install apt-utils devscripts sudo #dpkg-dev
docker exec $container apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools
docker cp ./debian/updateunattended.sh $container:/root/
docker exec $container /root/updateunattended.sh
#docker exec $container apt-get -y update
#docker exec $container apt-get -y install apt-utils devscripts sudo #dpkg-dev
#docker exec $container apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools
docker exec $container mkdir -p /root/repo
docker exec $container useradd user
docker exec $container mkdir /home/user
docker exec $container chown user.user /home/user
docker exec $container sudo -u user mkdir /home/user/build
docker cp ../bitgesell-qt_0.1.7.dsc $container:/root/repo/
docker cp ../bitgesell-qt_0.1.7.tar.xz $container:/root/repo/
docker cp ../bitgesell-qt_0.1.9.dsc $container:/root/repo/
docker cp ../bitgesell-qt_0.1.9.tar.xz $container:/root/repo/
# docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"

docker exec -w /root/repo $container sh -c "apt-ftparchive sources . > Sources"
Expand All @@ -32,5 +34,5 @@ docker exec $container apt-get -y build-dep bitgesell-qt
docker exec $container chmod a+rX /root
docker exec $container chmod -R a+rX /root/repo
docker exec -w /home/user/build $container sudo -u user apt-get -y source bitgesell-qt
docker exec -w /home/user/build/bitgesell-qt-0.1.7 $container sudo -u user debuild -b
docker cp $container:/home/user/build/bitgesell-qt_0.1.7_amd64.deb bitgesell-qt_0.1.7_amd64.deb
docker exec -w /home/user/build/bitgesell-qt-0.1.9 $container sudo -u user debuild -b
docker cp $container:/home/user/build/bitgesell-qt_0.1.9_amd64.deb bitgesell-qt_0.1.9_amd64.deb
12 changes: 12 additions & 0 deletions debian.qt/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
bitgesell-qt (0.1.9) UNRELEASED; urgency=low

* Bitcoin code synced

-- Mathias van Orton <[email protected]> Tue, 8 Nov 2022 10:00:00 +0000

bitgesell-qt (0.1.8) UNRELEASED; urgency=low

* Bitcoin code synced

-- Mathias van Orton <[email protected]> Wed, 20 Apr 2022 10:20:00 +0000

bitgesell-qt (0.1.7) UNRELEASED; urgency=low

* Taproot activation rescheduled with relaxed conditions
Expand Down
2 changes: 1 addition & 1 deletion debian.qt/files
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bitgesell-qt_0.1.7_source.buildinfo misc optional
bitgesell-qt_0.1.9_source.buildinfo misc optional
3 changes: 3 additions & 0 deletions debian.qt/rules
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ override_dh_auto_configure:
--with-gui=yes \
--with-boost="$(builddir)/distrib/tmp/libboost"

override_dh_auto_test:
DEB_BUILD_OPTIONS=nocheck dh_auto_test

override_dh_install:
dh_install
mkdir -p $(destdir)/usr/lib/bitgesell-qt
Expand Down
9 changes: 9 additions & 0 deletions debian.qt/updateunattended.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export DEBIAN_FRONTEND=noninteractive
export TZ=Etc/UTC
apt-get update && apt-get install -y tzdata
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
dpkg-reconfigure --frontend noninteractive tzdata
apt-get -y update
apt-get -y install apt-utils devscripts sudo #dpkg-dev
apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools
1 change: 0 additions & 1 deletion src/qt/BGL_locale.qrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/translations">
<file alias="af">locale/BGL_af.qm</file>
<file alias="am">locale/BGL_am.qm</file>
<file alias="ar">locale/BGL_ar.qm</file>
<file alias="be">locale/BGL_be.qm</file>
Expand Down
Loading

0 comments on commit 61e0240

Please sign in to comment.