summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Lipnitskiy2021-01-11 08:41:00 -0800
committerIlya Lipnitskiy2021-01-11 08:46:06 -0800
commit3c66efab80a3e650654c84b22bce44347af485cd (patch)
treef3b3d3c8e225d4784238fcb1ddaa4908f6bb73fe
parentd120a353faf91dc214093cea297c05133a6bcd59 (diff)
downloadaur-3c66efab80a3e650654c84b22bce44347af485cd.tar.gz
Update for Java 15 build
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rwxr-xr-xasciidocfx2
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6d6c15a73be7..3dd89674e840 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
pkgbase = asciidocfx
pkgdesc = Asciidoc Editor and Toolchain written with JavaFX
pkgver = 1.7.3
- pkgrel = 1
+ pkgrel = 2
url = http://asciidocfx.com/
arch = any
license = Apache
makedepends = maven>=3.3.9
makedepends = java-environment>=12
makedepends = gendesk
- depends = java-environment=14
+ depends = java-environment=15
depends = java-openjfx
source = https://github.com/asciidocfx/AsciidocFX/archive/v1.7.3.tar.gz
source = asciidocfx
sha512sums = 25d2739f83571523e5b67d52b83fb447723867c35ba93d38d0236425f1b305e3eac182f92772db059a2bd161b991617b06da7e5a3d3ffef6e0567653bd92437e
- sha512sums = 7f758a2536c627d854bab4d42f629163d68ff5681be108779670262e765311cad3c93d0c976d561438519ab92a4311d3b49d2f8352cf5ef17aab47eb2b77047d
+ sha512sums = 8b7c59a119b558bbf8380f18e6be71d543b9bbae1e433f63c970d4eb5c5b6687200fa14621c3b33475989d7c8ac9ce96c522e2d89832e454d4e360a2bc584c6b
pkgname = asciidocfx
diff --git a/PKGBUILD b/PKGBUILD
index aecb2170078f..134ed59358ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=asciidocfx
pkgver=1.7.3
-pkgrel=1
+pkgrel=2
pkgdesc="Asciidoc Editor and Toolchain written with JavaFX"
arch=('any')
@@ -11,7 +11,7 @@ url='http://asciidocfx.com/'
license=('Apache')
makedepends=('maven>=3.3.9' 'java-environment>=12' 'gendesk')
-depends=('java-environment=14' 'java-openjfx')
+depends=('java-environment=15' 'java-openjfx')
source=(
"https://github.com/asciidocfx/AsciidocFX/archive/v${pkgver}.tar.gz"
@@ -19,7 +19,7 @@ source=(
)
sha512sums=(
'25d2739f83571523e5b67d52b83fb447723867c35ba93d38d0236425f1b305e3eac182f92772db059a2bd161b991617b06da7e5a3d3ffef6e0567653bd92437e'
- '7f758a2536c627d854bab4d42f629163d68ff5681be108779670262e765311cad3c93d0c976d561438519ab92a4311d3b49d2f8352cf5ef17aab47eb2b77047d'
+ '8b7c59a119b558bbf8380f18e6be71d543b9bbae1e433f63c970d4eb5c5b6687200fa14621c3b33475989d7c8ac9ce96c522e2d89832e454d4e360a2bc584c6b'
)
prepare() {
@@ -56,5 +56,5 @@ package() {
# Workaround for FS#64121
install -dm755 "${pkgdir}/usr/share/java/asciidocfx/lib/java-openjfx"
- cp -t "${pkgdir}/usr/share/java/asciidocfx/lib/java-openjfx" /usr/lib/jvm/java-14-openjdk/lib/javafx*
+ cp -t "${pkgdir}/usr/share/java/asciidocfx/lib/java-openjfx" /usr/lib/jvm/java-15-openjdk/lib/javafx*
}
diff --git a/asciidocfx b/asciidocfx
index d7ca10a95bc8..2a8d74adf267 100755
--- a/asciidocfx
+++ b/asciidocfx
@@ -5,7 +5,7 @@ for name in $BASEDIR/lib/*.jar; do
done
PATH_TO_FX=$BASEDIR/lib/java-openjfx
-PATH_TO_JAVA=/usr/lib/jvm/java-14-openjdk/bin/java
+PATH_TO_JAVA=/usr/lib/jvm/java-15-openjdk/bin/java
exec $PATH_TO_JAVA \
-cp $CP \