Update to 1.0.4:

    Release JSON-GLib 1.0.4

    build: Enable subdir-objects

    We need to remove the path specification inside the sources listing, and
    modify the enumeration type and marshallers generation rules to cope
    with it (by adding the $(srcdir) when needed). This is similar to the
    changes there were made to Clutter.



    Added Bosnian translation



    build: Enable gtkdoc-check

    We can verify that the documentation is correct and up to date every
    time we distcheck by turning on the gtk-doc check tool.



    build: Clean up gtk-doc stanzas

    We need to ensure that gtk-doc looks into both the srcdir and the
    builddir in order to find all annotations.

    We also don't need to have the .types file under revision control:
    gtk-doc is perfectly capable of rebuilding it by itself.



    docs: Add missing symbol indices



    docs: Add missing annotations



    configure: test(1) uses = to test for string equality

    https://bugzilla.gnome.org/show_bug.cgi?id=711600
    https://bugzilla.gnome.org/show_bug.cgi?id=746143



    Updated Slovak translation



    MSVC Builds: Rename "Install" Projects

    Rename the install projects as json-glib-install, so that it would be
    easier for one to integrate the project set in a grand solution that can be
    used to build the entire stack, such as for Clutter.



    MSVC Builds: "Install" the .pdb Files

    "Install" the .pdb files for the json-glib DLL and the tools to ease
    debugging people developing or using json-glib, as the .pdb files are
    already generated for all builds.



    MSVC 2010 Projects: Clean Up "Installation"

    The empty lines in the property sheets are not really needed, so remove
    them.



    MSVC Builds: Speed Up Release Builds

    Use the multiprocessor compilation (/MP) option, which can cut down release
    build times by quite a bit.  This will emit a brief warning on debug
    builds, but otherwise the build will proceed as normal.

    Also use the /d2Zi+ option for MSVC 2010 (and later) builds so that more
    useful information can be logged to the .pdb files for the release builds.



    json-gvariant: Parse json doubles that are whole numbers

    The json gvariant serializer encodes whole number doubles without
    a dot. The deserializer needs to be able to parse these as well.

    Fix problem, and add test cases.

    https://bugzilla.gnome.org/show_bug.cgi?id=724319



    builder: Add missing (transfer) annotation to json_builder_add_value()

    Document and annotate the fact that json_builder_add_value() takes
    ownership of the JsonNode passed in to it.

    https://bugzilla.gnome.org/show_bug.cgi?id=743475



    reader: Maintain a stack of member names

    This fixes the case where, with nested objects, we call:
        json_reader_read_member (reader, "outer");
        // json_reader_get_member_name (reader) == "outer"

        json_reader_read_member (reader, "inner");
        // json_reader_get_member_name (reader) == "inner"
        // do something useful
        json_reader_end_member (reader);
    but at the end, the following assertion no longer holds:
        // json_reader_get_member_name (reader) == "outer"
    even though the JsonReader state should have been reset after ending the
    inner node.

    Fix it by maintaining a stack of member names. This works with both
    json_reader_read_member() and json_reader_read_element(). Updates to the
    unit tests are included.

    https://bugzilla.gnome.org/show_bug.cgi?id=741824



    Handle serialization/deserialization of glong gulong and guint64

    Long and unsigned long was properly serialized but not deserialized, guint64
    handling is not ideal as the type is cast into a gint64, however this is
    better than not handling the fundamental type at all.

    https://bugzilla.gnome.org/show_bug.cgi?id=725972



    Drop unnecessary '_' prefix from json_marshal

    It's not public API anyway, and we use annotations instead of the '_'
    prefix.



    Updated Turkish translation



    Updated Swedish translation



    Updated Assamese translation



    Updated German translation



    doap category core



    Clean up the enumeration type template



    Include "config.h" in the enum types template

    Expands the symbol annotation correctly.



    Updated Greek translation



    MSVC 2010+ Projects: Update "Installation" Process

    Currently, due to the way that Visual Studio 2010+ projects are handled,
    the "install" project does not re-build upon changes to the sources, as it
    does not believe that its dependencies have changed, although the changed
    sources are automatically recompiled.  This means that if a part or more
    of the solution does not build, or if the sources need some other fixes
    or enhancements, the up-to-date build is not copied automatically, which
    can be misleading.

    Improve on the situation by forcing the "install" project to trigger its
    rebuild, so that the updated binaries can be copied.  This does trigger an
    MSBuild warning, but having that warning is way better than not having an
    up-to-date build, especially during testing and development.



    [l10n] Update Catalan translation



    Post-release version bump to 1.0.3

