Allow javafx to be used in projects

3 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 190658be6538..3ba1099a3a61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bluej
 	pkgdesc = An integrated Java environment specifically designed for introductory teaching
 	pkgver = 4.2.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.bluej.org
 	arch = any
 	license = GPL2
@@ -20,7 +20,7 @@ pkgbase = bluej
 	source = bluej
 	source = bluej.desktop
 	sha256sums = 66ae3834680a8b32f874c26d8ac74d468c416e6fa8180f6dd06d65a624267bb5
-	sha256sums = 96504c8908422f77e7fcecdbc0e66723483d5c57231b3dd35d83092c906295ec
+	sha256sums = dacf8c2c28f13197cc0c3a6f9023f5728051aedc5bfb174d1569ed428205a344
 	sha256sums = d48f47e2a16cef483ded299e37016a5172829303fc6ac43cab486049e9f61711
 
 pkgname = bluej
diff --git a/PKGBUILD b/PKGBUILD
index 7f251cfd55f5..dcb712a7aa3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=bluej
 pkgver=4.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An integrated Java environment specifically designed for introductory teaching"
 arch=('any')
 url="https://www.${pkgname}.org"
@@ -19,7 +19,7 @@ source=("https://www.${pkgname}.org/download/files/BlueJ-linux-${pkgver//.}.deb"
         "${pkgname}.desktop")
 noextract=("BlueJ-linux-${pkgver//.}.deb")
 sha256sums=('66ae3834680a8b32f874c26d8ac74d468c416e6fa8180f6dd06d65a624267bb5'
-            '96504c8908422f77e7fcecdbc0e66723483d5c57231b3dd35d83092c906295ec'
+            'dacf8c2c28f13197cc0c3a6f9023f5728051aedc5bfb174d1569ed428205a344'
             'd48f47e2a16cef483ded299e37016a5172829303fc6ac43cab486049e9f61711')
 
 package() {
diff --git a/bluej b/bluej
index 730bd1a6acb3..6c97a6f0c4d4 100644
--- a/bluej
+++ b/bluej
@@ -4,5 +4,6 @@ JAVAFX_CP="$JAVAFX_HOME/javafx.base.jar:$JAVAFX_HOME/javafx.controls.jar:$JAVAFX
 
 archlinux-java-run -a 11 -b 11 -- -Djavafx.embed.singleThread=true \
         -Dawt.useSystemAAFontSettings=on \
-        -cp /opt/bluej/bluej.jar:/usr/lib/jvm/default/lib/tools.jar:$JAVAFX_CP bluej.Boot \
+        -cp /opt/bluej/bluej.jar:$JAVAFX_CP bluej.Boot \
+        -javafxpath=$JAVAFX_CP \
         "$@"