New upstream release 2020_1.0.6

4 files changed, 49 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d89581e1fb4..128709e3e0ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2019_1.0.10
-	pkgrel = 277
+	pkgver = 2020_1.0.6
+	pkgrel = 300
 	url = http://www.vs.ch/vstax
 	install = vstax.install
 	changelog = ChangeLog
-	arch = i686
 	arch = x86_64
 	license = unknown
-	depends = java-runtime=8
+	depends = java-runtime
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = https://sftp.vs.ch/vstax/2019/vstax2019_1.0.10-277_amd64.deb
+	source = https://sftp.vs.ch/vstax/2020/vstax2020_1.0.6-300_amd64.deb
 	source = archlinux.patch
-	sha256sums = b721c74a21552ef348e586be12bcd6b29ae295f26a592363bbcf6f0da1d30447
-	sha256sums = c6109f2b3768a0f6920f98fd6ccf0b3c7b9ffe701c404ca24536b3344cc900f9
+	sha256sums = 199f33cadaae8055057a3173eab23d9e080f3d4c54644543729f62b5e54fe9b6
+	sha256sums = 5fa3c2e9e62b8b13fc511543b5895da9568983bcae9a48b25036360ea3742029
 
 pkgname = vstax
 
diff --git a/ChangeLog b/ChangeLog
index 5834febb6491..11144b4c6866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+2021-03-05 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+	* 2020_1.0.6-300:
+	New upstream release
+	The version 2020 seems to work at least from Java 8 up to Java 15, so
+	removing the code to deal with java versions.
+
 2020-06-07 Glassey Nicolas <nicolas@glassey.dev>:
 
 	* 2019_1.0.10-277:
-	Java 8 is necessary as Java <7 doesn't have all the features needed, and 	java >9 has incompatible classloaders.
-	It should work on JDK and JRE alike.
+	Java 8 is necessary as Java <7 doesn't have all the features needed, and
+	java >9 has incompatible classloaders. It should work on JDK and JRE alike.
 	This means that jre-8 or jdk-8 are now a dependency.
 
 2020-03-15 Glassey Nicolas <nicolas@glassey.dev>:
diff --git a/PKGBUILD b/PKGBUILD
index ae1a1a803c09..34b6c931f3fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,25 @@
-# Maintainer Fabien Dubosson <fabien.dubosson@gmail.com>
+# Maintainer: Fabien Dubosson <fabien.dubosson@gmail.com>
+
+# Contributors:
+# Pierre-Yves Savioz <savioz.py@net-c.com>
+# Stéphane Donnet <donnet.stephane@gmail.com>
 
 pkgname="vstax"
-_year="2019"
-pkgver="${_year}_1.0.10"
-pkgrel="277"
+_year="2020"
+pkgver="${_year}_1.0.6"
+pkgrel="300"
 pkgdesc="Software to fill the tax forms of the canton of Valais, Switzerland"
 url="http://www.vs.ch/vstax"
 license=('unknown')
-arch=('i686' 'x86_64')
-depends=('java-runtime=8' 'shared-mime-info' 'desktop-file-utils')
+arch=('x86_64')
+depends=('java-runtime' 'shared-mime-info' 'desktop-file-utils')
 install="vstax.install"
 changelog="ChangeLog"
-[ "${CARCH}" = "i686" ] && _CARCH='i386'
-[ "${CARCH}" = "x86_64" ] && _CARCH='amd64'
-source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${pkgver}-${pkgrel}_${_CARCH}.deb"
-        'archlinux.patch')
-sha256sums=('c1430720b16220b6035ee0505e728b9e84ff3a637fac8b74b318a19fb4126c12'
-            'c6109f2b3768a0f6920f98fd6ccf0b3c7b9ffe701c404ca24536b3344cc900f9')
+source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${pkgver}-${pkgrel}_amd64.deb"
+        "archlinux.patch")
+sha256sums=('199f33cadaae8055057a3173eab23d9e080f3d4c54644543729f62b5e54fe9b6'
+            '5fa3c2e9e62b8b13fc511543b5895da9568983bcae9a48b25036360ea3742029')
 
