bumped version to 3.8, improved PKGBUILD

3 files changed, 37 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8c082dfbe9d..68a1eb224d24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = greenfoot
 	pkgdesc = Educational software designed to make learning programming easy and fun.
-	pkgver = 3.7.1
+	pkgver = 3.8.0
 	pkgrel = 1
 	url = https://www.greenfoot.org
 	arch = any
@@ -15,14 +15,14 @@ pkgbase = greenfoot
 	depends = archlinux-java-run
 	depends = java-runtime=17
 	depends = java-environment=17
-	depends = java17-openjfx
-	noextract = Greenfoot-linux-371.deb
-	source = https://www.greenfoot.org/download/files/Greenfoot-linux-371.deb
+	depends = java-openjfx=17
+	noextract = Greenfoot-linux-380.deb
+	source = https://www.greenfoot.org/download/files/Greenfoot-linux-380.deb
 	source = greenfoot
 	source = greenfoot.desktop
 	source = greenfoot.xml
-	sha256sums = c0680a0ec03fda5bb0f8dcecf5d59bfc7447331ff44b40857e8239dce0b3c6e8
-	sha256sums = b7a5ce55ea1e186760b27360f87b3b9071477ded205d8fe917dabf35d4bbf7de
+	sha256sums = 1c35e680b1d2d7c559555fa1080d11808aca45fb4e955eedf9fbc4d290071a39
+	sha256sums = d6cb8d1cae6320ab939ec534560a890b83ade393353a2fcd31299803724ba07c
 	sha256sums = b980d0084fbafbb3ea335bb3840d858898c692822f1c671969a91982e86c1b4f
 	sha256sums = f1ea33e8289dfe31b9a0c4d88482a5ca5f75d663ba82ca986519f290e44789e4
 
diff --git a/PKGBUILD b/PKGBUILD
index a1de035a63ac..c1acf7b5ba6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,40 +6,44 @@
 # Contributor: even <kessiapinheiro @ gmail . com>
 
 pkgname=greenfoot
-pkgver=3.7.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Educational software designed to make learning programming easy and fun."
 arch=('any')
 url="https://www.${pkgname}.org"
 license=('GPL2' 'Apache' 'BSD' 'CPL' 'LGPL2' 'LGPL2.1' 'MIT' 'custom')
-depends=('archlinux-java-run' 'java-runtime=17' 'java-environment=17' 'java17-openjfx')
+depends=('archlinux-java-run' 'java-runtime=17' 'java-environment=17' 'java-openjfx=17')
 source=("https://www.${pkgname}.org/download/files/Greenfoot-linux-${pkgver//.}.deb"
         "${pkgname}"
         "${pkgname}.desktop"
         "${pkgname}.xml")
 noextract=("Greenfoot-linux-${pkgver//.}.deb")
-sha256sums=('c0680a0ec03fda5bb0f8dcecf5d59bfc7447331ff44b40857e8239dce0b3c6e8'
-            'b7a5ce55ea1e186760b27360f87b3b9071477ded205d8fe917dabf35d4bbf7de'
+
+sha256sums=('1c35e680b1d2d7c559555fa1080d11808aca45fb4e955eedf9fbc4d290071a39'
+            'd6cb8d1cae6320ab939ec534560a890b83ade393353a2fcd31299803724ba07c'
             'b980d0084fbafbb3ea335bb3840d858898c692822f1c671969a91982e86c1b4f'
             'f1ea33e8289dfe31b9a0c4d88482a5ca5f75d663ba82ca986519f290e44789e4')
 
+prepare(){
+  cd "${srcdir}"
+  echo "Extracting archive ..."
+  ar p "Greenfoot-linux-${pkgver//.}.deb" data.tar.xz | tar xJ --exclude=usr/share/${pkgname}/{javafx,jdk}
+}
+
 package() {
-cd "${srcdir}"
-ar p "Greenfoot-linux-${pkgver//.}.deb" data.tar.xz | tar xJ --exclude=usr/share/${pkgname}/{javafx,jdk}
+  cd "${srcdir}"
 
-mkdir -p "${pkgdir}/opt/${pkgname}"
-mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
+  mkdir -p "${pkgdir}/opt/${pkgname}"
+  mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
 
-cp -r "usr/share/${pkgname}" "${pkgdir}/opt"
-cp -r usr/share/doc/Greenfoot/API "${pkgdir}/usr/share/doc/${pkgname}"
-cp -r usr/share/doc/Greenfoot/scenarios "${pkgdir}/usr/share/doc/${pkgname}"
+  cp -r "usr/share/${pkgname}" "${pkgdir}/opt"
+  cp -r usr/share/doc/Greenfoot/API "${pkgdir}/usr/share/doc/${pkgname}"
 
-install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-install -Dm644 "${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
-install -Dm644 "usr/share/icons/hicolor/256x256/apps/${pkgname}.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname}.png"
-install -Dm644 usr/share/doc/Greenfoot/README.txt "${pkgdir}/usr/share/doc/${pkgname}/README"
-install -Dm644 usr/share/doc/Greenfoot/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-install -Dm644 usr/share/doc/Greenfoot/THIRDPARTYLICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/THIRDPARTYLICENSE"
-install -Dm644 usr/share/doc/Greenfoot/GREENFOOT_LICENSES.txt "${pkgdir}/usr/share/licenses/${pkgname}/GREENFOOT_LICENSES"
+  install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
+  install -Dm644 "usr/share/icons/hicolor/256x256/apps/${pkgname}.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname}.png"
+  install -Dm644 usr/share/doc/Greenfoot/README.txt "${pkgdir}/usr/share/doc/${pkgname}/README"
+  install -Dm644 usr/share/doc/Greenfoot/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 usr/share/doc/Greenfoot/THIRDPARTYLICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/THIRDPARTYLICENSE"
 }
diff --git a/greenfoot b/greenfoot
index ed2ebdd1bdc4..c7b1bb45bf5e 100755
--- a/greenfoot
+++ b/greenfoot
@@ -1,17 +1,18 @@
 #!/bin/sh
-if [ -e /usr/lib/jvm/java-11-openjfx/lib ]; then
-        JAVAFX_HOME=/usr/lib/jvm/java-17-openjfx/lib
+if [ -e /usr/lib/jvm/java-17-openjfx/lib/javafx.base.jar ]; then
+        JVMPATH=/usr/lib/jvm/java-17-openjfx/lib
 else
-        JAVAFX_HOME=/usr/lib/jvm/java-17-openjdk/lib
+        JVMPATH=/usr/lib/jvm/java-17-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"
+CP="/opt/greenfoot/boot.jar"
+JAVAFXJARS=`ls -1 $JVMPATH/javafx* | paste -sd ":" -`
+CP="$CP:$JVMPATH/tools.jar:$JAVAFXJARS"
 
 archlinux-java-run -a 17 -b 17 -- -Djavafx.embed.singleThread=true \
-        -Dawt.useSystemAAFontSettings=on \
-        -cp /opt/greenfoot/bluej.jar:/usr/lib/jvm/default/lib/tools.jar:$JAVAFX_CP bluej.Boot \
+        -Dawt.useSystemAAFontSettings=on -Xmx512M \
+        -cp "$CP" bluej.Boot \
         -greenfoot=true \
         -bluej.compiler.showunchecked=false \
         -greenfoot.url.javadoc=file:///usr/share/doc/greenfoot/API \
-        -javafxpath=$JAVAFX_CP \
         "$@"