net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

From db70049f436a965767e8a1273389e1be92e946fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Mon, 13 Apr 2020 12:52:46 +0200
Subject: [PATCH] Add support for upcoming json-c 0.14.0.

TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
---
 src/newsblurapi.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/newsblurapi.cpp b/src/newsblurapi.cpp
index 2d1acdae..e124852d 100644
--- a/src/newsblurapi.cpp
+++ b/src/newsblurapi.cpp
@@ -9,6 +9,19 @@
 #include "strprintf.h"
 #include "utils.h"
 
+/* json-c 0.13.99 does not define TRUE/FALSE anymore
+ * the json-c maintainers replaced them with pure 1/0
+ * https://github.com/json-c/json-c/commit/0992aac61f8b
+ */
+#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE  1
+#endif
+#endif
+
 #define NEWSBLUR_ITEMS_PER_PAGE 6
 
 namespace newsboat {