Update to upstream 20.0.20083.454 which is a pile of utter garbage

2 files changed, 18 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76703929bd75..e1cb6d71a244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = payetools-rti
 	pkgdesc = UK HMRC Basic PAYE Tools for Linux
-	pkgver = 19.2.19220.1423
+	pkgver = 20.0.20083.454
 	pkgrel = 1
 	url = https://www.gov.uk/basic-paye-tools
 	install = payetools-rti.install
@@ -16,10 +16,12 @@ pkgbase = payetools-rti
 	depends = lib32-libpng12
 	depends = lib32-sqlite
 	depends = lib32-libxml2
-	noextract = payetools-rti-19.2.19220.1423-linux.zip
+	noextract = payetools-rti-20.0.20083.454-linux.zip
 	options = !strip
-	source = https://www.gov.uk/government/uploads/uploaded/hmrc/payetools-rti-19.2.19220.1423-linux.zip
-	sha256sums = 3baee4c9f2cc715f85bdfdca7826609d0acf7e8fafa2fc7d006c910e7d0bea81
+	source = https://www.gov.uk/government/uploads/uploaded/hmrc/payetools-rti-20.0.20083.454-linux.zip
+	source = https://archive.org/download/archlinux_pkg_lib32-krb5/lib32-krb5-1.17.1-1-x86_64.pkg.tar.zst
+	sha256sums = 4d1058f939c152946f6beae5e83bec4a8085a569ac9281b731e403203bd788ca
+	sha256sums = a40bc137d02a17d759eacb7576bcf720202c9178318aae363a4814ba16eb739b
 
 pkgname = payetools-rti
 
diff --git a/PKGBUILD b/PKGBUILD
index 3d9e38d36225..e992dfb3b150 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: François Guerraz <kubrick@fgv6.net>
 pkgname=payetools-rti
-pkgver=19.2.19220.1423
+pkgver=20.0.20083.454
 pkgrel=1
 pkgdesc="UK HMRC Basic PAYE Tools for Linux"
 arch=('x86_64')
@@ -17,12 +17,20 @@ backup=()
 options=(!strip)
 install=payetools-rti.install
 changelog=
-source=( "https://www.gov.uk/government/uploads/uploaded/hmrc/$pkgname-$pkgver-linux.zip" )
+source=(
+	"https://www.gov.uk/government/uploads/uploaded/hmrc/$pkgname-$pkgver-linux.zip" 
+	"https://archive.org/download/archlinux_pkg_lib32-krb5/lib32-krb5-1.17.1-1-x86_64.pkg.tar.zst"
+	)
 noextract=( "$pkgname-$pkgver-linux.zip" )
-sha256sums=('3baee4c9f2cc715f85bdfdca7826609d0acf7e8fafa2fc7d006c910e7d0bea81')
+sha256sums=(
+	"4d1058f939c152946f6beae5e83bec4a8085a569ac9281b731e403203bd788ca"
+	"a40bc137d02a17d759eacb7576bcf720202c9178318aae363a4814ba16eb739b"
+	)
 
 prepare() {
   unzip "$pkgname-$pkgver-linux.zip"
+  mkdir lib32-krb5 || true
+  tar --zstd -xvf lib32-krb5-1.17.1-1-x86_64.pkg.tar.zst -C lib32-krb5 usr/lib32
 }
 
 build() {
@@ -38,12 +46,10 @@ package() {
   chrpath -d opt/HMRC/basic-paye-tools/libQt* 
   chrpath -d opt/HMRC/basic-paye-tools/PyQt4.Qt* 
   chrpath -d opt/HMRC/basic-paye-tools/imageformats/* 
+  cp -v ${srcdir}/lib32-krb5/usr/lib32/lib* opt/HMRC/basic-paye-tools/
   install -D -t ${pkgdir}/usr/share/licenses/payetools-rti/ ${pkgdir}/opt/HMRC/basic-paye-tools/license.txt
   sed -i "s#${pkgdir}##g" ${pkgdir}/tmp/.local/share/applications/*.desktop
   install -D -t ${pkgdir}/usr/share/applications/ ${pkgdir}/tmp/.local/share/applications/*.desktop
   rm -fr ${pkgdir}/tmp
   mv opt/HMRC/basic-paye-tools/rti.cfg opt/HMRC/basic-paye-tools/rti.cfg.template
-# Remove shipped glibc libraries
-  rm opt/HMRC/basic-paye-tools/libm.so.6
-  rm opt/HMRC/basic-paye-tools/libutil.so.1
 }