diff options
| author | Fabien Dubosson | 2019-03-29 15:01:13 +0100 |
|---|---|---|
| committer | Fabien Dubosson | 2019-03-29 15:01:13 +0100 |
| commit | a02d82b8049ad1c4d6cc550d027c2404c4457c2c (patch) | |
| tree | dce0570961849cef7e15b1940080c4c8edf0a0ac | |
| parent | d806c694e98d3687a65f03bd33f12d4420694f34 (diff) | |
| download | aur-a02d82b8049ad1c4d6cc550d027c2404c4457c2c.tar.gz | |
Fix issue with JDK version
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | archlinux.patch | 2 |
4 files changed, 13 insertions, 8 deletions
@@ -1,22 +1,22 @@ # Generated by mksrcinfo v8 -# Sat Mar 16 20:37:07 UTC 2019 +# Fri Mar 29 14:00:24 UTC 2019 pkgbase = vstax pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland pkgver = 2018.1.0.5 - pkgrel = 1 + pkgrel = 2 url = http://www.vs.ch/vstax install = vstax.install changelog = ChangeLog arch = i686 arch = x86_64 license = unknown - depends = jdk8-openjdk + depends = jdk8 depends = shared-mime-info depends = desktop-file-utils source = https://sftp.vs.ch/vstax/2018/vstax2018_.deb source = archlinux.patch sha256sums = b6411618d9e0cecfac4f3c0404a191bb699c36f227de4816f7b1d9dd8444945f - sha256sums = 3fc8a626be7f60e43729f07a40373f427cdffd3cf59ca88eb5c642e06cfc770d + sha256sums = b13950003ddcf046754b97377ff265797d9127b4afa36df1077669b4c2afc795 pkgname = vstax diff --git a/ChangeLog b/ChangeLog index 00d911b57470..4fc32056868e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-03-29 Fabien Dubosson <fabien.dubosson@gmail.com>: + + * 2018.1.0.5-2: + Fix issue with JDK version, replace OpenJDK by Oracle JDK + 2019-03-16 Fabien Dubosson <fabien.dubosson@gmail.com>: * 2018.1.0.5-1: @@ -3,12 +3,12 @@ pkgname="vstax" _year="2018" pkgver="${_year}.1.0.5" -pkgrel="1" +pkgrel="2" 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-openjdk' 'shared-mime-info' 'desktop-file-utils') +depends=('jdk8' 'shared-mime-info' 'desktop-file-utils') install="vstax.install" changelog="ChangeLog" [ "${CARCH}" = "i686" ] && _CARCH='i386' @@ -16,7 +16,7 @@ changelog="ChangeLog" source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${_year}_${_CARCH}.deb" 'archlinux.patch') sha256sums=('b6411618d9e0cecfac4f3c0404a191bb699c36f227de4816f7b1d9dd8444945f' - '3fc8a626be7f60e43729f07a40373f427cdffd3cf59ca88eb5c642e06cfc770d') + 'b13950003ddcf046754b97377ff265797d9127b4afa36df1077669b4c2afc795') [ "${CARCH}" = "x86_64" ] && sha256sums[0]='a72701dfabfec3484ddb13d12962233526a8849ec42fe9f5f381c671f727a9a2' prepare() { diff --git a/archlinux.patch b/archlinux.patch index bb1751318410..3ba382ff31a4 100644 --- a/archlinux.patch +++ b/archlinux.patch @@ -7,7 +7,7 @@ Index: vstax/src/usr/share/vstax2018/vstax2018.sh -cd /usr/share/vstax2018 -./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 ++export PATH=/usr/lib/jvm/java-8-jdk/jre/bin/:$PATH +java -Xmx400m -Xms400m -jar jfw-launcher-6.0.2-obf.jar "$1" Index: vstax/src/usr/share/applications/vstax2018.desktop =================================================================== |