summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-04-30 19:24:28 +0000
committerTim Harder <radhermit@gentoo.org>2013-04-30 19:24:28 +0000
commit465ee61444590b09f46e74eaa5871fd34ece3ccd (patch)
tree5c07ae6b73e57df53cccd714c12f68220903acff /net-news/newsbeuter/files
parentVersion bump. (diff)
downloadhistorical-465ee61444590b09f46e74eaa5871fd34ece3ccd.tar.gz
historical-465ee61444590b09f46e74eaa5871fd34ece3ccd.tar.bz2
historical-465ee61444590b09f46e74eaa5871fd34ece3ccd.zip
Fix build with >=json-c-0.11 (bug #467354, patch by eroen).
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'net-news/newsbeuter/files')
-rw-r--r--net-news/newsbeuter/files/newsbeuter-2.6-json-c.patch32
1 files changed, 32 insertions, 0 deletions
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
+