summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Laß2023-11-28 10:10:00 +0100
committerMichael Laß2023-11-28 10:10:29 +0100
commitf5ca1faa7ab185ca45086c9a763b3ce40c341e2e (patch)
tree455cddb6cedd8e466afc4e1dbd48ec3345db16f9
parenta1fe8de0578a5e0e791a10af02d0cbd594dd3374 (diff)
downloadaur-f5ca1faa7ab185ca45086c9a763b3ce40c341e2e.tar.gz
Make sure to launch JabRef with installed JDK
Arch Linux's official JDK and JRE packages of the same version conflict with each other. Hence, depending on java-environment=21 works in the majority of cases. However, there are JDK packages in the AUR that provide java-environment but not jdk-openjdk and hence do not conflict with JRE packages. Make sure to launch JabRef with a full JDK and don't rely on it being chosen automatically. Fixes a1fe8de0578a5e0e791a10af02d0cbd594dd3374
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--jabref.sh2
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 85eb847186cd..2771692214ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = jabref
pkgdesc = Graphical Java application for managing BibTeX and biblatex (.bib) databases
pkgver = 5.11
- pkgrel = 2
+ pkgrel = 3
url = https://www.jabref.org/
arch = any
license = MIT
@@ -21,7 +21,7 @@ pkgbase = jabref
sha256sums = 9345f022dca8d341928adecd0e82be00b205371da71ec0109d86a20c4b9b25c2
sha256sums = a2533c5dfc43de52e8acedd656c5af257c7da4baf8dda844b81c7f98d4e018e8
sha256sums = c5629699d899cc02d09062c76f8c8e6a0d2f44c99ef402b6671b0aa46b942372
- sha256sums = f8b9b6cb92c1a564a8bbf379819ad4c11cff5f760b346e1003928fd48fd38a1c
+ sha256sums = 6a377ca631aab1d6a9bba927714e0571a19fbf4c1bb6b798921ca254e3e0588f
sha256sums = b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77
pkgname = jabref
diff --git a/PKGBUILD b/PKGBUILD
index 4884e145029b..1f47f45db37d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ _styles=010b77c19b0928db4cc046258d6797a937e0f460
pkgname=jabref
pkgver=5.11
-pkgrel=2
+pkgrel=3
pkgdesc="Graphical Java application for managing BibTeX and biblatex (.bib) databases"
arch=(any)
url="https://www.jabref.org/"
@@ -31,7 +31,7 @@ sha256sums=('d09666f240a9ba8a4bb1759b44a676e723f7b48477e57ef0189349ad4489b822'
'9345f022dca8d341928adecd0e82be00b205371da71ec0109d86a20c4b9b25c2'
'a2533c5dfc43de52e8acedd656c5af257c7da4baf8dda844b81c7f98d4e018e8'
'c5629699d899cc02d09062c76f8c8e6a0d2f44c99ef402b6671b0aa46b942372'
- 'f8b9b6cb92c1a564a8bbf379819ad4c11cff5f760b346e1003928fd48fd38a1c'
+ '6a377ca631aab1d6a9bba927714e0571a19fbf4c1bb6b798921ca254e3e0588f'
'b0e3ed5cde4072a2d10de887b50217c03bbe30a1ea9b39bea1255ea80db15b77')
# Note on supported Java versions:
diff --git a/jabref.sh b/jabref.sh
index 3b1345bf5e4c..aca046bbdde6 100644
--- a/jabref.sh
+++ b/jabref.sh
@@ -14,7 +14,7 @@
ROOT=/usr/share/java/jabref
-/usr/bin/archlinux-java-run -a 21 -b 21 -- \
+/usr/bin/archlinux-java-run -a 21 -b 21 -f jdk -- \
--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 \