increment pkgrel to 4; pull upstream spdlog.diff

2 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fcedf84e208..fcd12c34baf5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Mar 13 01:53:05 UTC 2017
+# Fri Mar 17 15:41:58 UTC 2017
 pkgbase = cryfs
 	pkgdesc = Cryptographic filesystem for the cloud
 	pkgver = 0.9.7
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.cryfs.org
 	arch = armv7h
 	arch = i686
@@ -21,8 +21,10 @@ pkgbase = cryfs
 	depends = python2
 	source = cryfs-0.9.7.tar.gz::https://codeload.github.com/cryfs/cryfs/tar.gz/0.9.7
 	source = git+https://github.com/cryfs/cryfs.wiki
-	sha256sums = 4a5745bc3a04c934c931f8a578f08f7e19e59c2e2cb42d8f940e5154e0b5ba53
+	source = spdlog.diff::https://github.com/cryfs/cryfs/commit/f1c6fa044f44e33c0c9e6eab78877d47ac4c87be.diff
+	sha256sums = 4d65c462fa988f698090f00052cbb236cfc7e7524b872f96409187bc5285eedd
 	sha256sums = SKIP
+	sha256sums = 10540361f6fcf99bd88c6c3673677af5c005a449595df96670bc776b52a6bf78
 
 pkgname = cryfs
 
diff --git a/PKGBUILD b/PKGBUILD
index ad83d500f5a7..a751a2b9723d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cryfs
 pkgver=0.9.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Cryptographic filesystem for the cloud"
 arch=('armv7h' 'i686' 'x86_64')
 depends=('boost'
@@ -18,15 +18,17 @@ makedepends=('cmake' 'git' 'make')
 url="https://www.cryfs.org"
 license=('LGPL3')
 source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/cryfs/$pkgname/tar.gz/$pkgver
-        git+https://github.com/cryfs/cryfs.wiki)
-sha256sums=('4a5745bc3a04c934c931f8a578f08f7e19e59c2e2cb42d8f940e5154e0b5ba53'
-            'SKIP')
+        git+https://github.com/cryfs/cryfs.wiki
+        spdlog.diff::https://github.com/cryfs/cryfs/commit/f1c6fa044f44e33c0c9e6eab78877d47ac4c87be.diff)
+sha256sums=('4d65c462fa988f698090f00052cbb236cfc7e7524b872f96409187bc5285eedd'
+            'SKIP'
+            '10540361f6fcf99bd88c6c3673677af5c005a449595df96670bc776b52a6bf78')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  msg2 'Monkey patching spdlog for great good...'
-  sed -i 's/CHAR_WIDTH/CHAR_SIZE/g' vendor/spdlog/spdlog/fmt/bundled/format.h
+  msg2 'Updating spdlog to 0.12.0...'
+  patch -p1 -i "$srcdir/spdlog.diff"
 }
 
 build() {