Since bundled javafx is used remove broken dependency to java-openjfx and bump version

3 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91b31d68f01b..f958b41d8738 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bluej
 	pkgdesc = A free Java Development Environment designed for beginners, used by millions worlwide.
-	pkgver = 5.2.0
-	pkgrel = 2
+	pkgver = 5.2.1
+	pkgrel = 1
 	url = https://www.bluej.org
 	arch = any
 	license = GPL2
@@ -13,15 +13,14 @@ pkgbase = bluej
 	makedepends = zstd
 	depends = gtk2
 	depends = archlinux-java-run
-	depends = java-runtime=20
-	depends = java-environment=20
-	depends = java-openjfx=20
-	source = https://www.bluej.org/download/files/BlueJ-linux-520.deb
+	depends = java-runtime=21
+	depends = java-environment=21
+	source = https://www.bluej.org/download/files/BlueJ-linux-521.deb
 	source = bluej
 	source = bluej.desktop
 	source = bluej.xml
-	sha256sums = b0e4fcea8a4c6bdcadc4995f51122c0f4e8788ffa3fa8cf7950d03aa62d5d701
-	sha256sums = 6154ee3e8a270fc7831ffef58cce202ed435f56b0e16636fdbeee891fb1e079d
+	sha256sums = a462a2bfda0f86dff6e14ad77bfc0896ea36762bc9caf26acf3163b402b7b584
+	sha256sums = 58c01940c502cc72b72dc8d7257cb70f9855f65753e7156b9711ef1b67693d6e
 	sha256sums = a845f3997ce91cfb1eeb882f4a6e1e4408b7a7d7c2e164495b5a077bdf353e7f
 	sha256sums = e05453bd791b34ab6cfd6b67250dd18210f47505344b7980ad28bf922c014772
 
diff --git a/PKGBUILD b/PKGBUILD
index ca32e299aacd..bf7290529c92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,21 +8,23 @@
 # Contributor: zerathidune <zerathidune @ gmail . com>
 
 pkgname=bluej
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.2.1
+pkgrel=1
 pkgdesc="A free Java Development Environment designed for beginners, used by millions worlwide."
 arch=('any')
 url="https://www.${pkgname}.org"
 license=('GPL2' 'Apache' 'BSD' 'CDDL' 'CPL' 'custom')
-depends=('gtk2' 'archlinux-java-run' 'java-runtime=20' 'java-environment=20' 'java-openjfx=20')
+depends=('gtk2' 'archlinux-java-run' 'java-runtime=21' 'java-environment=21' 
+#'java-openjfx=21'
+)
 makedepends=('zstd')
 source=("https://www.${pkgname}.org/download/files/BlueJ-linux-${pkgver//.}.deb"
         "${pkgname}"
         "${pkgname}.desktop"
         "${pkgname}.xml")
 #noextract=("BlueJ-linux-${pkgver//.}.deb")
-sha256sums=('b0e4fcea8a4c6bdcadc4995f51122c0f4e8788ffa3fa8cf7950d03aa62d5d701'
-            '6154ee3e8a270fc7831ffef58cce202ed435f56b0e16636fdbeee891fb1e079d'
+sha256sums=('a462a2bfda0f86dff6e14ad77bfc0896ea36762bc9caf26acf3163b402b7b584'
+            '58c01940c502cc72b72dc8d7257cb70f9855f65753e7156b9711ef1b67693d6e'
             'a845f3997ce91cfb1eeb882f4a6e1e4408b7a7d7c2e164495b5a077bdf353e7f'
             'e05453bd791b34ab6cfd6b67250dd18210f47505344b7980ad28bf922c014772')
 
diff --git a/bluej b/bluej
index 4d87fe9100a0..4cb0b9b9c492 100644
--- a/bluej
+++ b/bluej
@@ -1,8 +1,8 @@
 #!/bin/sh
-if [ -e /usr/lib/jvm/java-20-openjfx/lib ]; then
-        JAVAFXPATH=/usr/lib/jvm/java-20-openjfx/lib
+if [ -e /usr/lib/jvm/java-21-openjfx/lib ]; then
+        JAVAFXPATH=/usr/lib/jvm/java-21-openjfx/lib
 else
-        JAVAFXPATH=/usr/lib/jvm/java-20-openjdk/lib
+        JAVAFXPATH=/usr/lib/jvm/java-21-openjdk/lib
 fi
 
 CP="/opt/bluej/boot.jar"
@@ -16,7 +16,7 @@ CP="/opt/bluej/boot.jar"
 JAVAFXJARS=`ls -1 /opt/bluej/javafx* | paste -sd ":" -`
 CP="$CP:$JAVAFXJARS"
 
-archlinux-java-run -a 20 -b 20 -- \
+archlinux-java-run -a 21 -b 21 -- \
         -Djdk.gtk.version=2 \
         -Dawt.useSystemAAFontSettings=on -Xmx512M \
         -cp "$CP" bluej.Boot \