head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.56
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.54
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.52
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.50
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.48
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.46
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.44
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.42
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.40
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.38
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.36
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.34
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.32
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.30
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.28
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.26
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.24
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.22
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.20
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.18
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.16
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.14
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.12
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.10
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.6
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.8
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.4
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.2;
locks; strict;
comment	@// @;


1.1
date	2019.07.02.07.37.54;	author nia;	state Exp;
branches
	1.1.2.1;
next	;
commitid	pI0CT0RCWjOhprtB;

1.1.2.1
date	2019.07.02.07.37.54;	author bsiegert;	state dead;
branches;
next	1.1.2.2;
commitid	uT5jRAKTqfSnhttB;

1.1.2.2
date	2019.07.02.13.15.50;	author bsiegert;	state Exp;
branches;
next	;
commitid	uT5jRAKTqfSnhttB;


desc
@@


1.1
log
@newsbeuter: Fix build with new json-c.

https://github.com/json-c/json-c/issues/304

XXX pullup?
@
text
@$NetBSD$

Update for newer json-c API.

https://github.com/json-c/json-c/issues/304

--- src/oldreader_api.cpp.orig	2015-02-19 10:56:59.000000000 +0000
+++ src/oldreader_api.cpp
@@@@ -134,7 +134,7 @@@@ std::vector<tagged_feedurl> oldreader_ap
 	// TODO: parse result
 
 	struct json_object * reply = json_tokener_parse(result.c_str());
-	if (is_error(reply)) {
+	if (reply == NULL) {
 		LOG(LOG_ERROR, "oldreader_api::get_subscribed_urls: failed to parse response as JSON.");
 		return urls;
 	}
@


1.1.2.1
log
@file patch-src_oldreader__api.cpp was added on branch pkgsrc-2019Q2 on 2019-07-02 13:15:50 +0000
@
text
@d1 17
@


1.1.2.2
log
@Pullup ticket #5986 - requested by nia
news/newsbeuter: build fix

Revisions pulled up:
- news/newsbeuter/Makefile                                      1.23
- news/newsbeuter/distinfo                                      1.3
- news/newsbeuter/patches/patch-src_feedhq__api.cpp             1.1
- news/newsbeuter/patches/patch-src_oldreader__api.cpp          1.1
- news/newsbeuter/patches/patch-src_ttrss__api.cpp              1.1

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Tue Jul  2 07:37:54 UTC 2019

   Modified Files:
   	pkgsrc/news/newsbeuter: Makefile distinfo
   Added Files:
   	pkgsrc/news/newsbeuter/patches: patch-src_feedhq__api.cpp
   	    patch-src_oldreader__api.cpp patch-src_ttrss__api.cpp

   Log Message:
   newsbeuter: Fix build with new json-c.

   https://github.com/json-c/json-c/issues/304

   XXX pullup?
@
text
@a0 17
$NetBSD: patch-src_oldreader__api.cpp,v 1.1 2019/07/02 07:37:54 nia Exp $

Update for newer json-c API.

https://github.com/json-c/json-c/issues/304

--- src/oldreader_api.cpp.orig	2015-02-19 10:56:59.000000000 +0000
+++ src/oldreader_api.cpp
@@@@ -134,7 +134,7 @@@@ std::vector<tagged_feedurl> oldreader_ap
 	// TODO: parse result
 
 	struct json_object * reply = json_tokener_parse(result.c_str());
-	if (is_error(reply)) {
+	if (reply == NULL) {
 		LOG(LOG_ERROR, "oldreader_api::get_subscribed_urls: failed to parse response as JSON.");
 		return urls;
 	}
@