From e6af16d620b8ca6f71551cbd50f6520cfb39fbb2 Mon Sep 17 00:00:00 2001 From: cirnatdan Date: Wed, 21 Apr 2021 19:52:29 +0000 Subject: [PATCH] json-glib: Update textprox/json-glib to 1.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Overview of changes for 1.6 ============================== • Add getters with default fallback for JsonObject [Emmanuele Bassi] • #26 - Clarify some expections of the json_object_get_*_member APIs [Debarshi Ray] • #29 - Improve reproducibility of the build [Ravish Bhatia] • Use json_node_unref() with g_autoptr() [Robert Ancell] • Clarify documentation regarding programmer errors [Philip Withnall] • Fix getting immutable root nodes from empty input [Philip Withnall] • Fix various memory leaks [Philip Withnall, Emmanuele Bassi] • Add `--output` option to json-glib-format [Emmanuele Bassi] • Refresh the build [Emmanuele Bassi] • Add glib as a fallback sub-project [Xavier Claessens] • Don't error with MSVC C4819 warning [Seungha Yang] • Fix nullable annotation [Niels De Graef] • Allow disabling tests when building [Stéphane Cerveau] • #39 - Fix default deserialization method for JsonSerializable [Jeremy Philippe] • Stop string to GVariant conversion failing due to unrelated errno changes [Robert Ancell] • Support loading files via memory mapping [Philip Withnall] • #33 - Add a symbol version to all exported symbols [Simon McVittie] • #48 - Fix build with Clang 11 [Dimitry Andric] • Stop using deprecated g_object_newv() constructor [Emmanuele Bassi] • Add ordered iteration to JsonObjectIter [Emmanuele Bassi] • #46 - Document nullability of `json_from_string()` [Emmanuele Bassi] • #45 - Properly detect multiple top-level statements [Emmanuele Bassi] • #41, #22 - Fix library versions on Darwin [Tom Schoonjans] • Fix build reproducibility [!33, Alexander Kanavin] • #26 - Fix parsing of UTF-16 surrogate pairs [James Westman] • #56 - Ignore UTF-8 BOM [Jan-Michael Brummer] --- textproc/json-glib/Makefile | 6 +++--- textproc/json-glib/PLIST | 8 ++++++-- textproc/json-glib/distinfo | 10 +++++----- textproc/json-glib/options.mk | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile index 65b5febe44a2..4fc3bd98d65a 100644 --- a/textproc/json-glib/Makefile +++ b/textproc/json-glib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2021/04/13 06:31:05 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2021/04/21 19:52:29 cirnatdan Exp $ -DISTNAME= json-glib-1.4.4 -PKGREVISION= 2 +DISTNAME= json-glib-1.6.2 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/json-glib/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -17,6 +16,7 @@ TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl USE_TOOLS+= msgfmt pkg-config xgettext MESON_ARGS+= -Dman=true +MESON_ARGS+= -Dgtk_doc=disabled .include "../../mk/compiler.mk" diff --git a/textproc/json-glib/PLIST b/textproc/json-glib/PLIST index f82a9a44dc97..2913a02703e9 100644 --- a/textproc/json-glib/PLIST +++ b/textproc/json-glib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2021/04/12 11:16:11 nia Exp $ +@comment $NetBSD: PLIST,v 1.13 2021/04/21 19:52:29 cirnatdan Exp $ bin/json-glib-format bin/json-glib-validate include/json-glib-1.0/json-glib/json-builder.h @@ -17,7 +17,7 @@ include/json-glib-1.0/json-glib/json-version.h ${PLIST.introspection}lib/girepository-1.0/Json-1.0.typelib lib/libjson-glib-1.0.so lib/libjson-glib-1.0.so.0 -lib/libjson-glib-1.0.so.0.400.4 +lib/libjson-glib-1.0.so.0.600.2 lib/pkgconfig/json-glib-1.0.pc libexec/installed-tests/json-glib-1.0/array libexec/installed-tests/json-glib-1.0/boxed @@ -25,6 +25,7 @@ libexec/installed-tests/json-glib-1.0/builder libexec/installed-tests/json-glib-1.0/generator libexec/installed-tests/json-glib-1.0/gvariant libexec/installed-tests/json-glib-1.0/invalid +libexec/installed-tests/json-glib-1.0/invalid.json libexec/installed-tests/json-glib-1.0/node libexec/installed-tests/json-glib-1.0/object libexec/installed-tests/json-glib-1.0/parser @@ -33,6 +34,7 @@ libexec/installed-tests/json-glib-1.0/reader libexec/installed-tests/json-glib-1.0/serialize-complex libexec/installed-tests/json-glib-1.0/serialize-full libexec/installed-tests/json-glib-1.0/serialize-simple +libexec/installed-tests/json-glib-1.0/skip-bom.json libexec/installed-tests/json-glib-1.0/stream-load.json man/man1/json-glib-format.1 man/man1/json-glib-validate.1 @@ -52,6 +54,7 @@ share/installed-tests/json-glib-1.0/serialize-complex.test share/installed-tests/json-glib-1.0/serialize-full.test share/installed-tests/json-glib-1.0/serialize-simple.test share/locale/as/LC_MESSAGES/json-glib-1.0.mo +share/locale/be/LC_MESSAGES/json-glib-1.0.mo share/locale/bg/LC_MESSAGES/json-glib-1.0.mo share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo share/locale/bs/LC_MESSAGES/json-glib-1.0.mo @@ -81,6 +84,7 @@ share/locale/ky/LC_MESSAGES/json-glib-1.0.mo share/locale/lt/LC_MESSAGES/json-glib-1.0.mo share/locale/lv/LC_MESSAGES/json-glib-1.0.mo share/locale/ml/LC_MESSAGES/json-glib-1.0.mo +share/locale/ms/LC_MESSAGES/json-glib-1.0.mo share/locale/nb/LC_MESSAGES/json-glib-1.0.mo share/locale/ne/LC_MESSAGES/json-glib-1.0.mo share/locale/nl/LC_MESSAGES/json-glib-1.0.mo diff --git a/textproc/json-glib/distinfo b/textproc/json-glib/distinfo index d26a089fdbac..cf588a15cbae 100644 --- a/textproc/json-glib/distinfo +++ b/textproc/json-glib/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2019/06/13 09:45:17 wiz Exp $ +$NetBSD: distinfo,v 1.19 2021/04/21 19:52:29 cirnatdan Exp $ -SHA1 (json-glib-1.4.4.tar.xz) = d9b6d58c0a5b45aa86fbf0da31c65c19254edf96 -RMD160 (json-glib-1.4.4.tar.xz) = 210e602a33672d3ddf978810164692479a61c015 -SHA512 (json-glib-1.4.4.tar.xz) = cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f -Size (json-glib-1.4.4.tar.xz) = 165584 bytes +SHA1 (json-glib-1.6.2.tar.xz) = d08c06ee28fe15980bd6474be789f2ef5ec555ee +RMD160 (json-glib-1.6.2.tar.xz) = 26581a1036fbea61a081e17d881fea533a3544a0 +SHA512 (json-glib-1.6.2.tar.xz) = 8412390a639d368ed11181621739f43bc4900143ac062c3824c7140abec58ca2b09773a415034f03896a4ff63aa3414b492997da532848709238a83c3a068b11 +Size (json-glib-1.6.2.tar.xz) = 170260 bytes diff --git a/textproc/json-glib/options.mk b/textproc/json-glib/options.mk index 1650a3c29b54..9de5374aeb65 100644 --- a/textproc/json-glib/options.mk +++ b/textproc/json-glib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2021/04/12 11:16:11 nia Exp $ +# $NetBSD: options.mk,v 1.6 2021/04/21 19:52:29 cirnatdan Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.json-glib PKG_SUPPORTED_OPTIONS= introspection @@ -11,8 +11,8 @@ PLIST_VARS+= introspection BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 BUILDLINK_DEPMETHOD.gobject-introspection+= build .include "../../devel/gobject-introspection/buildlink3.mk" -MESON_ARGS+= -Dintrospection=true +MESON_ARGS+= -Dintrospection=enabled PLIST.introspection= yes .else -MESON_ARGS+= -Dintrospection=false +MESON_ARGS+= -Dintrospection=disabled .endif