summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlsf2023-03-08 12:15:40 +0100
committerlsf2023-03-08 12:15:40 +0100
commit001fa8327b24c9ab0cc30eba7bcee20e338a6c64 (patch)
tree6852e8da2ab2b9b363d7be04303cc4a9bcea7fe1
parent612040fec41bd8fa6d110fe75d897e792b3eefc6 (diff)
downloadaur-001fa8327b24c9ab0cc30eba7bcee20e338a6c64.tar.gz
fix git submodule issue; fix build cmd
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b6a30eee8c2f..96d127bbcf1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = briar-desktop-git
pkgdesc = Prototyping the next generation for Briar on desktop devices
- pkgver = r471.7ee4177
+ pkgver = r597.cf74f07
pkgrel = 1
url = https://code.briarproject.org/briar/briar-desktop
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 18734f6e2cd8..5ee68bc0e302 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=briar-desktop-git
_pkgname=briar-desktop
-pkgver=r471.7ee4177
+pkgver=r597.cf74f07
pkgrel=1
_build_type=nightly
pkgdesc='Prototyping the next generation for Briar on desktop devices'
@@ -46,13 +46,13 @@ prepare() {
cd ${_pkgname}
git submodule init
git config submodule.briar.url "$srcdir/briar"
- git submodule update --init --recursive
+ git -c protocol.file.allow=always submodule update --init --recursive
}
build() {
cd "${_pkgname}"
export PATH="/usr/lib/jvm/java-17-openjdk/jre/bin/:$PATH"
- ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk --no-daemon -PbuildType=${_build_type} packageUberJarForCurrentOS
+ ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk --no-daemon -PbuildType=${_build_type} pinpitPackageDefaultUberJarForLinuxX64
}
package() {
@@ -65,7 +65,7 @@ exec /usr/lib/jvm/java-17-openjdk/bin/java -jar '/usr/share/java/briar-desktop.j
EOF
chmod +x "$pkgdir/usr/bin/$_pkgname"
- install -m 644 -D "${srcdir}/${_pkgname}/${_pkgname}/build/compose/jars/Briar-linux-${_gradle_arch}-${_bin_ver}-${_build_type}.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
+ install -m 644 -D "${srcdir}/${_pkgname}/${_pkgname}/build/pinpit/jars/Briar-linux-${_gradle_arch}-${_bin_ver}-${_build_type}.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
install -Dm644 ${srcdir}/${_pkgname}/${_pkgname}/src/main/resources/images/logo_circle.svg \
"$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg"