summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeby2020-03-15 15:15:59 +0100
committerWeby2020-03-15 15:15:59 +0100
commitf13e56eb30d7744ea0a2f14aca73464b5dabbc8e (patch)
tree9f67c22d2b4b70ec56a4e0d13694bc782c888085
parent91ba1af61698615b5dfa545cd809d34c225aa0ca (diff)
downloadaur-f13e56eb30d7744ea0a2f14aca73464b5dabbc8e.tar.gz
Updated to latest version.
-rw-r--r--.SRCINFO12
-rw-r--r--ChangeLog6
-rw-r--r--PKGBUILD12
-rw-r--r--archlinux.patch3
4 files changed, 19 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1b9563969d6..07d70ee4329e 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.6
- pkgrel = 272
+ pkgver = 2019_1.0.7
+ pkgrel = 273
url = http://www.vs.ch/vstax
install = vstax.install
changelog = ChangeLog
arch = i686
arch = x86_64
license = unknown
- depends = jdk8
+ depends = java-runtime>7
depends = shared-mime-info
depends = desktop-file-utils
- source = https://sftp.vs.ch/vstax/2019/vstax2019_1.0.6-272_amd64.deb
+ source = https://sftp.vs.ch/vstax/2019/vstax2019_1.0.7-273_amd64.deb
source = archlinux.patch
- sha256sums = bcb48b551878d7b653fbe56cf78dc48683ad98d581a94b4f36611ab3877e215e
- sha256sums = d68eae6a3364e0215e76e04e100c05608c9a73f6e1668b0cc0403fd35fef05c1
+ sha256sums = e8dfc49c200426adea05b7b7ba3535142b22e47a37985513b417f82110180462
+ sha256sums = fa4ab300445466405dae0e3ac77869518594ee9e789ae19c208d916d1151b488
pkgname = vstax
diff --git a/ChangeLog b/ChangeLog
index 4fc32056868e..2c4745b3f650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-15 Glassey Nicolas <nicolas@glassey.dev>:
+
+ * 2019_1.0.7-273:
+ Removed JRE8 depencency.
+ New upstream release : Fixes lottery gains calculation.
+
2019-03-29 Fabien Dubosson <fabien.dubosson@gmail.com>:
* 2018.1.0.5-2:
diff --git a/PKGBUILD b/PKGBUILD
index 663a06fcd4cc..0d4b2969168a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,22 @@
pkgname="vstax"
_year="2019"
-pkgver="${_year}_1.0.6"
-pkgrel="272"
+pkgver="${_year}_1.0.7"
+pkgrel="273"
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=('jdk8' 'shared-mime-info' 'desktop-file-utils')
+depends=('java-runtime>7' '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=('514d534984bac4fdc209056030e11f69130e498167197380ca3859b1d8f8b0c1'
- 'd68eae6a3364e0215e76e04e100c05608c9a73f6e1668b0cc0403fd35fef05c1')
-[ "${CARCH}" = "x86_64" ] && sha256sums[0]='bcb48b551878d7b653fbe56cf78dc48683ad98d581a94b4f36611ab3877e215e'
+sha256sums=('f76d643af1bcd55e6eb0b1f22ae7fe6a94681ec2e1210c4445c0f1cbd70e6e92'
+ 'fa4ab300445466405dae0e3ac77869518594ee9e789ae19c208d916d1151b488')
+[ "${CARCH}" = "x86_64" ] && sha256sums[0]='e8dfc49c200426adea05b7b7ba3535142b22e47a37985513b417f82110180462'
prepare() {
cd "${srcdir}/"
diff --git a/archlinux.patch b/archlinux.patch
index 4f012962fa4e..2332d8f1cca3 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -2,12 +2,11 @@ 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,4 @@
+@@ -1,3 +1,3 @@
#!/bin/sh
-cd /usr/share/vstax2019
-./jre/bin/java -Xmx400m -Xms400m -jar jfw-launcher-6.1.15-obf.jar "$1"
+cd /usr/share/java/vstax2019
-+export PATH=/usr/lib/jvm/java-8-jdk/jre/bin/:$PATH
+java -Xmx400m -Xms400m -jar jfw-launcher-6.1.15-obf.jar "$1"
Index: vstax/src/usr/share/applications/vstax2019.desktop
===================================================================