From: | "Tim Harder (radhermit)" <radhermit@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-news/newsbeuter/files: newsbeuter-2.6-json-c.patch |
Date: | Tue, 30 Apr 2013 19:24:30 |
Message-Id: | 20130430192424.47A9B2171D@flycatcher.gentoo.org |
1 | radhermit 13/04/30 19:24:24 |
2 | |
3 | Added: newsbeuter-2.6-json-c.patch |
4 | Log: |
5 | Fix build with >=json-c-0.11 (bug #467354, patch by eroen). |
6 | |
7 | (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
8 | |
9 | Revision Changes Path |
10 | 1.1 net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: newsbeuter-2.6-json-c.patch |
16 | =================================================================== |
17 | From 37f87d8cf4d6a5c9628a6fa13db122377feafe65 Mon Sep 17 00:00:00 2001 |
18 | From: eroen <eroen@×××××××××××.eu> |
19 | Date: Sun, 28 Apr 2013 18:10:20 +0200 |
20 | Subject: [PATCH] Allow json-c lib named either "json" or "json-c" |
21 | |
22 | With version 0.11, the json-c library (https://github.com/json-c/json-c/wiki) |
23 | renamed their pkgconfig file from "json" to "json-c". |
24 | |
25 | This way, either name is accepted and the website hinting on failure is |
26 | preserved. |
27 | |
28 | See also: https://bugs.gentoo.org/show_bug.cgi?id=467354 |
29 | --- |
30 | config.sh | 2 +- |
31 | 1 file changed, 1 insertion(+), 1 deletion(-) |
32 | |
33 | diff --git a/config.sh b/config.sh |
34 | index b09fce2..f9335b8 100755 |
35 | --- a/config.sh |
36 | +++ b/config.sh |
37 | @@ -99,7 +99,7 @@ check_pkg "sqlite3" || fail "sqlite3" |
38 | check_pkg "libcurl" || check_custom "libcurl" "curl-config" || fail "libcurl" |
39 | check_pkg "libxml-2.0" || check_custom "libxml2" "xml2-config" || fail "libxml2" |
40 | check_pkg "stfl" || fail "stfl" |
41 | -check_pkg "json" || fail "json" |
42 | +( check_pkg "json" || check_pkg "json-c" ) || fail "json-c" |
43 | |
44 | if [ `uname -s` = "Darwin" ]; then |
45 | check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4" |
46 | -- |
47 | 1.8.2.1 |