diff options
| -rw-r--r-- | net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch | 34 | ||||
| -rw-r--r-- | net-news/newsboat/newsboat-2.19-r1.ebuild (renamed from net-news/newsboat/newsboat-2.19.ebuild) | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch b/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch new file mode 100644 index 000000000000..79c4da5e726a --- /dev/null +++ b/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch @@ -0,0 +1,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 { diff --git a/net-news/newsboat/newsboat-2.19.ebuild b/net-news/newsboat/newsboat-2.19-r1.ebuild index 8c33dbb00615..2729ac499207 100644 --- a/net-news/newsboat/newsboat-2.19.ebuild +++ b/net-news/newsboat/newsboat-2.19-r1.ebuild @@ -143,6 +143,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.11-flags.patch" "${FILESDIR}/${PN}-2.19-libressl.patch" + "${FILESDIR}/${PN}-2.19-json-c-0.14.0.patch" ) src_configure() { |