Received: by mail.netbsd.org (Postfix, from userid 605) id 1B4DF84DCA; Thu, 13 Jun 2019 09:45:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9599284D8E for ; Thu, 13 Jun 2019 09:45:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id XiDhNyuApiVd for ; Thu, 13 Jun 2019 09:45:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A811384C8B for ; Thu, 13 Jun 2019 09:45:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9B6F4FBF4; Thu, 13 Jun 2019 09:45:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156041911715460" MIME-Version: 1.0 Date: Thu, 13 Jun 2019 09:45:17 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/textproc/json-glib To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20190613094517.9B6F4FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156041911715460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: wiz Date: Thu Jun 13 09:45:17 UTC 2019 Modified Files: pkgsrc/textproc/json-glib: Makefile PLIST distinfo Log Message: json-glib: update to 1.4.4. Switch to meson build system. Based on wip/json-glib. Overview of changes for 1.4 ============================== • Use Meson as the only build system • #773504 - Avoid extra allocations [Garrett Regier] • #780550 - meson error looking for python3 [Daniele Forghieri] • #769206 - docs: Clarify when NULL might be returned [Matthew Leeds] • #766281 - utils/json_from_string: Don't reset user-provided error argument [Heinrich Fink] • #758580 - json_reader_is_value returns TRUE for null type but json_reader_get_value throws an error [Robert Ancell] • #768788 - Incorrect account of jsonPath syntax in doc [Allin Cottrell] • #774688 - json_from_string() could be optimized to avoid copying the root node [Ole André Vadla Ravnås] To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/json-glib/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/json-glib/PLIST cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/json-glib/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156041911715460 Content-Disposition: inline Content-Length: 8373 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/json-glib/Makefile diff -u pkgsrc/textproc/json-glib/Makefile:1.27 pkgsrc/textproc/json-glib/Makefile:1.28 --- pkgsrc/textproc/json-glib/Makefile:1.27 Sun Oct 15 23:19:13 2017 +++ pkgsrc/textproc/json-glib/Makefile Thu Jun 13 09:45:17 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2017/10/15 23:19:13 prlw1 Exp $ +# $NetBSD: Makefile,v 1.28 2019/06/13 09:45:17 wiz Exp $ -DISTNAME= json-glib-1.2.8 +DISTNAME= json-glib-1.4.4 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/json-glib/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -10,15 +10,16 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= JSON parser for GLib-based libraries and applications LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes USE_TOOLS+= gmake msgfmt msgmerge pkg-config xgettext CONFIGURE_ARGS+= --disable-man -PKGCONFIG_OVERRIDE+= json-glib.pc.in +# workaround for build failure +# https://gitlab.gnome.org/GNOME/json-glib/issues/35 +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/json-glib -TEST_TARGET= check +do-test: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C output test .include "options.mk" @@ -31,4 +32,5 @@ PRINT_PLIST_AWK+= \ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0 .include "../../devel/glib2/buildlink3.mk" +.include "../../devel/py-meson/build.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/json-glib/PLIST diff -u pkgsrc/textproc/json-glib/PLIST:1.10 pkgsrc/textproc/json-glib/PLIST:1.11 --- pkgsrc/textproc/json-glib/PLIST:1.10 Sat Sep 9 06:15:37 2017 +++ pkgsrc/textproc/json-glib/PLIST Thu Jun 13 09:45:17 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2017/09/09 06:15:37 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.11 2019/06/13 09:45:17 wiz Exp $ bin/json-glib-format bin/json-glib-validate include/json-glib-1.0/json-glib/json-builder.h @@ -15,59 +15,40 @@ include/json-glib-1.0/json-glib/json-uti include/json-glib-1.0/json-glib/json-version-macros.h 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.la +lib/libjson-glib-1.0.so +lib/libjson-glib-1.0.so.0 +lib/libjson-glib-1.0.so.0.400.4 lib/pkgconfig/json-glib-1.0.pc +libexec/installed-tests/json-glib-1.0/array +libexec/installed-tests/json-glib-1.0/boxed +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/node +libexec/installed-tests/json-glib-1.0/object +libexec/installed-tests/json-glib-1.0/parser +libexec/installed-tests/json-glib-1.0/path +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/stream-load.json ${PLIST.introspection}share/gir-1.0/Json-1.0.gir -share/gtk-doc/html/json-glib/JsonBuilder.html -share/gtk-doc/html/json-glib/JsonGenerator.html -share/gtk-doc/html/json-glib/JsonParser.html -share/gtk-doc/html/json-glib/JsonPath.html -share/gtk-doc/html/json-glib/JsonReader.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/ch06.html -share/gtk-doc/html/json-glib/home.png -share/gtk-doc/html/json-glib/index.html -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/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/ix11.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 -share/gtk-doc/html/json-glib/json-glib-Boxed-Types-Serialization.html -share/gtk-doc/html/json-glib/json-glib-GObject-Serialization.html -share/gtk-doc/html/json-glib/json-glib-JSON-Array.html -share/gtk-doc/html/json-glib/json-glib-JSON-GVariant-Integration.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-Serializable-Interface.html -share/gtk-doc/html/json-glib/json-glib-Utility-API.html -share/gtk-doc/html/json-glib/json-glib-Versioning-information.html -share/gtk-doc/html/json-glib/json-glib.devhelp2 -share/gtk-doc/html/json-glib/json-overview.html -share/gtk-doc/html/json-glib/json-streams.html -share/gtk-doc/html/json-glib/json-tools.html -share/gtk-doc/html/json-glib/json-validate-tool.html -share/gtk-doc/html/json-glib/left-insensitive.png -share/gtk-doc/html/json-glib/left.png -share/gtk-doc/html/json-glib/license.html -share/gtk-doc/html/json-glib/right-insensitive.png -share/gtk-doc/html/json-glib/right.png -share/gtk-doc/html/json-glib/style.css -share/gtk-doc/html/json-glib/tools.html -share/gtk-doc/html/json-glib/up-insensitive.png -share/gtk-doc/html/json-glib/up.png +share/installed-tests/json-glib-1.0/array.test +share/installed-tests/json-glib-1.0/boxed.test +share/installed-tests/json-glib-1.0/builder.test +share/installed-tests/json-glib-1.0/generator.test +share/installed-tests/json-glib-1.0/gvariant.test +share/installed-tests/json-glib-1.0/invalid.test +share/installed-tests/json-glib-1.0/node.test +share/installed-tests/json-glib-1.0/object.test +share/installed-tests/json-glib-1.0/parser.test +share/installed-tests/json-glib-1.0/path.test +share/installed-tests/json-glib-1.0/reader.test +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 ${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 @@ -88,6 +69,7 @@ ${PLIST.nls}share/locale/fur/LC_MESSAGES ${PLIST.nls}share/locale/gl/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/he/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/hi/LC_MESSAGES/json-glib-1.0.mo +${PLIST.nls}share/locale/hr/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/hu/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/id/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/it/LC_MESSAGES/json-glib-1.0.mo @@ -98,6 +80,8 @@ ${PLIST.nls}share/locale/lt/LC_MESSAGES/ ${PLIST.nls}share/locale/lv/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/ml/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/nb/LC_MESSAGES/json-glib-1.0.mo +${PLIST.nls}share/locale/ne/LC_MESSAGES/json-glib-1.0.mo +${PLIST.nls}share/locale/nl/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/oc/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/or/LC_MESSAGES/json-glib-1.0.mo ${PLIST.nls}share/locale/pa/LC_MESSAGES/json-glib-1.0.mo Index: pkgsrc/textproc/json-glib/distinfo diff -u pkgsrc/textproc/json-glib/distinfo:1.17 pkgsrc/textproc/json-glib/distinfo:1.18 --- pkgsrc/textproc/json-glib/distinfo:1.17 Sat Sep 9 06:15:37 2017 +++ pkgsrc/textproc/json-glib/distinfo Thu Jun 13 09:45:17 2019 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.17 2017/09/09 06:15:37 ryoon Exp $ +$NetBSD: distinfo,v 1.18 2019/06/13 09:45:17 wiz Exp $ -SHA1 (json-glib-1.2.8.tar.xz) = f340a7d4c645bb26ec1b0feccb80346094ee2f05 -RMD160 (json-glib-1.2.8.tar.xz) = c13f30676cb2ca224f1c21e4ef4f9aa77c19a0c5 -SHA512 (json-glib-1.2.8.tar.xz) = 85d8ad431363b8698d71684927b8aa38749d99ea7236334ec09fd81482489f1ab9cb12dabcbe13f6b6ffd7e5d70ade47a36b511e275915d4aa858af647db90ba -Size (json-glib-1.2.8.tar.xz) = 604336 bytes +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 --_----------=_156041911715460--