Updated to newest upstream version and set mime-types correctly to be able to open greenfoot when project.greenfoot is clicked.

6 files changed, 43 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 750046edf30a..40d67c5b9b94 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 = 3
+	pkgver = 3.6.1
+	pkgrel = 1
 	url = https://www.greenfoot.org
 	arch = any
 	license = GPL2
@@ -16,13 +16,15 @@ pkgbase = greenfoot
 	depends = java-runtime=11
 	depends = java-environment=11
 	depends = java11-openjfx
-	noextract = Greenfoot-linux-360.deb
-	source = https://www.greenfoot.org/download/files/Greenfoot-linux-360.deb
+	noextract = Greenfoot-linux-361.deb
+	source = https://www.greenfoot.org/download/files/Greenfoot-linux-361.deb
 	source = greenfoot
 	source = greenfoot.desktop
-	sha256sums = 398f20e46bb90dba554ebb243f1c3beda0c3a436cfcd08c9deee34db24702a2b
-	sha256sums = 101089f5ec66d177621d3fd6511824b54d37facbf3a7b6941388af1bea34e270
-	sha256sums = 853d6f283623f1de1f1e353abaf90afb345580b0e67f57b6245ea2e2ad6850f3
+	source = greenfoot.xml
+	sha256sums = c041d327f3eb391faa12eab4431a6a174afa19bba48e04f69a485276e9355084
+	sha256sums = d9293f132cfee9d4f1c4471f697b841488da1a5fc9b7d5ef1a918bb665a1d1c4
+	sha256sums = b980d0084fbafbb3ea335bb3840d858898c692822f1c671969a91982e86c1b4f
+	sha256sums = f1ea33e8289dfe31b9a0c4d88482a5ca5f75d663ba82ca986519f290e44789e4
 
 pkgname = greenfoot
 
diff --git a/PKGBUILD b/PKGBUILD
index 23a66764e7e6..794217a805ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer: nomisge <nomisge @ live . de>
 # Maintainer:  chet <chetgurevitch @ protonmail . com>
 # Contributor: teacher4711 <inverness1 @ gmx . de>
 # Contributor: fheday <fheday @ gmail . com>
@@ -5,8 +6,8 @@
 # Contributor: even <kessiapinheiro @ gmail . com>
 
 pkgname=greenfoot
-pkgver=3.6.0
-pkgrel=3
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="Allows easy development of two-dimensional graphical applications, such as simulations and interactive games."
 arch=('any')
 url="https://www.${pkgname}.org"
@@ -14,11 +15,13 @@ license=('GPL2' 'Apache' 'BSD' 'CPL' 'LGPL2' 'LGPL2.1' 'MIT' 'custom')
 depends=('archlinux-java-run' 'java-runtime=11' 'java-environment=11' 'java11-openjfx')
 source=("https://www.${pkgname}.org/download/files/Greenfoot-linux-${pkgver//.}.deb"
         "${pkgname}"
-        "${pkgname}.desktop")
+        "${pkgname}.desktop"
+        "${pkgname}.xml")
 noextract=("Greenfoot-linux-${pkgver//.}.deb")
-sha256sums=('398f20e46bb90dba554ebb243f1c3beda0c3a436cfcd08c9deee34db24702a2b'
-            '101089f5ec66d177621d3fd6511824b54d37facbf3a7b6941388af1bea34e270'
-            '853d6f283623f1de1f1e353abaf90afb345580b0e67f57b6245ea2e2ad6850f3')
+sha256sums=('c041d327f3eb391faa12eab4431a6a174afa19bba48e04f69a485276e9355084'
+            'd9293f132cfee9d4f1c4471f697b841488da1a5fc9b7d5ef1a918bb665a1d1c4'
+            'b980d0084fbafbb3ea335bb3840d858898c692822f1c671969a91982e86c1b4f'
+            'f1ea33e8289dfe31b9a0c4d88482a5ca5f75d663ba82ca986519f290e44789e4')
 
 package() {
 cd "${srcdir}"
@@ -33,6 +36,7 @@ cp -r usr/share/doc/Greenfoot/scenarios "${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"
diff --git a/greenfoot b/greenfoot
index 8f045d7c6b4c..28ead45087d7 100755
--- a/greenfoot
+++ b/greenfoot
@@ -7,9 +7,11 @@ 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 \
+archlinux-java-run -a 11 -b 11 -- -Djavafx.embed.singleThread=true \
+        -Dawt.useSystemAAFontSettings=on \
         -cp /opt/greenfoot/bluej.jar:/usr/lib/jvm/default/lib/tools.jar:$JAVAFX_CP bluej.Boot \
         -greenfoot=true \
         -bluej.compiler.showunchecked=false \
         -greenfoot.url.javadoc=file:///usr/share/doc/greenfoot/API \
+        -javafxpath=$JAVAFX_CP \
         "$@"
diff --git a/greenfoot.desktop b/greenfoot.desktop
index e1e1703b6d84..4f9fa7a8f396 100644
--- a/greenfoot.desktop
+++ b/greenfoot.desktop
@@ -4,7 +4,8 @@ Version=1.0
 Name=Greenfoot
 Comment=A simple Java IDE and animation framework
 Categories=Application;Development;
-Exec=greenfoot
+Exec=greenfoot %u
+MimeType=application/x-greenfoot.package
 Icon=greenfoot
 Terminal=false
 Type=Application
diff --git a/greenfoot.install b/greenfoot.install
new file mode 100644
index 000000000000..391f086046d0
--- /dev/null
+++ b/greenfoot.install
@@ -0,0 +1,11 @@
+post_install() {
+	if test -x /usr/bin/update-mime-database usr/share/mime &> /dev/null; then update-mime-database usr/share/mime &> /dev/null; fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	if test -x /usr/bin/update-mime-database usr/share/mime &> /dev/null; then update-mime-database usr/share/mime &> /dev/null; fi
+}
diff --git a/greenfoot.xml b/greenfoot.xml
new file mode 100644
index 000000000000..8b9348475ac0
--- /dev/null
+++ b/greenfoot.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-greenfoot.package">
+         <comment>Greenfoot Package</comment>
+         <comment xml:lang="de">Greenfoot Paket</comment>
+         <glob pattern="*.greenfoot"/>
+  </mime-type>
+</mime-info>