Update to 5.10

Upstream states that JDK 21 is required for building JabRef 5.10 but
this is due to a bug in jlink:
https://bugs.openjdk.org/browse/JDK-8240567

As this package does not build a custom JRE, jlink is not used. So we
can stick to JDK 20 here.

3 files changed, 14 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eaa32e710135..bdc609b12f7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = jabref
 	pkgdesc = Graphical Java application for managing BibTeX and biblatex (.bib) databases
-	pkgver = 5.9
+	pkgver = 5.10
 	pkgrel = 1
 	url = https://www.jabref.org/
 	arch = any
 	license = MIT
-	makedepends = java-environment=19
+	makedepends = java-environment>=20
 	depends = archlinux-java-run>=7
-	depends = java-runtime>=19
+	depends = java-runtime>=20
 	optdepends = python: browser extension
 	options = !strip
 	options = !emptydirs
-	source = jabref-5.9.tar.gz::https://github.com/JabRef/jabref/archive/v5.9.tar.gz
+	source = jabref-5.10.tar.gz::https://github.com/JabRef/jabref/archive/v5.10.tar.gz
 	source = jabref.sh
 	source = jabref.desktop
-	sha256sums = 3afca55ff8aa8341226cc9d95090704870269acfd0e3523896a29385251b68b8
-	sha256sums = b89e7a3eb74031999c441ebfe9520618198dd68d416dd5b5b3b2271a1617ee2f
+	sha256sums = f6560e584f48f537fd580c8caac19925ea54c74d8d05bdb230b0daf2132c4b7e
+	sha256sums = f5e977628bc224f63ae4b05d8aaf13786c384478a70cda8a708cef8316892874
 	sha256sums = b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77
 
 pkgname = jabref
diff --git a/PKGBUILD b/PKGBUILD
index ad5837bb005c..86e8b0770e47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,21 +7,21 @@
 # https://github.com/michaellass/AUR
 
 pkgname=jabref
-pkgver=5.9
+pkgver=5.10
 pkgrel=1
 pkgdesc="Graphical Java application for managing BibTeX and biblatex (.bib) databases"
 arch=(any)
 url="https://www.jabref.org/"
 license=(MIT)
-depends=('archlinux-java-run>=7' 'java-runtime>=19')
-makedepends=('java-environment=19')
+depends=('archlinux-java-run>=7' 'java-runtime>=20')
+makedepends=('java-environment>=20')
 optdepends=('python: browser extension')
 options=(!strip !emptydirs)
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/JabRef/jabref/archive/v${pkgver}.tar.gz
         jabref.sh
         jabref.desktop)
-sha256sums=('3afca55ff8aa8341226cc9d95090704870269acfd0e3523896a29385251b68b8'
-            'b89e7a3eb74031999c441ebfe9520618198dd68d416dd5b5b3b2271a1617ee2f'
+sha256sums=('f6560e584f48f537fd580c8caac19925ea54c74d8d05bdb230b0daf2132c4b7e'
+            'f5e977628bc224f63ae4b05d8aaf13786c384478a70cda8a708cef8316892874'
             'b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77')
 
 # Note on supported Java versions:
@@ -45,7 +45,7 @@ build() {
   mkdir -p "${srcdir}"/gradle
   export GRADLE_USER_HOME=${srcdir}/gradle
 
-  export JAVA_HOME=$(archlinux-java-run -a 19 -b 19 -f jdk -j)
+  export JAVA_HOME=$(archlinux-java-run -a 20 -f jdk -j)
   echo "Using JDK from $JAVA_HOME to build JabRef."
 
   #/usr/bin/gradle \
@@ -74,7 +74,4 @@ package() {
   cd build
   cp -r resources "${pkgdir}"/usr/share/java/${pkgname}
   tar xf distributions/JabRef-${pkgver}.tar -C "${pkgdir}"/usr/share/java/${pkgname} JabRef-${pkgver}/lib --strip-components=1
-
-  # delete windows jar files that currently come with openjfx
-  rm "${pkgdir}"/usr/share/java/${pkgname}/lib/*-win.jar
 }
diff --git a/jabref.sh b/jabref.sh
index f923f16ddcc3..f0ebf7941218 100644
--- a/jabref.sh
+++ b/jabref.sh
@@ -14,14 +14,14 @@
 
 ROOT=/usr/share/java/jabref
 
-/usr/bin/archlinux-java-run -a 19 -- \
+/usr/bin/archlinux-java-run -a 20 -- \
 --add-modules javafx.controls,javafx.fxml,javafx.swing,javafx.web \
 --add-exports javafx.controls/com.sun.javafx.scene.control=org.controlsfx.controls \
 --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref \
---add-exports javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls \
 --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls \
 --add-exports javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls \
 --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls \
+--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls \
 --add-exports javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls \
 --add-exports javafx.base/com.sun.javafx.event=org.controlsfx.controls \
 --add-exports javafx.base/com.sun.javafx.collections=org.controlsfx.controls \
@@ -32,10 +32,6 @@ ROOT=/usr/share/java/jabref
 --add-opens javafx.controls/com.sun.javafx.scene.control=org.jabref \
 --add-opens javafx.controls/javafx.scene.control.skin=org.controlsfx.controls \
 --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls \
---add-opens javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix \
---add-opens javafx.base/com.sun.javafx.binding=com.jfoenix \
---add-opens javafx.graphics/com.sun.javafx.stage=com.jfoenix \
---add-opens javafx.base/com.sun.javafx.event=com.jfoenix \
 --module-path ${ROOT}/lib \
 --patch-module org.jabref=${ROOT}/resources/main \
 ${JABREF_OPTIONS} \