summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Dubosson2019-03-16 21:37:23 +0100
committerFabien Dubosson2019-03-16 21:37:23 +0100
commitd806c694e98d3687a65f03bd33f12d4420694f34 (patch)
tree890077e91537f52320d8f2c5b9649bec5e534ded
parentceb7146b13bd4de1e8f0fec5cccf1b1f9e707e61 (diff)
downloadaur-d806c694e98d3687a65f03bd33f12d4420694f34.tar.gz
New upstream release 2018.1.0.5
-rw-r--r--.SRCINFO8
-rw-r--r--ChangeLog5
-rw-r--r--PKGBUILD8
-rw-r--r--archlinux.patch4
4 files changed, 15 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c0b3b54ed5e..18351a4a9d35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Feb 16 16:38:38 UTC 2019
+# Sat Mar 16 20:37:07 UTC 2019
pkgbase = vstax
pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
- pkgver = 2018.1.0.2
+ pkgver = 2018.1.0.5
pkgrel = 1
url = http://www.vs.ch/vstax
install = vstax.install
@@ -15,8 +15,8 @@ pkgbase = vstax
depends = desktop-file-utils
source = https://sftp.vs.ch/vstax/2018/vstax2018_.deb
source = archlinux.patch
- sha256sums = aa43c003f758f932b15ef1c4ae657cffc8d73c3280126d0edb48ff7f48a12f31
- sha256sums = fbbc58a513cf9ddb2bdb83c60ab4614fb143cd4ba0cabfe41066b3350766d76e
+ sha256sums = b6411618d9e0cecfac4f3c0404a191bb699c36f227de4816f7b1d9dd8444945f
+ sha256sums = 3fc8a626be7f60e43729f07a40373f427cdffd3cf59ca88eb5c642e06cfc770d
pkgname = vstax
diff --git a/ChangeLog b/ChangeLog
index 4276d1f00184..00d911b57470 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-03-16 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+ * 2018.1.0.5-1:
+ New upstream release
+
2019-02-16 Fabien Dubosson <fabien.dubosson@gmail.com>:
* 2018.1.0.2-1:
diff --git a/PKGBUILD b/PKGBUILD
index 127339e07745..d0b5657a43c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname="vstax"
_year="2018"
-pkgver="${_year}.1.0.2"
+pkgver="${_year}.1.0.5"
pkgrel="1"
pkgdesc="Software to fill the tax forms of the canton of Valais, Switzerland"
url="http://www.vs.ch/vstax"
@@ -15,9 +15,9 @@ changelog="ChangeLog"
[ "${CARCH}" = "x86_64" ] && _CARCH='amd64'
source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${_year}_${_CARCH}.deb"
'archlinux.patch')
-sha256sums=('aa43c003f758f932b15ef1c4ae657cffc8d73c3280126d0edb48ff7f48a12f31'
- 'fbbc58a513cf9ddb2bdb83c60ab4614fb143cd4ba0cabfe41066b3350766d76e')
-[ "${CARCH}" = "x86_64" ] && sha256sums[0]='b239f2b8936e57fe18fa6ca251b00ff201a29323847c86aee17d7bd327d2de21'
+sha256sums=('b6411618d9e0cecfac4f3c0404a191bb699c36f227de4816f7b1d9dd8444945f'
+ '3fc8a626be7f60e43729f07a40373f427cdffd3cf59ca88eb5c642e06cfc770d')
+[ "${CARCH}" = "x86_64" ] && sha256sums[0]='a72701dfabfec3484ddb13d12962233526a8849ec42fe9f5f381c671f727a9a2'
prepare() {
cd "${srcdir}/"
diff --git a/archlinux.patch b/archlinux.patch
index a5d4aefbdd6a..bb1751318410 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -5,10 +5,10 @@ Index: vstax/src/usr/share/vstax2018/vstax2018.sh
@@ -1,3 +1,4 @@
#!/bin/sh
-cd /usr/share/vstax2018
--./jre/bin/java -Xmx400m -Xms400m -jar jfw-launcher-6.0.1-obf.jar "$1"
+-./jre/bin/java -Xmx400m -Xms400m -jar jfw-launcher-6.0.2-obf.jar "$1"
+cd /usr/share/java/vstax2018
+export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
-+java -Xmx400m -Xms400m -jar jfw-launcher-6.0.1-obf.jar "$1"
++java -Xmx400m -Xms400m -jar jfw-launcher-6.0.2-obf.jar "$1"
Index: vstax/src/usr/share/applications/vstax2018.desktop
===================================================================
--- vstax.orig/src/usr/share/applications/vstax2018.desktop