[gnome-continuous] manifest: untag json-c

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit 58ea6810618e6d3fa201cee68a2418681ffe263d
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Thu Jan 22 13:32:16 2015 +0100

    manifest: untag json-c

 manifest.json                                      |    1 -
 ...-failure-by-adding-Wno-error-unused-value.patch |   12 ++++----
 patches/json-c-autogen.patch                       |   28 ++++++++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index ad5c292..080333d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -668,7 +668,6 @@
                 {"src": "gnome:libgnomekbd"}, 
 
                {"src": "git:git://github.com/json-c/json-c.git",
-                "tag": "381f77c5bccf20234a2bddae2b6ac43997faf0a2",
                 "patches": ["json-c-autogen.patch",
                              "json-c-Fix-build-failure-by-adding-Wno-error-unused-value.patch"]},
 
diff --git a/patches/json-c-Fix-build-failure-by-adding-Wno-error-unused-value.patch 
b/patches/json-c-Fix-build-failure-by-adding-Wno-error-unused-value.patch
index 3f232ff..25b4e01 100644
--- a/patches/json-c-Fix-build-failure-by-adding-Wno-error-unused-value.patch
+++ b/patches/json-c-Fix-build-failure-by-adding-Wno-error-unused-value.patch
@@ -1,7 +1,7 @@
-From 8dbf5dc53c307d1b30d93a34355ef0f0329a173f Mon Sep 17 00:00:00 2001
+From f3581f5d55d360724d67009e6004721f77d51fc6 Mon Sep 17 00:00:00 2001
 From: Alexander Larsson <alexl redhat com>
 Date: Fri, 19 Sep 2014 08:52:24 +0200
-Subject: [PATCH] Fix build failure by adding -Wno-error=unused-value
+Subject: [PATCH 2/2] Fix build failure by adding -Wno-error=unused-value
 
 I got this:
 ../json_tokener.c: In function 'json_tokener_parse_ex':
@@ -13,13 +13,13 @@ I got this:
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am.inc b/Makefile.am.inc
-index b1ebce8..09278a4 100644
+index fec591b..4163179 100644
 --- a/Makefile.am.inc
 +++ b/Makefile.am.inc
 @@ -1,2 +1,2 @@
--AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
-+AM_CFLAGS = -Wall -Wwrite-strings -Werror -Wno-error=unused-value -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter 
-std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter 
-Wno-error=unused-value -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
  
 -- 
-2.1.0
+1.8.3.1
 
diff --git a/patches/json-c-autogen.patch b/patches/json-c-autogen.patch
index 480eb27..2ffbf82 100644
--- a/patches/json-c-autogen.patch
+++ b/patches/json-c-autogen.patch
@@ -1,26 +1,28 @@
-From 6d9437725acbeaf9619beb326d6363e7dd96f1e2 Mon Sep 17 00:00:00 2001
+From 0a87c9b9d64ed6df42c64f86fd8dedb7911fcf0e Mon Sep 17 00:00:00 2001
 From: Colin Walters <walters verbum org>
 Date: Wed, 11 Jul 2012 15:33:49 -0400
-Subject: [PATCH] autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1
+Subject: [PATCH 1/2] autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1
 
 First, we should be able to execute as "./autogen.sh".  Second,
 add support for NOCONFIGURE=1.  For more information,
 see http://people.gnome.org/~walters/docs/build-api.txt
 ---
- autogen.sh |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ autogen.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/autogen.sh b/autogen.sh
-index 990096c..169d689 100755
+index 69e765a..4ebafa9 100755
 --- a/autogen.sh
 +++ b/autogen.sh
-@@ -1,2 +1,5 @@
-+#!/bin/sh
- autoreconf -v --install || exit 1
--exec ./configure  "$@"
-+if test -z "$NOCONFIGURE"; then
-+    exec ./configure  "$@"
-+fi
+@@ -9,5 +9,7 @@ if [ $# -gt 0 ] ; then
+               shift 1
+               ;;
+       esac
+-    exec ./configure  "$@"
++      if test -z "$NOCONFIGURE"; then
++              exec ./configure  "$@"
++      fi
+ fi
 -- 
-1.7.10.4
+1.8.3.1