diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | jabref.sh | 3 |
3 files changed, 19 insertions, 14 deletions
@@ -1,18 +1,20 @@ pkgbase = jabref pkgdesc = Graphical Java application for managing BibTeX and biblatex (.bib) databases pkgver = 5.0 - pkgrel = 2 + pkgrel = 3 url = https://www.jabref.org/ arch = any license = MIT - makedepends = jdk13-openjdk - depends = bash - depends = jre13-openjdk + makedepends = java-environment>=13 + depends = archlinux-java-run>=7 + depends = java-runtime>=13 + options = !strip + options = !emptydirs source = jabref-5.0.tar.gz::https://github.com/JabRef/jabref/archive/v5.0.tar.gz source = jabref.sh source = jabref.desktop sha256sums = 52ac917dd96f20a05b4beb7ea4c52edcf8c6170bd49b36178f599d48ecd3a822 - sha256sums = 51379fbce194379d6c6b66cf9404361d42b916364fc1b5915553fe4b03d5f0e5 + sha256sums = 0d5ca38d2c4a5c60b0778f36317794d2fb13f20b13d8473f69b41a6caebcb839 sha256sums = e499b4af1fc45223fdafd801a4dd8a1c3c59384c71bc2e6985ab701da97df717 pkgname = jabref @@ -8,29 +8,33 @@ pkgname=jabref pkgver=5.0 -pkgrel=2 +pkgrel=3 pkgdesc="Graphical Java application for managing BibTeX and biblatex (.bib) databases" arch=(any) url="https://www.jabref.org/" license=(MIT) -depends=(bash jre13-openjdk) -makedepends=(jdk13-openjdk) +depends=('archlinux-java-run>=7' 'java-runtime>=13') +makedepends=('java-environment>=13') options=(!strip !emptydirs) source=(${pkgname}-${pkgver}.tar.gz::https://github.com/JabRef/jabref/archive/v${pkgver}.tar.gz jabref.sh jabref.desktop) sha256sums=('52ac917dd96f20a05b4beb7ea4c52edcf8c6170bd49b36178f599d48ecd3a822' - '51379fbce194379d6c6b66cf9404361d42b916364fc1b5915553fe4b03d5f0e5' + '0d5ca38d2c4a5c60b0778f36317794d2fb13f20b13d8473f69b41a6caebcb839' 'e499b4af1fc45223fdafd801a4dd8a1c3c59384c71bc2e6985ab701da97df717') build() { cd ${pkgname}-${pkgver} - mkdir ${srcdir}/gradle - - export JAVA_HOME=/usr/lib/jvm/java-13-openjdk/ + mkdir -p ${srcdir}/gradle export GRADLE_USER_HOME=${srcdir}/gradle + export JAVA_HOME=$(archlinux-java-run -a 13 -f jdk -j) + echo "Using JDK from $JAVA_HOME to build JabRef." + + # Use gradle 6.3 for support with JDK 14 + sed -i 's/gradle-6.2.1-bin.zip/gradle-6.3-bin.zip/g' gradle/wrapper/gradle-wrapper.properties + ./gradlew \ --no-daemon \ -PprojVersion="${pkgver}" \ diff --git a/jabref.sh b/jabref.sh index 084272ea5066..f122a4ef2f41 100644 --- a/jabref.sh +++ b/jabref.sh @@ -4,10 +4,9 @@ # https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace # and the output of `./gradlew -d run`. -JRE=java-13-openjdk ROOT=/usr/share/java/jabref -/usr/lib/jvm/${JRE}/bin/java \ +/usr/bin/archlinux-java-run --min 13 -- \ --patch-module org.jabref=${ROOT}/resources/main \ --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref \ --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref \ |