summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-02-01 04:07:24 +0000
committerTim Harder <radhermit@gentoo.org>2013-02-01 04:07:24 +0000
commit8aaedc426a9f2ea914a99d514172fbf17d6b3e19 (patch)
tree83507fb21f2a849f3285a8a0685d3465e3f02200 /net-news
parentInitial commit, ebuild based on #343213 by Guido Jaekel (diff)
downloadgentoo-2-8aaedc426a9f2ea914a99d514172fbf17d6b3e19.tar.gz
gentoo-2-8aaedc426a9f2ea914a99d514172fbf17d6b3e19.tar.bz2
gentoo-2-8aaedc426a9f2ea914a99d514172fbf17d6b3e19.zip
Fix build with json-c-0.10 (bug #454940).
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'net-news')
-rw-r--r--net-news/newsbeuter/ChangeLog8
-rw-r--r--net-news/newsbeuter/files/newsbeuter-2.5-boolean.patch25
-rw-r--r--net-news/newsbeuter/newsbeuter-2.5.ebuild5
3 files changed, 34 insertions, 4 deletions
diff --git a/net-news/newsbeuter/ChangeLog b/net-news/newsbeuter/ChangeLog
index 127bf649d4a2..0fb580c2a745 100644
--- a/net-news/newsbeuter/ChangeLog
+++ b/net-news/newsbeuter/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-news/newsbeuter
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.40 2012/09/15 07:01:06 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.41 2013/02/01 04:07:24 radhermit Exp $
+
+ 01 Feb 2013; Tim Harder <radhermit@gentoo.org> newsbeuter-2.5.ebuild,
+ +files/newsbeuter-2.5-boolean.patch:
+ Fix build with json-c-0.10 (bug #454940).
15 Sep 2012; Tim Harder <radhermit@gentoo.org> -newsbeuter-2.4.ebuild:
Remove old.
diff --git a/net-news/newsbeuter/files/newsbeuter-2.5-boolean.patch b/net-news/newsbeuter/files/newsbeuter-2.5-boolean.patch
new file mode 100644
index 000000000000..cee31aa8abcb
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.5-boolean.patch
@@ -0,0 +1,25 @@
+From fb9ad743e3f6fea5ae6302de591ad909c892e771 Mon Sep 17 00:00:00 2001
+From: posativ <info@posativ.org>
+Date: Fri, 2 Nov 2012 23:49:44 +0100
+Subject: [PATCH] boolean -> bool
+
+---
+ src/ttrss_api.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ttrss_api.cpp b/src/ttrss_api.cpp
+index 2cb36d4..0b7ac21 100644
+--- a/src/ttrss_api.cpp
++++ b/src/ttrss_api.cpp
+@@ -228,7 +228,7 @@ rsspp::feed ttrss_api::fetch_feed(const std::string& id) {
+ 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"));
++ bool unread = json_object_get_boolean(json_object_object_get(item_obj, "unread"));
+
+ rsspp::item item;
+
+--
+1.8.1.2
+
diff --git a/net-news/newsbeuter/newsbeuter-2.5.ebuild b/net-news/newsbeuter/newsbeuter-2.5.ebuild
index 527ee06575bd..f0d89768ab9a 100644
--- a/net-news/newsbeuter/newsbeuter-2.5.ebuild
+++ b/net-news/newsbeuter/newsbeuter-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-2.5.ebuild,v 1.5 2012/09/15 06:59:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-2.5.ebuild,v 1.6 2013/02/01 04:07:24 radhermit Exp $
EAPI="4"
@@ -40,6 +40,7 @@ src_prepare() {
Makefile
epatch "${FILESDIR}"/${P}-gcc47.patch
+ epatch "${FILESDIR}"/${P}-boolean.patch
}
src_configure() {