diff options
author | Tim Harder <radhermit@gentoo.org> | 2013-04-30 19:24:24 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2013-04-30 19:24:24 +0000 |
commit | bb89fd379207751035d69c7bb0a3ff8d0827fe18 (patch) | |
tree | 6c4e6d998980d3c2bbc6b86a8fd63e238c245637 /net-news | |
parent | Version bump. (diff) | |
download | gentoo-2-bb89fd379207751035d69c7bb0a3ff8d0827fe18.tar.gz gentoo-2-bb89fd379207751035d69c7bb0a3ff8d0827fe18.tar.bz2 gentoo-2-bb89fd379207751035d69c7bb0a3ff8d0827fe18.zip |
Fix build with >=json-c-0.11 (bug #467354, patch by eroen).
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'net-news')
-rw-r--r-- | net-news/newsbeuter/ChangeLog | 6 | ||||
-rw-r--r-- | net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch | 32 | ||||
-rw-r--r-- | net-news/newsbeuter/newsbeuter-2.6.ebuild | 6 |
3 files changed, 41 insertions, 3 deletions
diff --git a/net-news/newsbeuter/ChangeLog b/net-news/newsbeuter/ChangeLog index 348c493e7429..9c1f0bc8222f 100644 --- a/net-news/newsbeuter/ChangeLog +++ b/net-news/newsbeuter/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-news/newsbeuter # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.42 2013/03/20 03:22:23 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.43 2013/04/30 19:24:24 radhermit Exp $ + + 30 Apr 2013; Tim Harder <radhermit@gentoo.org> newsbeuter-2.6.ebuild, + +files/newsbeuter-2.6-json-c.patch: + Fix build with >=json-c-0.11 (bug #467354, patch by eroen). *newsbeuter-2.6 (20 Mar 2013) diff --git a/net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch b/net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch new file mode 100644 index 000000000000..0ec5d9bf36e7 --- /dev/null +++ b/net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch @@ -0,0 +1,32 @@ +From 37f87d8cf4d6a5c9628a6fa13db122377feafe65 Mon Sep 17 00:00:00 2001 +From: eroen <eroen@occam.eroen.eu> +Date: Sun, 28 Apr 2013 18:10:20 +0200 +Subject: [PATCH] Allow json-c lib named either "json" or "json-c" + +With version 0.11, the json-c library (https://github.com/json-c/json-c/wiki) +renamed their pkgconfig file from "json" to "json-c". + +This way, either name is accepted and the website hinting on failure is +preserved. + +See also: https://bugs.gentoo.org/show_bug.cgi?id=467354 +--- + config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.sh b/config.sh +index b09fce2..f9335b8 100755 +--- a/config.sh ++++ b/config.sh +@@ -99,7 +99,7 @@ check_pkg "sqlite3" || fail "sqlite3" + check_pkg "libcurl" || check_custom "libcurl" "curl-config" || fail "libcurl" + check_pkg "libxml-2.0" || check_custom "libxml2" "xml2-config" || fail "libxml2" + check_pkg "stfl" || fail "stfl" +-check_pkg "json" || fail "json" ++( check_pkg "json" || check_pkg "json-c" ) || fail "json-c" + + if [ `uname -s` = "Darwin" ]; then + check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4" +-- +1.8.2.1 + diff --git a/net-news/newsbeuter/newsbeuter-2.6.ebuild b/net-news/newsbeuter/newsbeuter-2.6.ebuild index 5fef23c1af3b..145b625dc113 100644 --- a/net-news/newsbeuter/newsbeuter-2.6.ebuild +++ b/net-news/newsbeuter/newsbeuter-2.6.ebuild @@ -1,10 +1,10 @@ # 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.6.ebuild,v 1.1 2013/03/20 03:22:23 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-2.6.ebuild,v 1.2 2013/04/30 19:24:24 radhermit Exp $ EAPI="5" -inherit toolchain-funcs +inherit toolchain-funcs eutils DESCRIPTION="A RSS/Atom feed reader for the text console" HOMEPAGE="http://www.newsbeuter.org/index.html" @@ -38,6 +38,8 @@ src_prepare() { -e "s:-ggdb:${CXXFLAGS}:" \ -e "s:^CXX=.*:CXX=$(tc-getCXX):" \ Makefile + + epatch "${FILESDIR}"/${P}-json-c.patch } src_configure() { |