Follow current Rust package guidelines

2 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3404f09bc25b..3795e60df99d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = comrak
 	pkgdesc = CommonMark + GFM compatible Markdown parser and renderer
 	pkgver = 0.11.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/kivikakk/comrak
 	arch = x86_64
 	arch = i686
 	license = MIT
 	license = custom
 	makedepends = cargo
-	makedepends = rust
 	source = comrak-0.11.0.tar.gz::https://github.com/kivikakk/comrak/archive/0.11.0.tar.gz
 	sha256sums = 9da1388b719142780cff8c6dcf5e59d83ad88f23ed81c961361a986081fd2bfa
 
diff --git a/PKGBUILD b/PKGBUILD
index 54656890ecb4..759a2344ed5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,39 @@
-# Maintainer:  Caleb Maclennan <caleb@alerque.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=comrak
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc='CommonMark + GFM compatible Markdown parser and renderer'
 arch=(x86_64 i686)
 url="https://github.com/kivikakk/$pkgname"
 license=(MIT custom)
-makedepends=(cargo rust)
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+makedepends=(cargo)
+_archive="$pkgname-$pkgver"
+source=("$_archive.tar.gz::$url/archive/$pkgver.tar.gz")
 sha256sums=('9da1388b719142780cff8c6dcf5e59d83ad88f23ed81c961361a986081fd2bfa')
 
 prepare() {
-	cd "$pkgname-$pkgver"
-	cargo fetch
+	cd "$_archive"
+	# Upstream Issue: https://github.com/kivikakk/comrak/pull/193
+	cargo update
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-	cd "$pkgname-$pkgver"
-	cargo build --release --locked --all-features
+	cd "$_archive"
+	export RUSTUP_TOOLCHAIN=stable
+	export CARGO_TARGET_DIR=target
+	cargo build --frozen --release --all-features
 }
 
 check() {
-	cd "$pkgname-$pkgver"
-	cargo test --release --locked
+	cd "$_archive"
+	export RUSTUP_TOOLCHAIN=stable
+	cargo test --frozen --all-features
 }
 
 package () {
-	cd "$pkgname-$pkgver"
-	install -Dm0755 -t "$pkgdir/usr/bin/" target/release/$pkgname
+	cd "$_archive"
+	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
 	install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" COPYING
 }