diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /net-news/newsboat/files | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'net-news/newsboat/files')
| -rw-r--r-- | net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch | 34 | ||||
| -rw-r--r-- | net-news/newsboat/files/newsboat-2.23-flags.patch | 16 |
2 files changed, 16 insertions, 34 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 deleted file mode 100644 index 79c4da5e726a..000000000000 --- a/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/files/newsboat-2.23-flags.patch b/net-news/newsboat/files/newsboat-2.23-flags.patch new file mode 100644 index 000000000000..a15cfbd3d1af --- /dev/null +++ b/net-news/newsboat/files/newsboat-2.23-flags.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index ee890bc3..c5fed3b6 100644 +--- a/Makefile ++++ b/Makefile +@@ -49,9 +49,9 @@ CXX_FOR_BUILD?=$(CXX) + # compiler and linker flags + DEFINES=-DLOCALEDIR='"$(localedir)"' + +-WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code ++WARNFLAGS=-Wall -Wextra -Wunreachable-code + INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss -I$(relative_cargo_target_dir)/cxxbridge/libnewsboat-ffi/src/ +-BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES) ++BARE_CXXFLAGS=-std=c++11 $(INCLUDES) + LDFLAGS+=-L. + + # Constants |