Fix build

3 files changed, 24 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e6bc65659fb..6e84c207624b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Aug  6 05:25:45 UTC 2018
 pkgbase = masterpassword-cli
 	pkgdesc = CLI version of Master Password
 	pkgver = 2.6
-	pkgrel = 3
+	pkgrel = 4
 	url = https://masterpassword.app/
 	arch = i686
 	arch = x86_64
@@ -15,8 +13,11 @@ pkgbase = masterpassword-cli
 	optdepends = xclip: copy password to clipboard
 	source = https://masterpassword.app/mpw-2.6-cli-5-0-g344771db.tar.gz
 	source = https://masterpassword.app/mpw-2.6-cli-5-0-g344771db.tar.gz.sig
+	source = fix-build.patch
+	validpgpkeys = 5C2D1D61853F20F2FCDDCCB70EF21226F43EA6BC
 	sha256sums = 954c07b1713ecc2b30a07bead9c11e6204dd774ca67b5bdf7d2d6ad1c4eec170
 	sha256sums = SKIP
+	sha256sums = ae6cb494dba01f9941580840e7412b91973c7767cae75c935d8dd2fd2392adc3
 
 pkgname = masterpassword-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index f29f32c0f906..9056673ad803 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=masterpassword-cli
 pkgver=2.6
 _relver=5
 _hash=g344771db
-pkgrel=3
+pkgrel=4
 pkgdesc='CLI version of Master Password'
 arch=('i686' 'x86_64')
 url='https://masterpassword.app/'
@@ -13,11 +13,17 @@ license=('GPL3')
 depends=('ncurses' 'json-c' 'libsodium')
 makedepends=('openssl')
 optdepends=('xclip: copy password to clipboard')
-source=("https://masterpassword.app/mpw-${pkgver}-cli-${_relver}-0-${_hash}.tar.gz"{,.sig})
+source=("https://masterpassword.app/mpw-${pkgver}-cli-${_relver}-0-${_hash}.tar.gz"{,.sig}
+        'fix-build.patch')
 sha256sums=('954c07b1713ecc2b30a07bead9c11e6204dd774ca67b5bdf7d2d6ad1c4eec170'
-            'SKIP')
+            'SKIP'
+            'ae6cb494dba01f9941580840e7412b91973c7767cae75c935d8dd2fd2392adc3')
 validpgpkeys=('5C2D1D61853F20F2FCDDCCB70EF21226F43EA6BC') # Maarten Billemont
 
+prepare() {
+  patch -p0 -i fix-build.patch
+}
+
 build() {
   export LDFLAGS="$LDFLAGS -ltinfo"
   ./build
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 000000000000..d72dd87d6461
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,11 @@
+--- core/mpw-marshal-util.c~	2020-04-30 15:20:51.775480937 +0200
++++ core/mpw-marshal-util.c	2020-04-30 15:20:58.518832576 +0200
+@@ -94,7 +94,7 @@
+     if (!json_value)
+         return defaultValue;
+
+-    return json_object_get_boolean( json_value ) == TRUE;
++    return json_object_get_boolean( json_value ) == true;
+ }
+ #endif
+