Updated to 1.0.10-277

4 files changed, 40 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07d70ee4329e..4d89581e1fb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2019_1.0.7
-	pkgrel = 273
+	pkgver = 2019_1.0.10
+	pkgrel = 277
 	url = http://www.vs.ch/vstax
 	install = vstax.install
 	changelog = ChangeLog
 	arch = i686
 	arch = x86_64
 	license = unknown
-	depends = java-runtime>7
+	depends = java-runtime=8
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = https://sftp.vs.ch/vstax/2019/vstax2019_1.0.7-273_amd64.deb
+	source = https://sftp.vs.ch/vstax/2019/vstax2019_1.0.10-277_amd64.deb
 	source = archlinux.patch
-	sha256sums = e8dfc49c200426adea05b7b7ba3535142b22e47a37985513b417f82110180462
-	sha256sums = fa4ab300445466405dae0e3ac77869518594ee9e789ae19c208d916d1151b488
+	sha256sums = b721c74a21552ef348e586be12bcd6b29ae295f26a592363bbcf6f0da1d30447
+	sha256sums = c6109f2b3768a0f6920f98fd6ccf0b3c7b9ffe701c404ca24536b3344cc900f9
 
 pkgname = vstax
 
diff --git a/ChangeLog b/ChangeLog
index 2c4745b3f650..5834febb6491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+	This means that jre-8 or jdk-8 are now a dependency.
+
 2020-03-15 Glassey Nicolas <nicolas@glassey.dev>:
 
 	* 2019_1.0.7-273:
diff --git a/PKGBUILD b/PKGBUILD
index 0d4b2969168a..ae1a1a803c09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,23 @@
 
 pkgname="vstax"
 _year="2019"
-pkgver="${_year}_1.0.7"
-pkgrel="273"
+pkgver="${_year}_1.0.10"
+pkgrel="277"
 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>7' 'shared-mime-info' 'desktop-file-utils')
+depends=('java-runtime=8' '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=('f76d643af1bcd55e6eb0b1f22ae7fe6a94681ec2e1210c4445c0f1cbd70e6e92'
-            'fa4ab300445466405dae0e3ac77869518594ee9e789ae19c208d916d1151b488')
-[ "${CARCH}" = "x86_64" ] && sha256sums[0]='e8dfc49c200426adea05b7b7ba3535142b22e47a37985513b417f82110180462'
+sha256sums=('c1430720b16220b6035ee0505e728b9e84ff3a637fac8b74b318a19fb4126c12'
+            'c6109f2b3768a0f6920f98fd6ccf0b3c7b9ffe701c404ca24536b3344cc900f9')
+
+[ "${CARCH}" = "x86_64" ] && sha256sums[0]='b721c74a21552ef348e586be12bcd6b29ae295f26a592363bbcf6f0da1d30447'
 
 prepare() {
     cd "${srcdir}/"
@@ -57,3 +58,4 @@ package() {
 }
 
 # vim:set ts=4 sw=4 et:
+
diff --git a/archlinux.patch b/archlinux.patch
index 2332d8f1cca3..a0553a756f1c 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,13 +1,27 @@
 Index: vstax/src/usr/share/vstax2019/vstax2019.sh
 ===================================================================
---- vstax.orig/src/usr/share/vstax2019/vstax2019.sh
-+++ vstax/src/usr/share/vstax2019/vstax2019.sh
-@@ -1,3 +1,3 @@
+--- 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 @@
  #!/bin/sh
 -cd /usr/share/vstax2019
--./jre/bin/java -Xmx400m -Xms400m  -jar jfw-launcher-6.1.15-obf.jar "$1"
+-./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
-+java -Xmx400m -Xms400m  -jar jfw-launcher-6.1.15-obf.jar "$1"
++$JDK_PATH/bin/java -Xmx400m -Xms400m -jar jfw-launcher-6.1.16-obf.jar "$1"
 Index: vstax/src/usr/share/applications/vstax2019.desktop
 ===================================================================
 --- vstax.orig/src/usr/share/applications/vstax2019.desktop