diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | archlinux.patch | 7 |
4 files changed, 19 insertions, 13 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Jul 26 22:01:50 UTC 2018 +# Tue Oct 23 08:59:46 UTC 2018 pkgbase = vstax pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland - pkgver = 2017.1.0.12 + pkgver = 2017.1.0.17 pkgrel = 1 url = http://www.vs.ch/vstax install = vstax.install @@ -10,13 +10,13 @@ pkgbase = vstax arch = i686 arch = x86_64 license = unknown - depends = java-runtime + depends = jdk8-openjdk depends = shared-mime-info depends = desktop-file-utils source = https://sftp.vs.ch/vstax/2017/vstax2017_.deb source = archlinux.patch - sha256sums = 5a1f4c3586d77d15d57dd22fba6e112ff51a58d7598df3930139ec2877c6b8a4 - sha256sums = d1b516f4d0ea1d2a7893b9fd39f574257840f9eddc3e9dbeddc4ba5a542f5d0d + sha256sums = cb5e0dbda0aa167e4d9a93819914a65581632557ebadb531e327db9aba7c6675 + sha256sums = 1b11130669a9be63c68067b356b979ed57f9ee04fd523aa6c411d9333c90a7ee pkgname = vstax diff --git a/ChangeLog b/ChangeLog index 7e611ecfcb1d..a4b08e280f26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-10-23 Fabien Dubosson <fabien.dubosson@gmail.com>: + + * 2017.1.0.17-1: + New upstream release + 2018-07-27 Fabien Dubosson <fabien.dubosson@gmail.com>: * 2017.1.0.12-1: @@ -2,22 +2,22 @@ pkgname="vstax" _year="2017" -pkgver="${_year}.1.0.12" +pkgver="${_year}.1.0.17" pkgrel="1" 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' 'shared-mime-info' 'desktop-file-utils') +depends=('jdk8-openjdk' '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}${_year}_${_CARCH}.deb" 'archlinux.patch') -sha256sums=('5a1f4c3586d77d15d57dd22fba6e112ff51a58d7598df3930139ec2877c6b8a4' - 'd1b516f4d0ea1d2a7893b9fd39f574257840f9eddc3e9dbeddc4ba5a542f5d0d') -[ "${CARCH}" = "x86_64" ] && sha256sums[0]='ee9e620e71df8dba19ae1f1e627bdf8aa6171fdcea87fad46675bab45f6a60f0' +sha256sums=('cb5e0dbda0aa167e4d9a93819914a65581632557ebadb531e327db9aba7c6675' + '1b11130669a9be63c68067b356b979ed57f9ee04fd523aa6c411d9333c90a7ee') +[ "${CARCH}" = "x86_64" ] && sha256sums[0]='4c2276e2a0aef5c184f6804c15d3d1336b429b115ab29888769908e75af41baf' prepare() { cd "${srcdir}/" diff --git a/archlinux.patch b/archlinux.patch index dbd2f43f7d0b..3b209de56b1f 100644 --- a/archlinux.patch +++ b/archlinux.patch @@ -2,12 +2,13 @@ Index: vstax/src/usr/share/vstax2017/vstax2017.sh =================================================================== --- vstax.orig/src/usr/share/vstax2017/vstax2017.sh +++ vstax/src/usr/share/vstax2017/vstax2017.sh -@@ -1,3 +1,3 @@ +@@ -1,3 +1,4 @@ #!/bin/sh -cd /usr/share/vstax2017 --./jre/bin/java -Xmx400m -Xms400m -jar jfw-launcher-5.0.29-obf.jar "$1" +-./jre/bin/java -Xmx400m -Xms400m -jar jfw-launcher-5.0.31-obf.jar "$1" +cd /usr/share/java/vstax2017 -+"${JAVA_HOME}/bin/java" -Xmx400m -Xms400m -jar jfw-launcher-5.0.29-obf.jar "$1" ++export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH ++java -Xmx400m -Xms400m -jar jfw-launcher-5.0.31-obf.jar "$1" Index: vstax/src/usr/share/applications/vstax2017.desktop =================================================================== --- vstax.orig/src/usr/share/applications/vstax2017.desktop |