-[ "${CARCH}" = "x86_64" ] && sha256sums[0]='b721c74a21552ef348e586be12bcd6b29ae295f26a592363bbcf6f0da1d30447'
 
 prepare() {
     cd "${srcdir}/"
@@ -56,6 +57,3 @@ package() {
     # Remove the included java environment
     rm -Rf "${pkgdir}/usr/share/java/${_appname}/jre"
 }
-
-# vim:set ts=4 sw=4 et:
-
diff --git a/archlinux.patch b/archlinux.patch
index a0553a756f1c..e84993b0b1d2 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,46 +1,29 @@
-Index: vstax/src/usr/share/vstax2019/vstax2019.sh
+Index: vstax/src/usr/share/vstax2020/vstax2020.sh
 ===================================================================
---- vstax.orig/src/usr/share/vstax2019/vstax2019.sh	2020-05-20 17:14:29.000000000 +0200
-+++ vstax/src/usr/share/vstax2019/vstax2019.sh	2020-06-07 12:10:00.448320299 +0200
-@@ -1,3 +1,17 @@
+--- vstax.orig/src/usr/share/vstax2020/vstax2020.sh
++++ vstax/src/usr/share/vstax2020/vstax2020.sh
+@@ -1,3 +1,3 @@
  #!/bin/sh
--cd /usr/share/vstax2019
--./jre/bin/java -Xmx400m -Xms400m  -jar jfw-launcher-6.1.16-obf.jar "$1"
-+default_jvm=`archlinux-java get | sed 's/[^0-9]//g'`
-+if [ "$default_jvm" -eq 8 ]
-+then
-+  JDK_PATH="/usr/lib/jvm/default"
-+else
-+  java_versions=`archlinux-java status | grep -oe java-[8]-[a-z]*`
-+  JDK_PATH="/usr/lib/jvm/"`echo $java_versions | cut -f 1 -d " "`
-+fi
-+
-+if [ -d $JDK_PATH/jre ]
-+then
-+  JDK_PATH=$JDK_PATH/jre
-+fi
-+
-+cd /usr/share/java/vstax2019
-+$JDK_PATH/bin/java -Xmx400m -Xms400m -jar jfw-launcher-6.1.16-obf.jar "$1"
-Index: vstax/src/usr/share/applications/vstax2019.desktop
+-cd /usr/share/vstax2020
+-./jre/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR -jar jfw-launcher-7.2.7-obf.jar "$1"
++cd /usr/share/java/vstax2020
++/usr/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR -jar jfw-launcher-7.2.7-obf.jar "$1"
+Index: vstax/src/usr/share/applications/vstax2020.desktop
 ===================================================================
---- vstax.orig/src/usr/share/applications/vstax2019.desktop
-+++ vstax/src/usr/share/applications/vstax2019.desktop
-@@ -1,15 +1,15 @@
+--- vstax.orig/src/usr/share/applications/vstax2020.desktop
++++ vstax/src/usr/share/applications/vstax2020.desktop
+@@ -1,12 +1,12 @@
  [Desktop Entry]
  Version=1.0
  Terminal=false
--Icon=/usr/share/vstax2019/vstax2019.png
-+Icon=/usr/share/java/vstax2019/vstax2019.png
+-Icon=/usr/share/vstax2020/vstax2020.png
++Icon=/usr/share/java/vstax2020/vstax2020.png
  Type=Application
  StartupNotify=false
+ StartupWMClass=vstax2020
  Categories=Office;
--Exec=/usr/share/vstax2019/vstax2019.sh %U
-+Exec=/usr/bin/vstax2019 %U
- MimeType=application/vstax2019;
- Name=VSTax 2019
- GenericName=VSTax 2019
- GenericName[en]=VSTax 2019
- GenericName[de]=VSTax 2019
- GenericName[fr]=VSTax 2019
- GenericName[it]=VSTax 2019
+-Exec=/usr/share/vstax2020/vstax2020.sh %U
++Exec=/usr/bin/vstax2020 %U
+ MimeType=application/vstax2020;
+ Name=VSTax 2020
+ GenericName=VSTax 2020