New upstream release 2023_1.0.2-85

4 files changed, 39 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94b9187dfea3..2afaf2132e6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2022_1.0.4
-	pkgrel = 65
+	pkgver = 2023_1.0.2
+	pkgrel = 85
 	url = http://www.vs.ch/vstax
 	install = vstax.install
 	changelog = ChangeLog
@@ -10,9 +10,12 @@ pkgbase = vstax
 	depends = java-runtime
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = https://sftp.vs.ch/vstax/2022/vstax2022_1.0.4-65_amd64.deb
+	depends = libxrender
+	depends = libxtst
+	depends = fontconfig
+	source = https://sftp.vs.ch/vstax/2023/vstax2023_1.0.2-85_amd64.deb
 	source = archlinux.patch
-	sha256sums = c4eb50859d91ea134e26358716d1ce9e740821cf44a480ead602d8b35295a39f
-	sha256sums = 65d318828d2a993056c0b405452f7d5fd0c9e9bd1b608b562cc59c297caef9d9
+	sha256sums = 468d5df3b46978e91c12dd82776deecc53870ff5a567ca3ad260c7f0c9c06314
+	sha256sums = ce74850e16d0031b743f7cd5dec7d7fcedd6a7bae5bb092cc253a47c8385b180
 
 pkgname = vstax
diff --git a/ChangeLog b/ChangeLog
index 29ee75f71479..42c027c5f557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-17 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+	* 2023_1.0.2-85:
+	New upstream release
+	Add missing dependencies: libxrender, libxtst and fontconfig
+
 2023-03-19 Fabien Dubosson <fabien.dubosson@gmail.com>:
 
 	* 2022_1.0.4-65:
diff --git a/PKGBUILD b/PKGBUILD
index 636c9ce929bd..e8b6341f4b4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,27 +5,27 @@
 # Stéphane Donnet <donnet.stephane@gmail.com>
 
 pkgname="vstax"
-_year="2022"
-pkgver="${_year}_1.0.4"
-pkgrel="65"
+_year="2023"
+pkgver="${_year}_1.0.2"
+pkgrel="85"
 pkgdesc="Software to fill the tax forms of the canton of Valais, Switzerland"
 url="http://www.vs.ch/vstax"
 license=('unknown')
 arch=('x86_64')
-depends=('java-runtime' 'shared-mime-info' 'desktop-file-utils')
+depends=('java-runtime' 'shared-mime-info' 'desktop-file-utils' 'libxrender' 'libxtst' 'fontconfig')
 install="vstax.install"
 changelog="ChangeLog"
 source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${pkgver}-${pkgrel}_amd64.deb"
         "archlinux.patch")
-sha256sums=('c4eb50859d91ea134e26358716d1ce9e740821cf44a480ead602d8b35295a39f'
-            '65d318828d2a993056c0b405452f7d5fd0c9e9bd1b608b562cc59c297caef9d9')
+sha256sums=('468d5df3b46978e91c12dd82776deecc53870ff5a567ca3ad260c7f0c9c06314'
+            'ce74850e16d0031b743f7cd5dec7d7fcedd6a7bae5bb092cc253a47c8385b180')
 
 
 prepare() {
     cd "${srcdir}/"
 
     # Extract the data contained in the `deb` file
-    tar -xf data.tar.xz
+    tar -xf data.tar.zst
 
     # Patch for archlinux
     patch -p2 < archlinux.patch
diff --git a/archlinux.patch b/archlinux.patch
index 616012fe160b..9650905c8717 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,29 +1,29 @@
-Index: vstax/src/usr/share/applications/vstax2022.desktop
+Index: vstax/src/usr/share/applications/vstax2023.desktop
 ===================================================================
---- vstax.orig/src/usr/share/applications/vstax2022.desktop
-+++ vstax/src/usr/share/applications/vstax2022.desktop
+--- vstax.orig/src/usr/share/applications/vstax2023.desktop
++++ vstax/src/usr/share/applications/vstax2023.desktop
 @@ -1,12 +1,12 @@
  [Desktop Entry]
  Version=1.0
  Terminal=false
--Icon=/usr/share/vstax2022/vstax2022.png
-+Icon=/usr/share/java/vstax2022/vstax2022.png
+-Icon=/usr/share/vstax2023/vstax2023.png
++Icon=/usr/share/java/vstax2023/vstax2023.png
  Type=Application
  StartupNotify=false
- StartupWMClass=vstax2022
+ StartupWMClass=vstax2023
  Categories=Office;
--Exec=/usr/share/vstax2022/vstax2022.sh %U
-+Exec=/usr/bin/vstax2022 %U
- MimeType=application/vstax2022;
- Name=VSTax 2022
- GenericName=VSTax 2022
-Index: vstax/src/usr/share/vstax2022/vstax2022.sh
+-Exec=/usr/share/vstax2023/vstax2023.sh %U
++Exec=/usr/bin/vstax2023 %U
+ MimeType=application/vstax2023;
+ Name=VSTax 2023
+ GenericName=VSTax 2023
+Index: vstax/src/usr/share/vstax2023/vstax2023.sh
 ===================================================================
---- vstax.orig/src/usr/share/vstax2022/vstax2022.sh
-+++ vstax/src/usr/share/vstax2022/vstax2022.sh
+--- vstax.orig/src/usr/share/vstax2023/vstax2023.sh
++++ vstax/src/usr/share/vstax2023/vstax2023.sh
 @@ -1,3 +1,3 @@
  #!/bin/sh
--cd /usr/share/vstax2022
--./jre/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR --add-exports=java.base/sun.net.www.protocol.file=ALL-UNNAMED --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED --add-exports=java.desktop/sun.awt.shell=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp.datatype=ALL-UNNAMED  -jar jfw-launcher-7.2.19-obf.jar "$1"
-+cd /usr/share/java/vstax2022
-+/usr/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR --add-exports=java.base/sun.net.www.protocol.file=ALL-UNNAMED --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED --add-exports=java.desktop/sun.awt.shell=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp.datatype=ALL-UNNAMED  -jar jfw-launcher-7.2.19-obf.jar "$1"
+-cd /usr/share/vstax2023
+-./jre/bin/java -Xmx800m -Xms800m -Djava.locale.providers=COMPAT,CLDR --add-exports=java.base/sun.net.www.protocol.file=ALL-UNNAMED --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED --add-exports=java.desktop/sun.awt.shell=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp.datatype=ALL-UNNAMED  -jar jfw-launcher-7.2.20-obf.jar "$1"
++cd /usr/share/java/vstax2023
++/usr/bin/java -Xmx800m -Xms800m -Djava.locale.providers=COMPAT,CLDR --add-exports=java.base/sun.net.www.protocol.file=ALL-UNNAMED --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED --add-exports=java.desktop/sun.awt.shell=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp.datatype=ALL-UNNAMED  -jar jfw-launcher-7.2.20-obf.jar "$1"