Update json-glib to 0.8.0.

Overview of changes for 0.8.0
=============================
* Remove the in-tree Vala bindings: they are part of Vala, now
* Remove the in-tree Debian packaging
* Fix bug #958: JsonGenerator does not escape special characters
* Fix bug #965: Conditionally compile the test suite
* Display the filename and line inside the error messages when
  loading from a file
* Fix bug #1203: Correctly terminate a string array
* Fix bug #1393: Regression tests fail on OpenBSD
* Do not leak memory on error code paths
* Improve and clean up the build system
* Make JsonNode completely opaque
* Conditionally generate introspection data on build
* Fix bug #1353: Do not overwrite when copying
* Deprecate json_object_add_member()
* Add convenience accessors for JsonObject and JsonArray
* Add convenience iteration functions for JsonObject and JsonArray
* Automatically promote integers to gint64, to compensate for the
  lack of integer size in the JSON specificiation
* Disallow the inclusion of single header files: only json-glib,h
  and json-gobject.h can be included directly
* Documentation fixes
* Clean up and remove code duplication inside the Parser object

5 files changed, 21 insertions, 36 deletions

diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile
index 247250955b7..d3e84715317 100644
--- a/textproc/json-glib/Makefile
+++ b/textproc/json-glib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/05 13:07:14 obache Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/26 08:27:17 obache Exp $
 #
 
-DISTNAME=	json-glib-0.6.2
+DISTNAME=	json-glib-0.8.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://folks.o-hand.com/~ebassi/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/json-glib/0.8/}
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/JsonGlib
@@ -17,6 +17,10 @@ USE_TOOLS+=	gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	json-glib.pc.in
 
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
+TOOLS_NOOP+=	gtkdoc-rebase
+
 TEST_TARGET=	check
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
diff --git a/textproc/json-glib/PLIST b/textproc/json-glib/PLIST
index 956ac5ef16d..702a70f9d27 100644
--- a/textproc/json-glib/PLIST
+++ b/textproc/json-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/10/26 08:27:17 obache Exp $
 include/json-glib-1.0/json-glib/json-enum-types.h
 include/json-glib-1.0/json-glib/json-generator.h
 include/json-glib-1.0/json-glib/json-glib.h
@@ -10,20 +10,25 @@ lib/libjson-glib-1.0.la
 lib/pkgconfig/json-glib-1.0.pc
 share/gtk-doc/html/json-glib/JsonGenerator.html
 share/gtk-doc/html/json-glib/JsonParser.html
+share/gtk-doc/html/json-glib/annotation-glossary.html
 share/gtk-doc/html/json-glib/ch01.html
 share/gtk-doc/html/json-glib/ch02.html
 share/gtk-doc/html/json-glib/ch03.html
+share/gtk-doc/html/json-glib/ch04.html
 share/gtk-doc/html/json-glib/home.png
 share/gtk-doc/html/json-glib/index.html
 share/gtk-doc/html/json-glib/index.sgml
 share/gtk-doc/html/json-glib/ix01.html
 share/gtk-doc/html/json-glib/ix02.html
+share/gtk-doc/html/json-glib/ix03.html
+share/gtk-doc/html/json-glib/ix04.html
+share/gtk-doc/html/json-glib/ix05.html
 share/gtk-doc/html/json-glib/json-advanced.html
 share/gtk-doc/html/json-glib/json-base.html
 share/gtk-doc/html/json-glib/json-glib-GObject-integration.html
-share/gtk-doc/html/json-glib/json-glib-JsonArray.html
-share/gtk-doc/html/json-glib/json-glib-JsonNode.html
-share/gtk-doc/html/json-glib/json-glib-JsonObject.html
+share/gtk-doc/html/json-glib/json-glib-JSON-Array.html
+share/gtk-doc/html/json-glib/json-glib-JSON-Node.html
+share/gtk-doc/html/json-glib/json-glib-JSON-Object.html
 share/gtk-doc/html/json-glib/json-glib-Versioning-information.html
 share/gtk-doc/html/json-glib/json-glib.devhelp
 share/gtk-doc/html/json-glib/json-glib.devhelp2
diff --git a/textproc/json-glib/buildlink3.mk b/textproc/json-glib/buildlink3.mk
index d713300539b..8966202c0b4 100644
--- a/textproc/json-glib/buildlink3.mk
+++ b/textproc/json-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/10/26 08:27:17 obache Exp $
 #
 
 BUILDLINK_TREE+=	json-glib
diff --git a/textproc/json-glib/distinfo b/textproc/json-glib/distinfo
index 69288387209..e0d59c5ba2b 100644
--- a/textproc/json-glib/distinfo
+++ b/textproc/json-glib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/05 13:07:14 obache Exp $
+$NetBSD: distinfo,v 1.2 2009/10/26 08:27:17 obache Exp $
 
-SHA1 (json-glib-0.6.2.tar.gz) = de4d9b51cc507e97f3427e01a616a9b6fb7fe3cd
-RMD160 (json-glib-0.6.2.tar.gz) = 3e0f9748d64e6372609fdf106f49cf6c25133507
-Size (json-glib-0.6.2.tar.gz) = 453865 bytes
-SHA1 (patch-aa) = 1d97b98516646adc187f5259edd64f6df6b0b498
+SHA1 (json-glib-0.8.0.tar.gz) = c185df080ed41254f67b27193e7e4ab1fe90b7b7
+RMD160 (json-glib-0.8.0.tar.gz) = 0f2e5ecd903006fb432d76694575f776fd50eeec
+Size (json-glib-0.8.0.tar.gz) = 503100 bytes
diff --git a/textproc/json-glib/patches/patch-aa b/textproc/json-glib/patches/patch-aa
deleted file mode 100644
index dc627a2e607..00000000000
--- a/textproc/json-glib/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/05 13:07:14 obache Exp $
-
-http://bugzilla.openedhand.com/show_bug.cgi?id=1203
-
---- json-glib/json-gobject.c.orig	2008-05-20 09:04:47.000000000 +0000
-+++ json-glib/json-gobject.c
-@@ -189,7 +189,7 @@ json_deserialize_pspec (GValue     *valu
-         {
-           JsonArray *array = json_node_get_array (node);
-           guint i, array_len = json_array_get_length (array);
--          GPtrArray *str_array = g_ptr_array_sized_new (array_len);
-+          GPtrArray *str_array = g_ptr_array_sized_new (array_len + 1);
- 
-           for (i = 0; i < array_len; i++)
-             {
-@@ -201,6 +201,7 @@ json_deserialize_pspec (GValue     *valu
-               if (json_node_get_string (val) != NULL);
-                 g_ptr_array_add (str_array, (gpointer) json_node_get_string (val));
-             }
-+          g_ptr_array_add (str_array, NULL);
- 
-           g_value_set_boxed (value, str_array->pdata);
-