summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorben2020-06-10 16:33:02 +0200
committerTorben2020-06-10 23:35:16 +0200
commitaa0929132030c3d7bf4c6bc07ce5f44944ab36bd (patch)
tree4f76830a5144b9d0b508e63694059058145a2caa
parent18f193bab97a990c33b2d8b5695f22ce0fc04ccd (diff)
downloadaur-aa0929132030c3d7bf4c6bc07ce5f44944ab36bd.tar.gz
Use Oracle JDK 8 as Java environment
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2e917353612..d537b6ff64bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,9 +9,8 @@ pkgbase = processing-jdk8
license = LGPL
makedepends = apache-ant
makedepends = gendesk
- makedepends = java8-openjfx
makedepends = unzip
- depends = java-runtime=8
+ depends = jdk8
depends = libgl
provides = processing
conflicts = processing
diff --git a/PKGBUILD b/PKGBUILD
index 1f649b8f5b3d..ab6d722289b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ license=(GPL LGPL)
provides=(processing)
conflicts=(processing processing-bin)
# Can upgrade to OpenJDK 10 once java-openjfx has been upgraded to support it
-depends=(java-runtime=8 libgl)
-makedepends=(apache-ant gendesk java8-openjfx unzip)
+depends=('jdk8' 'libgl')
+makedepends=('apache-ant' 'gendesk' 'unzip')
options=(!strip)
install=openjdkmsg.install
# The Processing version scheme for the 3.5.x series uses a special magical
@@ -85,7 +85,7 @@ package() {
# Processing does not work with OpenJDK 10 or 11, use OpenJDK 8
#ln -s /usr/lib/jvm/default-runtime/ "$pkgdir/usr/share/processing/java"
- ln -s /usr/lib/jvm/java-8-openjdk/ "$pkgdir/usr/share/processing/java"
+ ln -s /usr/lib/jvm/java-8-jdk/ "$pkgdir/usr/share/processing/java"
}
# vim: ts=2 sw=2 et