-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net-news/newsboat: Apply json-c-0.14 fix
Closes: https://bugs.gentoo.org/730420 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: David Denoncin <ddenoncin@gmail.com>
- Loading branch information
David Denoncin
committed
Jul 16, 2020
1 parent
3aef468
commit 9e67422
Showing
2 changed files
with
39 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
Patch merged upstream for future versions of newsboat: https://github.com/newsboat/newsboat/pull/883 | ||
|
||
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/newsblur_api.cpp b/src/newsblur_api.cpp | ||
index 2d1acdae..e124852d 100644 | ||
--- a/src/newsblur_api.cpp | ||
+++ b/src/newsblur_api.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 { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters