[newsbeuter] Apply newsbeuter-2.5-json-boolean-include.patch
Jamie Nguyen
jamielinux at fedoraproject.org
Fri Feb 22 10:01:21 UTC 2013
commit 2eceee827e26ad6cd64b04730c9a676b52f8af55
Author: Jamie Nguyen <j at jamielinux.com>
Date: Fri Feb 22 10:01:05 2013 +0000
Apply newsbeuter-2.5-json-boolean-include.patch
newsbeuter-2.5-json-boolean-include.patch | 29 +++++++++++++++++++++++++++++
newsbeuter.spec | 8 +++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/newsbeuter-2.5-json-boolean-include.patch b/newsbeuter-2.5-json-boolean-include.patch
new file mode 100644
index 0000000..7c34b5b
--- /dev/null
+++ b/newsbeuter-2.5-json-boolean-include.patch
@@ -0,0 +1,29 @@
+Description: propagate boolean json type
+Apparently the libjson project decided to rename their boolean type to
+json_bool...
+Author: Nico Golde <nion at debian.org>
+Bug-Debian: http://bugs.debian.org/689225
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: vendor
+Bug: http://bugs.debian.org/689225
+Bug-Debian: http://bugs.debian.org/689225
+Forwarded:
+
+Index: newsbeuter-2.5/src/ttrss_api.cpp
+===================================================================
+--- newsbeuter-2.5.orig/src/ttrss_api.cpp 2012-09-30 17:25:23.000000000 +0200
++++ newsbeuter-2.5/src/ttrss_api.cpp 2012-09-30 17:43:24.000000000 +0200
+@@ -220,7 +220,7 @@
+ const char * link = json_object_get_string(json_object_object_get(item_obj, "link"));
+ const char * content = json_object_get_string(json_object_object_get(item_obj, "content"));
+ time_t updated = (time_t)json_object_get_int(json_object_object_get(item_obj, "updated"));
+- boolean unread = json_object_get_boolean(json_object_object_get(item_obj, "unread"));
++ json_bool unread = json_object_get_boolean(json_object_object_get(item_obj, "unread"));
+
+ rsspp::item item;
+
diff --git a/newsbeuter.spec b/newsbeuter.spec
index 969c78b..65a7ac1 100644
--- a/newsbeuter.spec
+++ b/newsbeuter.spec
@@ -1,6 +1,6 @@
Name: newsbeuter
Version: 2.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Configurable text-based feed reader
Group: Applications/Internet
@@ -8,6 +8,8 @@ License: MIT
URL: http://newsbeuter.org/
Source0: http://newsbeuter.org/downloads/%{name}-%{version}.tar.gz
Patch0: newsbeuter-2.5-includes.patch
+# https://code.google.com/p/newsbeuter/issues/detail?id=303
+Patch1: newsbeuter-2.5-json-boolean-include.patch
BuildRequires: gettext
BuildRequires: json-c-devel
@@ -29,6 +31,7 @@ keyboard.
%prep
%setup -q
%patch0 -p1 -b .includes
+%patch1 -p1 -b .json-boolean-include
%build
@@ -54,6 +57,9 @@ find %{buildroot}/%{_prefix}/share/man -type f -exec chmod -x {} ';'
%changelog
+* Fri Feb 22 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 2.5-5
+- apply newsbeuter-2.5-json-boolean-include.patch
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list