update to version 4.2.0

3 files changed, 16 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9e66378ff11..7c939aaff9cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bluej
 	pkgdesc = An integrated Java environment specifically designed for introductory teaching
-	pkgver = 4.1.4
+	pkgver = 4.2.0
 	pkgrel = 1
 	url = https://www.bluej.org
 	arch = any
@@ -12,14 +12,14 @@ pkgbase = bluej
 	license = MIT
 	license = custom
 	depends = java-runtime
-	depends = java-environment
-	depends = java-openjfx
-	noextract = BlueJ-linux-414.deb
-	source = https://www.bluej.org/download/files/BlueJ-linux-414.deb
+	depends = java-environment>=11
+	depends = java-openjfx>=11
+	noextract = BlueJ-linux-420.deb
+	source = https://www.bluej.org/download/files/BlueJ-linux-420.deb
 	source = bluej
 	source = bluej.desktop
-	sha256sums = d67bcda302accf8f96a2efd9cbeed9d982adfec55825d956562b2b7e25956f26
-	sha256sums = f67443827cd8cb90922e63c139154661cd8f390ef8886e143fd2359644e9bd63
+	sha256sums = efbaa3e95c2fd00cea16e6c7bc208fa543faaa72136b022796a136825b3cfcec
+	sha256sums = 39cd3ef6f7253ba162ab17ccddf50b58d95dc27016cb7185ed941f2b6308e968
 	sha256sums = d48f47e2a16cef483ded299e37016a5172829303fc6ac43cab486049e9f61711
 
 pkgname = bluej
diff --git a/PKGBUILD b/PKGBUILD
index fd97bcee16cc..3666b187d55a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,19 +7,19 @@
 # Contributor: zerathidune <zerathidune @ gmail . com>
 
 pkgname=bluej
-pkgver=4.1.4
+pkgver=4.2.0
 pkgrel=1
 pkgdesc="An integrated Java environment specifically designed for introductory teaching"
 arch=('any')
 url="https://www.${pkgname}.org"
 license=('GPL2' 'Apache' 'BSD' 'CPL' 'LGPL2.1' 'MIT' 'custom')
-depends=('java-runtime' 'java-environment' 'java-openjfx')
+depends=('java-runtime' "java-environment>=11" "java-openjfx>=11")
 source=("https://www.${pkgname}.org/download/files/BlueJ-linux-${pkgver//.}.deb"
         "${pkgname}"
         "${pkgname}.desktop")
 noextract=("BlueJ-linux-${pkgver//.}.deb")
-sha256sums=('d67bcda302accf8f96a2efd9cbeed9d982adfec55825d956562b2b7e25956f26'
-            'f67443827cd8cb90922e63c139154661cd8f390ef8886e143fd2359644e9bd63'
+sha256sums=('efbaa3e95c2fd00cea16e6c7bc208fa543faaa72136b022796a136825b3cfcec'
+            '39cd3ef6f7253ba162ab17ccddf50b58d95dc27016cb7185ed941f2b6308e968'
             'd48f47e2a16cef483ded299e37016a5172829303fc6ac43cab486049e9f61711')
 
 package() {
diff --git a/bluej b/bluej
index 8b36a5809c54..0cbb675968db 100644
--- a/bluej
+++ b/bluej
@@ -1,5 +1,9 @@
 #!/bin/sh
+JAVA_MAJORVERSION=$(archlinux-java get | cut -d'-' -f2)
+JAVAFX_HOME=/usr/lib/jvm/java-$JAVA_MAJORVERSION-openjdk/lib
+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"
+
 java -Djavafx.embed.singleThread=true \
         -Dawt.useSystemAAFontSettings=on \
-        -cp /opt/bluej/bluej.jar:/usr/lib/jvm/default/lib/tools.jar bluej.Boot \
+        -cp /opt/bluej/bluej.jar:/usr/lib/jvm/default/lib/tools.jar:$JAVAFX_CP bluej.Boot \
         "$@"