summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLingMan2024-01-29 23:44:28 +0100
committerLingMan2024-01-29 23:44:28 +0100
commitfc1b2041db680a1e33c1030ce89bd56979568774 (patch)
tree3e58ef68407e9c217044a0d6dd555be9fb4e1bdc
parent8b962abdd6429694168883dff63f66a6e989b8c8 (diff)
downloadaur-armory.tar.gz
Use lrelease-qt4
`lrelease` is provided by `qt5-tools` nowadays. We already depend on `qt4` - which provides `lrelease-qt4` - though. No need to pull in `qt5-tools` too. Not to mention that `lrelease` might soon be provided by `qt6-tools` instead and who knows if that will still happen to work.
-rw-r--r--.SRCINFO4
-rw-r--r--0003-Use-lrelease-qt4.patch92
-rw-r--r--PKGBUILD5
3 files changed, 99 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 74a340f0cec8..1f0af00e97d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = armory
pkgdesc = Full-featured Bitcoin wallet management application
pkgver = 0.96.5
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/goatpig/BitcoinArmory
install = armory.install
arch = i686
@@ -27,10 +27,12 @@ pkgbase = armory
source = https://github.com/goatpig/BitcoinArmory/releases/download/v0.96.5/armory_0.96.5_source.tar.xz
source = 0001-Fix-compilation.patch
source = 0002-Use-swig3.0.patch
+ source = 0003-Use-lrelease-qt4.patch
source = run-armory.sh
sha512sums = aba9627a58414d9a5b9781753d6c09b3970f2728f317419b3dc8547a8ad2b9e7f9615a650a56441122647406ea846c64383677f220f26ef395029cdb8d25812c
sha512sums = 10d10d449652de81d2bdeff5cd2bc72015071354720b80650a243f51a16e2b6da8f0600134ab03364819d0e916ae368a1ef81a5df71cddbf48fe9c1980e99dff
sha512sums = eb8f4d55495642747dd4777ebeed309b8b9dbc2a07294748ea2f2c7e97d35111dc4156eeda4c668a624bd05d5ea44957dfbc930484fc1fa0b487661cee7fac18
+ sha512sums = d727cb2cbb7e68bbf769c31e44f53eef3d51553b63e9a4045bcc30bc1ab10cd0c3ad258bdfc62ccc27277029715cc0993713e4bcec7c565184aca1263130c99e
sha512sums = af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715
pkgname = armory
diff --git a/0003-Use-lrelease-qt4.patch b/0003-Use-lrelease-qt4.patch
new file mode 100644
index 000000000000..ec0f6a202f42
--- /dev/null
+++ b/0003-Use-lrelease-qt4.patch
@@ -0,0 +1,92 @@
+From c0001caf56a321589827914ec1e34323536a5ffe Mon Sep 17 00:00:00 2001
+From: LingMan <LingMan@users.noreply.github.com>
+Date: Mon, 29 Jan 2024 22:59:36 +0100
+Subject: [PATCH] Use lrelease-qt4
+
+`lrelease` is provided by `qt5-tools` nowadays. We already depend on `qt4` - which provides
+`lrelease-qt4` - though.
+No need to pull in `qt5-tools` too. Not to mention that `lrelease` might soon be provided by
+`qt6-tools` instead and who knows if that will still happen to work.
+---
+ Makefile.am | 8 +++----
+ configure.ac | 2 +-
+ cppForSwig/BDM_Client/build_installer_64.bat | 22 ++++++++++----------
+ 3 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b677b74..9a35539 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,9 +9,9 @@ EXTRA_DIST = *.py *.md LICENSE LICENSE-ATI LICENSE-MIT \
+
+ ACLOCAL_AMFLAGS = -I m4
+
+-lrelease:
++lrelease-qt4:
+ if HAVE_GUI
+- lrelease lang/*.ts
++ lrelease-qt4 lang/*.ts
+ endif
+
+ qrc_img_resources.py: imgList.xml
+@@ -32,9 +32,9 @@ else
+ endif
+ endif
+
+-.PHONY: copy-script lrelease qrc_img_resources.py
++.PHONY: copy-script lrelease-qt4 qrc_img_resources.py
+
+-all-local: copy-script lrelease qrc_img_resources.py
++all-local: copy-script lrelease-qt4 qrc_img_resources.py
+
+
+ #target to clean up pre autotools installation left overs
+diff --git a/configure.ac b/configure.ac
+index eb0d1c5..de13625 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,7 +83,7 @@ AC_CHECK_PROG([HAVE_PYRCC4], [pyrcc4], [yes], [no])
+ AS_IF([test $HAVE_PYRCC4 == yes], [],
+ [AC_MSG_ERROR([missing pyrcc4 in path, make sure pyqt4-dev-tools is installed])])
+
+-AC_CHECK_PROG([HAVE_LRELEASE], [lrelease], [yes], [no])
++AC_CHECK_PROG([HAVE_LRELEASE], [lrelease-qt4], [yes], [no])
+ AS_IF([test $HAVE_LRELEASE == yes], [],
+ [AC_MSG_ERROR([missing lrelease in path, make sure qt4-linguist-tools is installed])])
+
+diff --git a/cppForSwig/BDM_Client/build_installer_64.bat b/cppForSwig/BDM_Client/build_installer_64.bat
+index 3e76f02..9e4138f 100644
+--- a/cppForSwig/BDM_Client/build_installer_64.bat
++++ b/cppForSwig/BDM_Client/build_installer_64.bat
+@@ -10,17 +10,17 @@ python ..\..\setup.py py2exe --includes sip,hashlib -d ..\..\ArmoryStandalone
+ copy ..\x64\Release\BlockDataManager.exe ..\..\ArmoryStandalone\ArmoryDB.exe
+
+ mkdir ..\..\ArmoryStandalone\lang
+-lrelease ..\..\lang\armory_da.ts -qm ..\..\ArmoryStandalone\lang\armory_da.qm
+-lrelease ..\..\lang\armory_de.ts -qm ..\..\ArmoryStandalone\lang\armory_de.qm
+-lrelease ..\..\lang\armory_el.ts -qm ..\..\ArmoryStandalone\lang\armory_el.qm
+-lrelease ..\..\lang\armory_en.ts -qm ..\..\ArmoryStandalone\lang\armory_en.qm
+-lrelease ..\..\lang\armory_es.ts -qm ..\..\ArmoryStandalone\lang\armory_es.qm
+-lrelease ..\..\lang\armory_fr.ts -qm ..\..\ArmoryStandalone\lang\armory_fr.qm
+-lrelease ..\..\lang\armory_he.ts -qm ..\..\ArmoryStandalone\lang\armory_he.qm
+-lrelease ..\..\lang\armory_hr.ts -qm ..\..\ArmoryStandalone\lang\armory_hr.qm
+-lrelease ..\..\lang\armory_id.ts -qm ..\..\ArmoryStandalone\lang\armory_id.qm
+-lrelease ..\..\lang\armory_ru.ts -qm ..\..\ArmoryStandalone\lang\armory_ru.qm
+-lrelease ..\..\lang\armory_sv.ts -qm ..\..\ArmoryStandalone\lang\armory_sv.qm
++lrelease-qt4 ..\..\lang\armory_da.ts -qm ..\..\ArmoryStandalone\lang\armory_da.qm
++lrelease-qt4 ..\..\lang\armory_de.ts -qm ..\..\ArmoryStandalone\lang\armory_de.qm
++lrelease-qt4 ..\..\lang\armory_el.ts -qm ..\..\ArmoryStandalone\lang\armory_el.qm
++lrelease-qt4 ..\..\lang\armory_en.ts -qm ..\..\ArmoryStandalone\lang\armory_en.qm
++lrelease-qt4 ..\..\lang\armory_es.ts -qm ..\..\ArmoryStandalone\lang\armory_es.qm
++lrelease-qt4 ..\..\lang\armory_fr.ts -qm ..\..\ArmoryStandalone\lang\armory_fr.qm
++lrelease-qt4 ..\..\lang\armory_he.ts -qm ..\..\ArmoryStandalone\lang\armory_he.qm
++lrelease-qt4 ..\..\lang\armory_hr.ts -qm ..\..\ArmoryStandalone\lang\armory_hr.qm
++lrelease-qt4 ..\..\lang\armory_id.ts -qm ..\..\ArmoryStandalone\lang\armory_id.qm
++lrelease-qt4 ..\..\lang\armory_ru.ts -qm ..\..\ArmoryStandalone\lang\armory_ru.qm
++lrelease-qt4 ..\..\lang\armory_sv.ts -qm ..\..\ArmoryStandalone\lang\armory_sv.qm
+
+ python ..\..\writeNSISCompilerArgs.py
+ makensis.exe ..\..\ArmorySetup.nsi
+--
+2.43.0
+
diff --git a/PKGBUILD b/PKGBUILD
index e1869167746f..9989744ef322 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=armory
pkgver=0.96.5
-pkgrel=2
+pkgrel=3
pkgdesc="Full-featured Bitcoin wallet management application"
arch=('i686' 'x86_64')
url="https://github.com/goatpig/BitcoinArmory"
@@ -24,10 +24,12 @@ _signatures="https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgve
source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_source.tar.xz"
'0001-Fix-compilation.patch'
'0002-Use-swig3.0.patch'
+ '0003-Use-lrelease-qt4.patch'
'run-armory.sh')
sha512sums=('aba9627a58414d9a5b9781753d6c09b3970f2728f317419b3dc8547a8ad2b9e7f9615a650a56441122647406ea846c64383677f220f26ef395029cdb8d25812c'
'10d10d449652de81d2bdeff5cd2bc72015071354720b80650a243f51a16e2b6da8f0600134ab03364819d0e916ae368a1ef81a5df71cddbf48fe9c1980e99dff'
'eb8f4d55495642747dd4777ebeed309b8b9dbc2a07294748ea2f2c7e97d35111dc4156eeda4c668a624bd05d5ea44957dfbc930484fc1fa0b487661cee7fac18'
+ 'd727cb2cbb7e68bbf769c31e44f53eef3d51553b63e9a4045bcc30bc1ab10cd0c3ad258bdfc62ccc27277029715cc0993713e4bcec7c565184aca1263130c99e'
'af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715')
_parentdir=Armory3
@@ -50,6 +52,7 @@ prepare() {
cd "$srcdir/$_parentdir"
patch --strip=1 --input=../0001-Fix-compilation.patch
patch --strip=1 --input=../0002-Use-swig3.0.patch
+ patch --strip=1 --input=../0003-Use-lrelease-qt4.patch
## Get Python2 Version
_py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')