Rebuilt for libjson-c.so.3
This commit is contained in:
parent
1682488a36
commit
4d9fd75609
53
newsbeuter-2.9_json-c_013.patch
Normal file
53
newsbeuter-2.9_json-c_013.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
Index: newsbeuter-2.9/src/feedhq_api.cpp
|
||||||
|
===================================================================
|
||||||
|
--- newsbeuter-2.9.orig/src/feedhq_api.cpp
|
||||||
|
+++ newsbeuter-2.9/src/feedhq_api.cpp
|
||||||
|
@@ -132,7 +132,7 @@ std::vector<tagged_feedurl> feedhq_api::
|
||||||
|
// TODO: parse result
|
||||||
|
|
||||||
|
struct json_object * reply = json_tokener_parse(result.c_str());
|
||||||
|
- if (is_error(reply)) {
|
||||||
|
+ if (reply == NULL) {
|
||||||
|
LOG(LOG_ERROR, "feedhq_api::get_subscribed_urls: failed to parse response as JSON.");
|
||||||
|
return urls;
|
||||||
|
}
|
||||||
|
Index: newsbeuter-2.9/src/oldreader_api.cpp
|
||||||
|
===================================================================
|
||||||
|
--- newsbeuter-2.9.orig/src/oldreader_api.cpp
|
||||||
|
+++ newsbeuter-2.9/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;
|
||||||
|
}
|
||||||
|
Index: newsbeuter-2.9/src/ttrss_api.cpp
|
||||||
|
===================================================================
|
||||||
|
--- newsbeuter-2.9.orig/src/ttrss_api.cpp
|
||||||
|
+++ newsbeuter-2.9/src/ttrss_api.cpp
|
||||||
|
@@ -113,19 +113,19 @@ struct json_object * ttrss_api::run_op(c
|
||||||
|
LOG(LOG_DEBUG, "ttrss_api::run_op(%s,...): post=%s reply = %s", op.c_str(), req_data.c_str(), result.c_str());
|
||||||
|
|
||||||
|
struct json_object * reply = json_tokener_parse(result.c_str());
|
||||||
|
- if (is_error(reply)) {
|
||||||
|
+ if (reply == NULL) {
|
||||||
|
LOG(LOG_ERROR, "ttrss_api::run_op: reply failed to parse: %s", result.c_str());
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct json_object * status = json_object_object_get(reply, "status");
|
||||||
|
- if (is_error(status)) {
|
||||||
|
+ if (status == NULL) {
|
||||||
|
LOG(LOG_ERROR, "ttrss_api::run_op: no status code");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct json_object * content = json_object_object_get(reply, "content");
|
||||||
|
- if (is_error(content)) {
|
||||||
|
+ if (content == NULL) {
|
||||||
|
LOG(LOG_ERROR, "ttrss_api::run_op: no content part in answer from server");
|
||||||
|
return NULL;
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
Name: newsbeuter
|
Name: newsbeuter
|
||||||
Version: 2.9
|
Version: 2.9
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Configurable text-based feed reader
|
Summary: Configurable text-based feed reader
|
||||||
|
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
@ -14,6 +14,7 @@ Patch0: %{name}-2.8-Improve-solarized-dark-colorscheme.patch
|
|||||||
Patch1: %{name}-2.8-Add-solarized-light-colorscheme.patch
|
Patch1: %{name}-2.8-Add-solarized-light-colorscheme.patch
|
||||||
|
|
||||||
Patch2: %{name}-2.9-ncurses6.patch
|
Patch2: %{name}-2.9-ncurses6.patch
|
||||||
|
Patch3: %{name}-2.9_json-c_013.patch
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: json-c-devel
|
BuildRequires: json-c-devel
|
||||||
@ -40,10 +41,14 @@ keyboard.
|
|||||||
%if 0%{?fedora} > 23
|
%if 0%{?fedora} > 23
|
||||||
%patch2 -p1 -b .ncurses6
|
%patch2 -p1 -b .ncurses6
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?fedora} >= 28
|
||||||
|
%patch3 -p1 -b .json-c_013
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CXXFLAGS="%{optflags}"
|
export CXXFLAGS="%{optflags}"
|
||||||
|
export LDFLAGS="%{?__global_ldflags}"
|
||||||
./config.sh
|
./config.sh
|
||||||
make %{?_smp_mflags} prefix=%{_prefix}
|
make %{?_smp_mflags} prefix=%{_prefix}
|
||||||
|
|
||||||
@ -68,6 +73,9 @@ find contrib/ -type f -exec chmod -x '{}' ';'
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.9-7
|
||||||
|
- Rebuilt for libjson-c.so.3
|
||||||
|
|
||||||
* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.9-6
|
* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.9-6
|
||||||
- Fix build by adding BR: perl-interpreter
|
- Fix build by adding BR: perl-interpreter
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user