Add compatibility with openjfx from extra

3 files changed, 10 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da0dfbdf3c61..2b10d5f73e50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = greenfoot
 	pkgdesc = Allows easy development of two-dimensional graphical applications, such as simulations and interactive games.
 	pkgver = 3.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.greenfoot.org
 	arch = any
 	license = GPL2
@@ -21,7 +21,7 @@ pkgbase = greenfoot
 	source = greenfoot
 	source = greenfoot.desktop
 	sha256sums = 398f20e46bb90dba554ebb243f1c3beda0c3a436cfcd08c9deee34db24702a2b
-	sha256sums = d643bbcca722f81e6479fa47b57dddfa64933c1b3b3731ac504b6192e0d81c41
+	sha256sums = 101089f5ec66d177621d3fd6511824b54d37facbf3a7b6941388af1bea34e270
 	sha256sums = 853d6f283623f1de1f1e353abaf90afb345580b0e67f57b6245ea2e2ad6850f3
 
 pkgname = greenfoot
diff --git a/PKGBUILD b/PKGBUILD
index 0ae67dc59aa4..46d5a1bbad11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=greenfoot
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows easy development of two-dimensional graphical applications, such as simulations and interactive games."
 arch=('any')
 url="https://www.${pkgname}.org"
@@ -17,7 +17,7 @@ source=("https://www.${pkgname}.org/download/files/Greenfoot-linux-${pkgver//.}.
         "${pkgname}.desktop")
 noextract=("Greenfoot-linux-${pkgver//.}.deb")
 sha256sums=('398f20e46bb90dba554ebb243f1c3beda0c3a436cfcd08c9deee34db24702a2b'
-            'd643bbcca722f81e6479fa47b57dddfa64933c1b3b3731ac504b6192e0d81c41'
+            '101089f5ec66d177621d3fd6511824b54d37facbf3a7b6941388af1bea34e270'
             '853d6f283623f1de1f1e353abaf90afb345580b0e67f57b6245ea2e2ad6850f3')
 
 package() {
diff --git a/greenfoot b/greenfoot
index b057b1a31c63..8f045d7c6b4c 100755
--- a/greenfoot
+++ b/greenfoot
@@ -1,5 +1,10 @@
 #!/bin/sh
-JAVAFX_HOME=/usr/lib/jvm/java-11-openjfx/lib
+if [ -e /usr/lib/jvm/java-11-openjfx/lib ]; then
+        JAVAFX_HOME=/usr/lib/jvm/java-11-openjfx/lib
+else
+        JAVAFX_HOME=/usr/lib/jvm/java-11-openjdk/lib
+fi
+
 JAVAFX_CP="$JAVAFX_HOME/javafx.base.jar:$JAVAFX_HOME/javafx.controls.jar:$JAVAFX_HOME/javafx.fxml.jar:$JAVAFX_HOME/javafx.graphics.jar:$JAVAFX_HOME/javafx.media.jar:$JAVAFX_HOME/javafx.swing.jar:$JAVAFX_HOME/javafx-swt.jar:$JAVAFX_HOME/javafx.web.jar"
 
 archlinux-java-run -a 11 -b 11 -- -Dawt.useSystemAAFontSettings=on \