nonprism/bti: rebuilt

2 files changed, 57 insertions, 10 deletions

diff --git a/nonprism/bti/0001-Replace-removed-is_error-macro.patch b/nonprism/bti/0001-Replace-removed-is_error-macro.patch
new file mode 100644
index 000000000..d42286ccc
--- /dev/null
+++ b/nonprism/bti/0001-Replace-removed-is_error-macro.patch
@@ -0,0 +1,45 @@
+From 0db8dc6022f67a4e1f49397b8bf519b2a34f74c9 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle@vdwaa.nl>
+Date: Wed, 27 Dec 2017 11:05:45 +0100
+Subject: [PATCH] Replace removed is_error macro
+
+The json-c library removed the is_error macro in 0.13, replaced the
+macro calls with a != NULL statement.
+---
+ bti.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bti.c b/bti.c
+index 7f485a8..9b68e17 100644
+--- a/bti.c
++++ b/bti.c
+@@ -451,7 +451,7 @@ static void parse_timeline(char *document, struct session *session)
+ 	struct json_object *val;				\
+ 	struct lh_entry *entry;					\
+ 	for (entry = json_object_get_object(obj)->head;		\
+-		({ if(entry && !is_error(entry)) {		\
++		({ if(entry && entry != NULL) {		\
+ 			key = (char*)entry->k;			\
+ 			val = (struct json_object*)entry->v;	\
+ 		} ; entry; });					\
+@@ -667,7 +667,7 @@ static int parse_response_json(char *document, struct session *session)
+ 
+ 	/* make global for now */
+ 	store_session = session;
+-	if (!is_error(jobj)) {
++	if (jobj != NULL) {
+ 		/* guards against a json pre 0.10 bug */
+ 		json_parse(jobj,0);
+ 	}
+@@ -692,7 +692,7 @@ static void parse_timeline_json(char *document, struct session *session)
+ 
+ 	/* make global for now */
+ 	store_session = session;
+-	if (!is_error(jobj)) {
++	if (jobj != NULL) {
+ 		/* guards against a json pre 0.10 bug */
+ 		if (json_object_get_type(jobj)==json_type_array) {
+ 			json_parse_array(jobj, NULL, 0);
+-- 
+2.15.1
+
diff --git a/nonprism/bti/PKGBUILD b/nonprism/bti/PKGBUILD
index ad25aef8b..ff07c350f 100644
--- a/nonprism/bti/PKGBUILD
+++ b/nonprism/bti/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $
 # Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com>
 # Contributor (Arch): uvok <uvok at online dot de>
@@ -6,21 +5,24 @@
 
 pkgname=bti
 pkgver=034
-pkgrel=1.nonprism1
+pkgrel=3
+pkgrel+=.nonprism1
 pkgdesc='Console client for status.net, without Twitter support'
-arch=('i686' 'x86_64')
+arch=('x86_64')
+arch+=('i686')
 url='http://gregkh.github.com/bti/'
 license=('GPL')
 depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-conflicts=(${pkgname}-nonprism)
-replaces=(${pkgname}-nonprism)
-source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz
-        nonprism.patch)
-sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83'
-            '86eab6c949e3c19d3a4088fac78fba4709845e9d5871b12c17a944127347498c')
+source=(https://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz
+        0001-Replace-removed-is_error-macro.patch)
+source+=(nonprism.patch)
+sha512sums=('2b7cd66cff617f7592863a1a8e03754b3dea314c8eeb98bf0993601d4d4db848a74b26941bbd04f57a348bf0d02aefca4e3125f00fed531a67a3f17f36e665ba'
+            'e05c6b4c744338a4679e37c25e16656b029bb995cbe0efd71b986383d812c4c7b9e599d4f758dfeef94a378a2a807275ffe80fb28ff9970a5ec4b039201223f6'
+            '522b76d0e5a01618580d6c187e5e2f1343c879b0be6dc86285f7c47f220e4a86064bb8a30bab3ec6581c2850ff4adcc1ea1a2174efcb5ea68e2454264196f066')
 
 prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/0001-Replace-removed-is_error-macro.patch
   patch -Np1 -i ${srcdir}/nonprism.patch
 }
 
@@ -33,6 +35,6 @@ build() {
 
 package() {
   cd "${srcdir}"/$pkgname-$pkgver
-  
+
   make DESTDIR="${pkgdir}" install
 }