Date: Friday, December 29, 2017 @ 14:25:24
Author: jelle
Revision: 276856
db-move: moved bti from [community-staging] to [community-testing] (x86_64)
Added:
bti/repos/community-testing-x86_64/
bti/repos/community-testing-x86_64/0001-Replace-removed-is_error-macro.patch
(from rev 276855,
bti/repos/community-staging-x86_64/0001-Replace-removed-is_error-macro.patch)
bti/repos/community-testing-x86_64/PKGBUILD
(from rev 276855, bti/repos/community-staging-x86_64/PKGBUILD)
Deleted:
bti/repos/community-staging-x86_64/
-------------------------------------------+
0001-Replace-removed-is_error-macro.patch | 45 ++++++++++++++++++++++++++++
PKGBUILD | 36 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
Copied:
bti/repos/community-testing-x86_64/0001-Replace-removed-is_error-macro.patch
(from rev 276855,
bti/repos/community-staging-x86_64/0001-Replace-removed-is_error-macro.patch)
===================================================================
--- community-testing-x86_64/0001-Replace-removed-is_error-macro.patch
(rev 0)
+++ community-testing-x86_64/0001-Replace-removed-is_error-macro.patch
2017-12-29 14:25:24 UTC (rev 276856)
@@ -0,0 +1,45 @@
+From 0db8dc6022f67a4e1f49397b8bf519b2a34f74c9 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <je...@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-testing-x86_64/PKGBUILD (from rev 276855,
bti/repos/community-staging-x86_64/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-12-29 14:25:24 UTC (rev 276856)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocr...@gmail.com>
+# Contributor: uvok <uvok at online dot de>
+# Contributor: Urist <9362773 at gmail.com>
+
+pkgname=bti
+pkgver=034
+pkgrel=2
+pkgdesc='Console client for Twitter and identi.ca'
+arch=('x86_64')
+url='http://gregkh.github.com/bti/'
+license=('GPL')
+depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
+source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz
+ 0001-Replace-removed-is_error-macro.patch)
+sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83'
+ 'df18ac4ad58b3ed17ce3ad7150a60375305f25641a791b6c4c4b69c631093a0e')
+
+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
+}
