Update to 5.8

Thankfully, the authors of JabRef switched back to a supported version
of Java.

4 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4982a48a6d4e..7947561daa2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = jabref
 	pkgdesc = Graphical Java application for managing BibTeX and biblatex (.bib) databases
-	pkgver = 5.7
+	pkgver = 5.8
 	pkgrel = 1
 	url = https://www.jabref.org/
 	arch = any
 	license = MIT
 	makedepends = gradle
-	makedepends = java-environment=18
+	makedepends = java-environment=17
 	depends = archlinux-java-run>=7
-	depends = java-runtime>=18
+	depends = java-runtime>=17
 	optdepends = python: browser extension
 	options = !strip
 	options = !emptydirs
-	source = jabref-5.7.tar.gz::https://github.com/JabRef/jabref/archive/v5.7.tar.gz
+	source = jabref-5.8.tar.gz::https://github.com/JabRef/jabref/archive/v5.8.tar.gz
 	source = jabref.sh
 	source = jabref.desktop
-	sha256sums = f94f9ed3a7597f8603d211d2c6a75737c7db8eabca564362fe1653f32e153235
-	sha256sums = 145380eed76e037991292faf2e83f1eda4b217bc0bab2b4404c4a43e016e080f
-	sha256sums = c6c95fc980630bc72bd4adcc93c710702fe4fced3fcb26c3067eea0f3aad5c68
+	sha256sums = c2c4cba0f7b43e8a5505bb35a6487250093256f2e8cd758dcdfadb935e4b4892
+	sha256sums = dd6db2b5a65ac38caec690c9652f8ef517a800fdff0bb5939c9c46317fed96a5
+	sha256sums = b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77
 
 pkgname = jabref
diff --git a/PKGBUILD b/PKGBUILD
index 9edd5b010828..17452ffedb0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,22 +7,22 @@
 # https://github.com/michaellass/AUR
 
 pkgname=jabref
-pkgver=5.7
+pkgver=5.8
 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>=18')
-makedepends=('gradle' 'java-environment=18')
+depends=('archlinux-java-run>=7' 'java-runtime>=17')
+makedepends=('gradle' 'java-environment=17')
 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=('f94f9ed3a7597f8603d211d2c6a75737c7db8eabca564362fe1653f32e153235'
-            '145380eed76e037991292faf2e83f1eda4b217bc0bab2b4404c4a43e016e080f'
-            'c6c95fc980630bc72bd4adcc93c710702fe4fced3fcb26c3067eea0f3aad5c68')
+sha256sums=('c2c4cba0f7b43e8a5505bb35a6487250093256f2e8cd758dcdfadb935e4b4892'
+            'dd6db2b5a65ac38caec690c9652f8ef517a800fdff0bb5939c9c46317fed96a5'
+            'b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77')
 
 # Note on supported Java versions:
 # The file build.gradle contains the version of Java that is required and tested.
@@ -45,7 +45,7 @@ build() {
   mkdir -p "${srcdir}"/gradle
   export GRADLE_USER_HOME=${srcdir}/gradle
 
-  export JAVA_HOME=$(archlinux-java-run -a 18 -b 18 -f jdk -j)
+  export JAVA_HOME=$(archlinux-java-run -a 17 -b 17 -f jdk -j)
   echo "Using JDK from $JAVA_HOME to build JabRef."
 
   # ./gradlew \
@@ -74,4 +74,5 @@ 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
+  rm "${pkgdir}"/usr/share/java/${pkgname}/lib/*-win.jar
 }
diff --git a/jabref.desktop b/jabref.desktop
index 1ed13a35672e..9c2775bb1b80 100644
--- a/jabref.desktop
+++ b/jabref.desktop
@@ -8,5 +8,5 @@ Icon=jabref
 Exec=JabRef %U
 Keywords=bibtex;biblatex;latex;bibliography
 Categories=Office;
-StartupWMClass=org.jabref.gui.JabRefMain
+StartupWMClass=org.jabref.gui.MainApplication
 MimeType=text/x-bibtex;
diff --git a/jabref.sh b/jabref.sh
index f38ce6fa7b1d..64f0a11b3a7a 100644
--- a/jabref.sh
+++ b/jabref.sh
@@ -14,7 +14,7 @@
 
 ROOT=/usr/share/java/jabref
 
-/usr/bin/archlinux-java-run -a 18 -- \
+/usr/bin/archlinux-java-run -a 17 -- \
 --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 \
@@ -39,5 +39,5 @@ ROOT=/usr/share/java/jabref
 --module-path ${ROOT}/lib \
 --patch-module org.jabref=${ROOT}/resources/main \
 ${JABREF_OPTIONS} \
---module org.jabref/org.jabref.gui.JabRefLauncher \
+--module org.jabref/org.jabref.cli.Launcher \
 "$@"