1 |
commit: 8ca902514c95ccfdd8f0f14fc53b6c10e01fdd0c |
2 |
Author: David Denoncin <ddenoncin <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Jul 1 21:34:19 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 1 07:07:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca90251 |
7 |
|
8 |
net-news/newsboat: apply json-c-0.14 fix |
9 |
|
10 |
Closes: https://bugs.gentoo.org/730420 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: David Denoncin <ddenoncin <AT> gmail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/16601 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
.../files/newsboat-2.13-json-c-0.14.0.patch | 37 ++++++++++++++++++++++ |
17 |
net-news/newsboat/newsboat-2.13.ebuild | 3 +- |
18 |
2 files changed, 39 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch b/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..4e46843c6b7 |
23 |
--- /dev/null |
24 |
+++ b/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch |
25 |
@@ -0,0 +1,37 @@ |
26 |
+Patch merged upstream for future versions of newsboat: https://github.com/newsboat/newsboat/pull/883 |
27 |
+ |
28 |
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@×××××××××××××.org> |
29 |
+Date: Mon, 13 Apr 2020 12:52:46 +0200 |
30 |
+Subject: [PATCH] Add support for upcoming json-c 0.14.0. |
31 |
+ |
32 |
+TRUE/FALSE are not defined anymore. 1 and 0 are used instead. |
33 |
+ |
34 |
+ |
35 |
+--- |
36 |
+ src/newsblurapi.cpp | 13 +++++++++++++ |
37 |
+ 1 file changed, 13 insertions(+) |
38 |
+ |
39 |
+diff --git a/src/newsblur_api.cpp b/src/newsblur_api.cpp |
40 |
+index 2d1acdae..e124852d 100644 |
41 |
+--- a/src/newsblur_api.cpp |
42 |
++++ b/src/newsblur_api.cpp |
43 |
+@@ -9,6 +9,19 @@ |
44 |
+ #include "strprintf.h" |
45 |
+ #include "utils.h" |
46 |
+ |
47 |
++/* json-c 0.13.99 does not define TRUE/FALSE anymore |
48 |
++ * the json-c maintainers replaced them with pure 1/0 |
49 |
++ * https://github.com/json-c/json-c/commit/0992aac61f8b |
50 |
++ */ |
51 |
++#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99) |
52 |
++#ifndef FALSE |
53 |
++#define FALSE 0 |
54 |
++#endif |
55 |
++#ifndef TRUE |
56 |
++#define TRUE 1 |
57 |
++#endif |
58 |
++#endif |
59 |
++ |
60 |
+ #define NEWSBLUR_ITEMS_PER_PAGE 6 |
61 |
+ |
62 |
+ namespace newsboat { |
63 |
|
64 |
diff --git a/net-news/newsboat/newsboat-2.13.ebuild b/net-news/newsboat/newsboat-2.13.ebuild |
65 |
index faeebc9cfb6..fb6e8dc0de8 100644 |
66 |
--- a/net-news/newsboat/newsboat-2.13.ebuild |
67 |
+++ b/net-news/newsboat/newsboat-2.13.ebuild |
68 |
@@ -1,4 +1,4 @@ |
69 |
-# Copyright 1999-2018 Gentoo Authors |
70 |
+# Copyright 1999-2020 Gentoo Authors |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
|
73 |
EAPI=6 |
74 |
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND} |
75 |
|
76 |
PATCHES=( |
77 |
"${FILESDIR}"/${PN}-2.11-flags.patch |
78 |
+ "${FILESDIR}"/${PN}-2.13-json-c-0.14.0.patch |
79 |
) |
80 |
|
81 |
src_configure() { |