fixed java-17-path; drop briar-headless dependency; stricter java dependency

2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b02af85aa74a..8ecb65bba97b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = briar-desktop-git
 	pkgdesc = Prototyping the next generation for Briar on desktop devices
 	pkgver = r307.38723c4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://code.briarproject.org/briar/briar-desktop
 	arch = x86_64
 	arch = aarch64
@@ -9,9 +9,10 @@ pkgbase = briar-desktop-git
 	license = GPL
 	makedepends = git
 	makedepends = jdk-openjdk>=17
+	makedepends = jdk-openjdk<18
 	depends = java-runtime>=17
+	depends = java-runtime<18
 	depends = bash
-	depends = briar-headless-git
 	conflicts = briar-desktop
 	source = briar-desktop::git+https://code.briarproject.org/briar/briar-desktop.git
 	source = briar::git+https://code.briarproject.org/briar/briar
diff --git a/PKGBUILD b/PKGBUILD
index 3fb702eb072d..a86aba453ab5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 pkgname=briar-desktop-git
 _pkgname=briar-desktop
 pkgver=r307.38723c4
-pkgrel=1
+pkgrel=2
 _build_type=nightly
 pkgdesc='Prototyping the next generation for Briar on desktop devices'
 arch=('x86_64' 'aarch64' 'armv7h')
 url="https://code.briarproject.org/briar/briar-desktop"
 license=('GPL')
-depends=('java-runtime>=17' 'bash' 'briar-headless-git')
-makedepends=('git' 'jdk-openjdk>=17')
+# let's limit it to <18 just in case 18 comes out sooner than expected (causing our hard java-17-path to cause trouble):
+depends=('java-runtime>=17' 'java-runtime<18' 'bash')
+makedepends=('git' 'jdk-openjdk>=17' 'jdk-openjdk<18')
 conflicts=('briar-desktop')
 source=("${_pkgname}::git+https://code.briarproject.org/briar/briar-desktop.git"
         "briar::git+https://code.briarproject.org/briar/briar")
@@ -42,7 +43,6 @@ prepare() {
 build() {
   cd "${_pkgname}"
   export PATH="/usr/lib/jvm/java-17-openjdk/jre/bin/:$PATH"
-  # export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
   ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk --no-daemon -PbuildType=${_build_type} packageUberJarForCurrentOS
 }
 
@@ -52,7 +52,7 @@ package() {
   install -dm755 "$pkgdir/usr/bin/"
   cat << EOF > "$pkgdir/usr/bin/$_pkgname"
 #!/bin/sh
-exec /usr/bin/java -jar '/usr/share/java/briar-desktop.jar' "\$@"
+exec /usr/lib/jvm/java-17-openjdk/bin/java -jar '/usr/share/java/briar-desktop.jar' "\$@"
 EOF
   chmod +x "$pkgdir/usr/bin/$_pkgname"