[arch-commits] Commit in bti/repos (3 files)

[Evangelos Foutras]

    Date: Saturday, April 25, 2020 @ 15:02:12
  Author: foutrelis
Revision: 620836

archrelease: copy trunk to community-staging-x86_64

Added:
  bti/repos/community-staging-x86_64/
  bti/repos/community-staging-x86_64/0001-Replace-removed-is_error-macro.patch
    (from rev 620835, bti/trunk/0001-Replace-removed-is_error-macro.patch)
  bti/repos/community-staging-x86_64/PKGBUILD
    (from rev 620835, bti/trunk/PKGBUILD)

-------------------------------------------+
 0001-Replace-removed-is_error-macro.patch |   45 ++++++++++++++++++++++++++++
 PKGBUILD                                  |   35 +++++++++++++++++++++
 2 files changed, 80 insertions(+)

Copied: bti/repos/community-staging-x86_64/0001-Replace-removed-is_error-macro.patch (from rev 620835, bti/trunk/0001-Replace-removed-is_error-macro.patch)
===================================================================
--- community-staging-x86_64/0001-Replace-removed-is_error-macro.patch	                        (rev 0)
+++ community-staging-x86_64/0001-Replace-removed-is_error-macro.patch	2020-04-25 15:02:12 UTC (rev 620836)
@@ -0,0 +1,45 @@
+From 0db8dc6022f67a4e1f49397b8bf519b2a34f74c9 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle at 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
+

Copied: bti/repos/community-staging-x86_64/PKGBUILD (from rev 620835, bti/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-04-25 15:02:12 UTC (rev 620836)
@@ -0,0 +1,35 @@
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: uvok <uvok at online dot de>
+# Contributor: Urist <9362773 at gmail.com>
+
+pkgname=bti
+pkgver=034
+pkgrel=4
+pkgdesc='Console client for Twitter and identi.ca'
+arch=('x86_64')
+url='https://gregkh.github.com/bti/'
+license=('GPL')
+depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
+source=(https://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz
+        0001-Replace-removed-is_error-macro.patch)
+sha512sums=('2b7cd66cff617f7592863a1a8e03754b3dea314c8eeb98bf0993601d4d4db848a74b26941bbd04f57a348bf0d02aefca4e3125f00fed531a67a3f17f36e665ba'
+            'e05c6b4c744338a4679e37c25e16656b029bb995cbe0efd71b986383d812c4c7b9e599d4f758dfeef94a378a2a807275ffe80fb28ff9970a5ec4b039201223f6')
+
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/0001-Replace-removed-is_error-macro.patch
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  ./configure --prefix=/usr
+
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  make DESTDIR="${pkgdir}" install
+}