community/newsboat: rebuild against json-c-0.14

2 files changed, 82 insertions, 3 deletions

diff --git a/community/newsboat/APKBUILD b/community/newsboat/APKBUILD
index 90ed3f902a2..5fcb964962c 100644
--- a/community/newsboat/APKBUILD
+++ b/community/newsboat/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mike Crute <mike@crute.us>
 pkgname=newsboat
 pkgver=2.19
-pkgrel=0
+pkgrel=1
 pkgdesc="RSS/Atom feed reader for text terminals"
 url="https://newsboat.org/"
 arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust/cargo
@@ -11,7 +11,9 @@ provides="newsbeuter=$pkgver-r$pkgrel"
 makedepends="asciidoctor cargo curl-dev gettext-dev json-c-dev libxml2-dev
 	ncurses-dev sqlite-dev stfl-dev xz"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://github.com/newsboat/newsboat/archive/r$pkgver.tar.gz"
+source="https://github.com/newsboat/newsboat/archive/r$pkgver.tar.gz
+	json-c-0.14.patch
+	"
 
 builddir="$srcdir/$pkgname-r$pkgver"
 
@@ -33,4 +35,5 @@ package() {
 	make DESTDIR="$pkgdir" prefix=/usr install
 }
 
-sha512sums="a996625fbd511ceea2d7439bfe80d1baffb099f5ecacc67a476fc2724da8ed1e539594f0b92e814c1339ab5494aa96894c075f169e8575ed6d5d0f4b9364e05c  r2.19.tar.gz"
+sha512sums="a996625fbd511ceea2d7439bfe80d1baffb099f5ecacc67a476fc2724da8ed1e539594f0b92e814c1339ab5494aa96894c075f169e8575ed6d5d0f4b9364e05c  r2.19.tar.gz
+6b5bbea2b46542ba093a72f21851745018ec2abf35d364e723bd4e37092612593c9d2b6146784ea6ded1a26322c824804cae14d25e2e49dc945f0f899d96252e  json-c-0.14.patch"
diff --git a/community/newsboat/json-c-0.14.patch b/community/newsboat/json-c-0.14.patch
new file mode 100644
index 00000000000..a4d46ea1e3d
--- /dev/null
+++ b/community/newsboat/json-c-0.14.patch
@@ -0,0 +1,76 @@
+diff --git a/src/newsblurapi.cpp b/src/newsblurapi.cpp
+index 2d1acda..99ce791 100644
+--- a/src/newsblurapi.cpp
++++ b/src/newsblurapi.cpp
+@@ -165,7 +165,7 @@ void NewsBlurApi::add_custom_headers(curl_slist** /* custom_headers */)
+ bool request_successfull(json_object* payload)
+ {
+ 	json_object* result{};
+-	if (json_object_object_get_ex(payload, "result", &result) == FALSE) {
++	if (json_object_object_get_ex(payload, "result", &result) == 0) {
+ 		return false;
+ 	} else {
+ 		return !strcmp("ok", json_object_get_string(result));
+@@ -241,7 +241,7 @@ rsspp::Feed NewsBlurApi::fetch_feed(const std::string& id)
+ 
+ 		json_object* stories{};
+ 		if (json_object_object_get_ex(
+-				query_result, "stories", &stories) == FALSE) {
++				query_result, "stories", &stories) == 0) {
+ 			LOG(Level::ERROR,
+ 				"NewsBlurApi::fetch_feed: request returned no "
+ 				"stories");
+@@ -270,37 +270,37 @@ rsspp::Feed NewsBlurApi::fetch_feed(const std::string& id)
+ 			json_object* node{};
+ 
+ 			if (json_object_object_get_ex(
+-					item_obj, "story_title", &node) == TRUE) {
++					item_obj, "story_title", &node) == 1) {
+ 				item.title = json_object_get_string(node);
+ 			}
+ 
+ 			if (json_object_object_get_ex(
+-					item_obj, "story_authors", &node) == TRUE) {
++					item_obj, "story_authors", &node) == 1) {
+ 				item.author = json_object_get_string(node);
+ 			}
+ 
+ 			if (json_object_object_get_ex(item_obj,
+ 					"story_permalink",
+-					&node) == TRUE) {
++					&node) == 1) {
+ 				item.link = json_object_get_string(node);
+ 			}
+ 
+ 			if (json_object_object_get_ex(
+-					item_obj, "story_content", &node) == TRUE) {
++					item_obj, "story_content", &node) == 1) {
+ 				item.content_encoded =
+ 					json_object_get_string(node);
+ 			}
+ 
+ 			const char* article_id{};
+ 			if (json_object_object_get_ex(item_obj, "id", &node) ==
+-				TRUE) {
++				1) {
+ 				article_id = json_object_get_string(node);
+ 			}
+ 			item.guid = id + ID_SEPARATOR +
+ 				(article_id ? article_id : "");
+ 
+ 			if (json_object_object_get_ex(
+-					item_obj, "read_status", &node) == TRUE) {
++					item_obj, "read_status", &node) == 1) {
+ 				if (!static_cast<bool>(
+ 						json_object_get_int(node))) {
+ 					item.labels.push_back(
+@@ -311,7 +311,7 @@ rsspp::Feed NewsBlurApi::fetch_feed(const std::string& id)
+ 			}
+ 
+ 			if (json_object_object_get_ex(
+-					item_obj, "story_date", &node) == TRUE) {
++					item_obj, "story_date", &node) == 1) {
+ 				const char* pub_date =
+ 					json_object_get_string(node);
+ 				item.pubDate_ts = parse_date(pub_date);
+