upgpkg: sccache 0.2.12-4

2 files changed, 21 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f69ed7ae8a8..a7b0d0e56ba5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sccache
 	pkgdesc = Shared compilation cache
 	pkgver = 0.2.12
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/mozilla/sccache
 	arch = i686
 	arch = x86_64
@@ -9,7 +9,9 @@ pkgbase = sccache
 	makedepends = rust
 	depends = openssl
 	source = sccache-0.2.12.tar.gz::https://github.com/mozilla/sccache/archive/0.2.12.tar.gz
+	source = version-compare.patch::https://github.com/mozilla/sccache/commit/2433a8848cac263bb8fcf8467194104a91449966.patch
 	sha256sums = 591a82ddbc2e970630a9426c78c25cbc52c3261b06d57cb4e1f11ab8008629fa
+	sha256sums = 591d6413c67151a0ab6c3d8840bb31ff21170cf42c471e8faac99eed27d5d9b6
 
 pkgname = sccache
 
diff --git a/PKGBUILD b/PKGBUILD
index 3643d5dfb367..eb081fac6741 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sccache
 pkgver=0.2.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Shared compilation cache"
 arch=('i686' 'x86_64')
 url="https://github.com/mozilla/sccache"
@@ -11,22 +11,35 @@ license=('apache')
 depends=('openssl')
 makedepends=('rust')
 #checkdepends=('openssl-1.0')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/mozilla/sccache/archive/$pkgver.tar.gz")
-sha256sums=('591a82ddbc2e970630a9426c78c25cbc52c3261b06d57cb4e1f11ab8008629fa')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/mozilla/sccache/archive/$pkgver.tar.gz"
+        "version-compare.patch::https://github.com/mozilla/sccache/commit/2433a8848cac263bb8fcf8467194104a91449966.patch")
+sha256sums=('591a82ddbc2e970630a9426c78c25cbc52c3261b06d57cb4e1f11ab8008629fa'
+            '591d6413c67151a0ab6c3d8840bb31ff21170cf42c471e8faac99eed27d5d9b6')
 
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -F3 -i "$srcdir/version-compare.patch"
+}
+
 check() {
   cd "$pkgname-$pkgver"
 
   #OPENSSL_LIB_DIR="/usr/lib/openssl-1.0" \
   #  OPENSSL_INCLUDE_DIR="/usr/include/openssl-1.0" \
-  #  cargo test --release
+  #  cargo test \
+  #    --release \
+  #    --all-features
 }
 
 package() {
   cd "$pkgname-$pkgver"
 
-  cargo install --root "$pkgdir/usr" --path "$srcdir/$pkgname-$pkgver"
+  cargo install \
+    --root "$pkgdir/usr" \
+    --path "$srcdir/$pkgname-$pkgver" \
+    --all-features
   install -Dm644 "README.md" -t "$pkgdir/usr/share/doc/sccache"
 
   rm -f "$pkgdir/usr"/.crates*