upgpkg: vixi-git 0.0.0.r156.g66d9520-1

2 files changed, 25 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34e66fcd421b..94833f0d6695 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vixi-git
 	pkgdesc = A vim like client for the xi backend
-	pkgver = 0.0.0.r152.gc5bdd66
+	pkgver = 0.0.0.r156.g66d9520
 	pkgrel = 1
 	url = https://github.com/Peltoche/vixi
 	arch = x86_64
@@ -11,4 +11,3 @@ pkgbase = vixi-git
 	sha256sums = SKIP
 
 pkgname = vixi-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 451b928c597d..581d781f2e42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,45 @@
 # Maintainer: Caleb Maclennan <caleb@aleque.com>
 
 pkgname=vixi-git
-pkgver=0.0.0.r152.gc5bdd66
+pkgver=0.0.0.r156.g66d9520
 pkgrel=1
 pkgdesc='A vim like client for the xi backend'
-arch=('x86_64')
+arch=(x86_64)
 url="https://github.com/Peltoche/${pkgname%-git}"
-license=('Apache')
-makedepends=('cargo' 'git')
+license=(Apache)
+makedepends=(cargo
+             git)
 source=("$pkgname::git+$url.git")
 sha256sums=('SKIP')
 
-pkgver() {
-    cd "$pkgname"
-    git tag | grep -Fq 'v0.0.0' || git tag 'v0.0.0' 0473838
-    git describe --long --tags --abbrev=7 --match='v[0-9]*' |
-        sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+prepare() {
+	cd "$pkgname"
+	# Upstream Cargo.lock file is not kept in sync on Git HEAD
+	cargo update
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
-prepare() {
-    cd "$pkgname"
-    cargo fetch --locked
+pkgver() {
+	cd "$pkgname"
+	git tag | grep -Fq 'v0.0.0' || git tag 'v0.0.0' 0473838
+	git describe --long --tags --abbrev=7 --match='v[0-9]*' |
+		sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "$pkgname"
-    cargo build --locked --offline --release --all-features
+	cd "$pkgname"
+	export RUSTUP_TOOLCHAIN=stable
+	export CARGO_TARGET_DIR=target
+	cargo build --frozen --release --all-features
 }
 
 check() {
-    cd "$pkgname"
-    cargo test --locked --offline --release
+	cd "$pkgname"
+	export RUSTUP_TOOLCHAIN=stable
+	cargo test --frozen --all-features
 }
 
 package() {
-    cd "$pkgname"
-    install -Dm755 -t "$pkgdir/usr/bin" "target/release/${pkgname%-git}"
+	cd "$pkgname"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/${pkgname%-git}"
 }