5 files changed, 10 insertions, 41 deletions

diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile
index 5bfce5bca79..99eaa7c4c1a 100644
--- a/textproc/json-glib/Makefile
+++ b/textproc/json-glib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2015/03/13 11:21:39 prlw1 Exp $
+# $NetBSD: Makefile,v 1.24 2015/07/01 09:32:36 wiz Exp $
 
-DISTNAME=	json-glib-1.0.2
+DISTNAME=	json-glib-1.0.4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/json-glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/textproc/json-glib/PLIST b/textproc/json-glib/PLIST
index de0abd5e029..315ce879ebc 100644
--- a/textproc/json-glib/PLIST
+++ b/textproc/json-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/04/20 09:36:29 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/07/01 09:32:36 wiz Exp $
 bin/json-glib-format
 bin/json-glib-validate
 include/json-glib-1.0/json-glib/json-builder.h
@@ -38,6 +38,8 @@ share/gtk-doc/html/json-glib/ix05.html
 share/gtk-doc/html/json-glib/ix06.html
 share/gtk-doc/html/json-glib/ix07.html
 share/gtk-doc/html/json-glib/ix08.html
+share/gtk-doc/html/json-glib/ix09.html
+share/gtk-doc/html/json-glib/ix10.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-format-tool.html
@@ -66,6 +68,7 @@ share/gtk-doc/html/json-glib/up.png
 ${PLIST.nls}share/locale/as/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/bs/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/ca/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/ca@valencia/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/cs/LC_MESSAGES/json-glib-1.0.mo
diff --git a/textproc/json-glib/distinfo b/textproc/json-glib/distinfo
index 2a258573991..bcab135f470 100644
--- a/textproc/json-glib/distinfo
+++ b/textproc/json-glib/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.14 2015/03/13 11:21:39 prlw1 Exp $
+$NetBSD: distinfo,v 1.15 2015/07/01 09:32:36 wiz Exp $
 
-SHA1 (json-glib-1.0.2.tar.xz) = 17de45d0be56910dcaef62712e95626d7989ee52
-RMD160 (json-glib-1.0.2.tar.xz) = f80ecfdd7f6a0f8fa2dd8f5cdf704a301582bad5
-Size (json-glib-1.0.2.tar.xz) = 550340 bytes
-SHA1 (patch-build_autotools_glibtests.m4) = 4400f8f35f9dbd39835474fa11641192e845adcf
-SHA1 (patch-configure) = 87150c39ebeb5083168275eeab4d855c7dc6fcf1
+SHA1 (json-glib-1.0.4.tar.xz) = efdf5a66d1d8fb504448a40ba2352bbfef301074
+RMD160 (json-glib-1.0.4.tar.xz) = db5411f0a1247ba9133f8dd70c4bd1de66be5cff
+Size (json-glib-1.0.4.tar.xz) = 557236 bytes
diff --git a/textproc/json-glib/patches/patch-build_autotools_glibtests.m4 b/textproc/json-glib/patches/patch-build_autotools_glibtests.m4
deleted file mode 100644
index 307854e18d2..00000000000
--- a/textproc/json-glib/patches/patch-build_autotools_glibtests.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-build_autotools_glibtests.m4,v 1.2 2015/03/13 11:21:39 prlw1 Exp $
-
-* test(1) portability fix
-  https://bugzilla.gnome.org/show_bug.cgi?id=746143
-
---- build/autotools/glibtests.m4.orig	2013-11-22 17:36:08.000000000 +0000
-+++ build/autotools/glibtests.m4
-@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
-                   *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
-                  esac])
-   AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
--  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
-+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-     AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
-     AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
-   fi
diff --git a/textproc/json-glib/patches/patch-configure b/textproc/json-glib/patches/patch-configure
deleted file mode 100644
index 5295304c5f0..00000000000
--- a/textproc/json-glib/patches/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2015/03/13 11:21:39 prlw1 Exp $
-
-* test(1) portability fix
-  https://bugzilla.gnome.org/show_bug.cgi?id=746143
-
---- configure.orig	2014-04-20 08:58:47.000000000 +0000
-+++ configure
-@@ -12430,7 +12430,7 @@ else
-   ENABLE_ALWAYS_BUILD_TESTS_FALSE=
- fi
- 
--  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
-+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-     installed_test_metadir=${datadir}/installed-tests/json-glib
- 
-     installed_testdir=${libexecdir}/installed-tests/json-glib