[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-commits
Subject:    [gentoo-commits] gentoo-x86 commit in net-news/newsbeuter/files: newsbeuter-2.6-json-c.patch
From:       "Tim Harder (radhermit)" <radhermit () gentoo ! org>
Date:       2013-04-30 19:24:24
Message-ID: 20130430192424.47A9B2171D () flycatcher ! gentoo ! org
[Download RAW message or body]

radhermit    13/04/30 19:24:24

  Added:                newsbeuter-2.6-json-c.patch
  Log:
  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)

Revision  Changes    Path
1.1                  net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch?rev=1.1&view=markup
                
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


Index: newsbeuter-2.6-json-c.patch
===================================================================
> 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


[prev in list] [next in list] [prev in thread] [next in thread]