[pkgsrc/trunk]: pkgsrc/devel/gobject-introspection Update gobject-introspecti...

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1accff04d721
branches:  trunk
changeset: 334706:1accff04d721
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Mon Jun 03 10:47:20 2019 +0000

description:
Update gobject-introspection to 2.60.1

Highlights:
* build: Drop Python 2 support, require Python 3.4+ :mr:`69`
* Add _Float128 to the base C types
* scanner: rework source root directory guessing code to not depend on the
  build directory
* scanner: Merge specifiers and qualifiers when merging basic types.
  Fixes "unsigned char" being wrongly parsed as "unsigned" etc.
  :mr:`125` (:user:`Tomasz Mi?sko <tmiasko>`)
* scanner: make using bool without stdbool include work again
  :issue:`247`

diffstat:

 devel/gobject-introspection/Makefile                                             |   33 +-
 devel/gobject-introspection/PLIST                                                |  197 +++------
 devel/gobject-introspection/distinfo                                             |   18 +-
 devel/gobject-introspection/patches/patch-aa                                     |   35 -
 devel/gobject-introspection/patches/patch-ac                                     |   27 -
 devel/gobject-introspection/patches/patch-giscanner_ast.py                       |   32 +
 devel/gobject-introspection/patches/patch-giscanner_ccompiler.py                 |   10 +-
 devel/gobject-introspection/patches/patch-meson.build                            |   14 +
 devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir |   29 +
 devel/gobject-introspection/patches/patch-tools_meson.build                      |   15 +
 10 files changed, 184 insertions(+), 226 deletions(-)

diffs (truncated from 538 to 300 lines):

diff -r f301137aa213 -r 1accff04d721 devel/gobject-introspection/Makefile
--- a/devel/gobject-introspection/Makefile      Mon Jun 03 10:36:25 2019 +0000
+++ b/devel/gobject-introspection/Makefile      Mon Jun 03 10:47:20 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2019/04/25 07:32:46 maya Exp $
+# $NetBSD: Makefile,v 1.59 2019/06/03 10:47:20 prlw1 Exp $
 
-DISTNAME=      gobject-introspection-1.56.1
+DISTNAME=      gobject-introspection-1.60.1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
-PKGREVISION=   2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://wiki.gnome.org/Projects/GObjectIntrospection
@@ -12,13 +11,10 @@
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
-DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config flex bison gmake
-GMAKE_REQD=    3.81
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=       --disable-doctool
+USE_TOOLS+=    pkg-config flex bison
+
+MESON_ARGS+=   -Dpython=${PYTHONBIN}
 
 PKGCONFIG_OVERRIDE+=   gobject-introspection-1.0.pc.in
 PKGCONFIG_OVERRIDE+=   gobject-introspection-no-export-1.0.pc.in
@@ -28,7 +24,7 @@
 SUBST_FILES.timet=     giscanner/ast.py
 SUBST_FILES.timet+=    tests/scanner/Regress-1.0-expected.gir
 .include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.99*) || !empty(MACHINE_PLATFORM:MNetBSD-[6-9]*) || !empty(MACHINE_PLATFORM:MMirBSD-*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.99.*) || !empty(MACHINE_PLATFORM:MNetBSD-[6-9].*) || !empty(MACHINE_PLATFORM:MMirBSD-*)
 SUBST_SED.timet=       -e 's,@TIMET_TYPENAME@,TYPE_INT64,g'
 SUBST_SED.timet+=      -e 's,@TIMET_CTYPE@,gint64,g'
 .else
@@ -36,24 +32,11 @@
 SUBST_SED.timet+=      -e 's,@TIMET_CTYPE@,glong,g'
 .endif
 
-#REPLACE_PYTHON+=      tools/g-ir-tool-template.in
-SUBST_CLASSES+=                pyenv
-SUBST_STAGE.pyenv=     pre-configure
-SUBST_FILES.pyenv+=    tools/g-ir-tool-template.in
-SUBST_SED.pyenv+=      -e 's,/usr/bin/env ,,'
-
-# not executable
-CHECK_INTERPRETER_SKIP+= lib/gobject-introspection/giscanner/*.py
-
-# needed for tests only
-#.include "../../graphics/cairo/buildlink3.mk"
-#.include "../../graphics/cairo-gobject/buildlink3.mk"
-#TEST_TARGET=  check
-
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.54.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.58.0
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/py-meson/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f301137aa213 -r 1accff04d721 devel/gobject-introspection/PLIST
--- a/devel/gobject-introspection/PLIST Mon Jun 03 10:36:25 2019 +0000
+++ b/devel/gobject-introspection/PLIST Mon Jun 03 10:47:20 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/10/18 21:32:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/06/03 10:47:20 prlw1 Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -23,6 +23,7 @@
 include/gobject-introspection-1.0/gitypelib.h
 include/gobject-introspection-1.0/gitypes.h
 include/gobject-introspection-1.0/giunioninfo.h
+include/gobject-introspection-1.0/giversion.h
 include/gobject-introspection-1.0/giversionmacros.h
 include/gobject-introspection-1.0/givfuncinfo.h
 lib/girepository-1.0/DBus-1.0.typelib
@@ -43,139 +44,100 @@
 lib/girepository-1.0/xlib-2.0.typelib
 lib/girepository-1.0/xrandr-1.3.typelib
 lib/gobject-introspection/giscanner/__init__.py
-lib/gobject-introspection/giscanner/__init__.pyc
-lib/gobject-introspection/giscanner/__init__.pyo
-lib/gobject-introspection/giscanner/_giscanner.la
+lib/gobject-introspection/giscanner/_giscanner.so
+lib/gobject-introspection/giscanner/_version.py
 lib/gobject-introspection/giscanner/annotationmain.py
-lib/gobject-introspection/giscanner/annotationmain.pyc
-lib/gobject-introspection/giscanner/annotationmain.pyo
 lib/gobject-introspection/giscanner/annotationparser.py
-lib/gobject-introspection/giscanner/annotationparser.pyc
-lib/gobject-introspection/giscanner/annotationparser.pyo
 lib/gobject-introspection/giscanner/ast.py
-lib/gobject-introspection/giscanner/ast.pyc
-lib/gobject-introspection/giscanner/ast.pyo
 lib/gobject-introspection/giscanner/cachestore.py
-lib/gobject-introspection/giscanner/cachestore.pyc
-lib/gobject-introspection/giscanner/cachestore.pyo
 lib/gobject-introspection/giscanner/ccompiler.py
-lib/gobject-introspection/giscanner/ccompiler.pyc
-lib/gobject-introspection/giscanner/ccompiler.pyo
 lib/gobject-introspection/giscanner/codegen.py
-lib/gobject-introspection/giscanner/codegen.pyc
-lib/gobject-introspection/giscanner/codegen.pyo
-lib/gobject-introspection/giscanner/collections/__init__.py
-lib/gobject-introspection/giscanner/collections/__init__.pyc
-lib/gobject-introspection/giscanner/collections/__init__.pyo
-lib/gobject-introspection/giscanner/collections/counter.py
-lib/gobject-introspection/giscanner/collections/counter.pyc
-lib/gobject-introspection/giscanner/collections/counter.pyo
-lib/gobject-introspection/giscanner/collections/ordereddict.py
-lib/gobject-introspection/giscanner/collections/ordereddict.pyc
-lib/gobject-introspection/giscanner/collections/ordereddict.pyo
 lib/gobject-introspection/giscanner/docmain.py
-lib/gobject-introspection/giscanner/docmain.pyc
-lib/gobject-introspection/giscanner/docmain.pyo
-lib/gobject-introspection/giscanner/doctemplates/C/callback.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/field.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/interface.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl
-lib/gobject-introspection/giscanner/doctemplates/C/vfunc.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/callback.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/class.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/constructor.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/default.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/enum.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/field.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/interface.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/method.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/namespace.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/property.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/record.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/signal.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Gjs/vfunc.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/callback.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/class.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/constructor.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/default.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/enum.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/field.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/interface.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/method.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/namespace.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/property.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/record.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/signal.tmpl
-lib/gobject-introspection/giscanner/doctemplates/Python/vfunc.tmpl
-lib/gobject-introspection/giscanner/doctemplates/base.tmpl
-lib/gobject-introspection/giscanner/doctemplates/class.tmpl
-lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_doc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_index.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_methods.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_properties.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_signals.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_staticmethods.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_vfuncs.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/base.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/callback.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/interface.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/callback.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/field.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/interface.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/C/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/callback.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/field.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/interface.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/callback.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/field.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/interface.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/base.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/mallard/namespace.tmpl
 lib/gobject-introspection/giscanner/docwriter.py
-lib/gobject-introspection/giscanner/docwriter.pyc
-lib/gobject-introspection/giscanner/docwriter.pyo
 lib/gobject-introspection/giscanner/dumper.py
-lib/gobject-introspection/giscanner/dumper.pyc
-lib/gobject-introspection/giscanner/dumper.pyo
 lib/gobject-introspection/giscanner/gdumpparser.py
-lib/gobject-introspection/giscanner/gdumpparser.pyc
-lib/gobject-introspection/giscanner/gdumpparser.pyo
 lib/gobject-introspection/giscanner/girparser.py
-lib/gobject-introspection/giscanner/girparser.pyc
-lib/gobject-introspection/giscanner/girparser.pyo
 lib/gobject-introspection/giscanner/girwriter.py
-lib/gobject-introspection/giscanner/girwriter.pyc
-lib/gobject-introspection/giscanner/girwriter.pyo
 lib/gobject-introspection/giscanner/introspectablepass.py
-lib/gobject-introspection/giscanner/introspectablepass.pyc
-lib/gobject-introspection/giscanner/introspectablepass.pyo
 lib/gobject-introspection/giscanner/libtoolimporter.py
-lib/gobject-introspection/giscanner/libtoolimporter.pyc
-lib/gobject-introspection/giscanner/libtoolimporter.pyo
 lib/gobject-introspection/giscanner/maintransformer.py
-lib/gobject-introspection/giscanner/maintransformer.pyc
-lib/gobject-introspection/giscanner/maintransformer.pyo
+lib/gobject-introspection/giscanner/mdextensions.py
 lib/gobject-introspection/giscanner/message.py
-lib/gobject-introspection/giscanner/message.pyc
-lib/gobject-introspection/giscanner/message.pyo
 lib/gobject-introspection/giscanner/msvccompiler.py
-lib/gobject-introspection/giscanner/msvccompiler.pyc
-lib/gobject-introspection/giscanner/msvccompiler.pyo
+lib/gobject-introspection/giscanner/pkgconfig.py
 lib/gobject-introspection/giscanner/scannermain.py
-lib/gobject-introspection/giscanner/scannermain.pyc
-lib/gobject-introspection/giscanner/scannermain.pyo
 lib/gobject-introspection/giscanner/sectionparser.py
-lib/gobject-introspection/giscanner/sectionparser.pyc
-lib/gobject-introspection/giscanner/sectionparser.pyo
 lib/gobject-introspection/giscanner/shlibs.py
-lib/gobject-introspection/giscanner/shlibs.pyc
-lib/gobject-introspection/giscanner/shlibs.pyo
 lib/gobject-introspection/giscanner/sourcescanner.py
-lib/gobject-introspection/giscanner/sourcescanner.pyc
-lib/gobject-introspection/giscanner/sourcescanner.pyo
 lib/gobject-introspection/giscanner/testcodegen.py
-lib/gobject-introspection/giscanner/testcodegen.pyc
-lib/gobject-introspection/giscanner/testcodegen.pyo
 lib/gobject-introspection/giscanner/transformer.py
-lib/gobject-introspection/giscanner/transformer.pyc
-lib/gobject-introspection/giscanner/transformer.pyo
 lib/gobject-introspection/giscanner/utils.py
-lib/gobject-introspection/giscanner/utils.pyc
-lib/gobject-introspection/giscanner/utils.pyo
 lib/gobject-introspection/giscanner/xmlwriter.py
-lib/gobject-introspection/giscanner/xmlwriter.pyc
-lib/gobject-introspection/giscanner/xmlwriter.pyo
-lib/libgirepository-1.0.la
+lib/libgirepository-1.0.so
+lib/libgirepository-1.0.so.1
+lib/libgirepository-1.0.so.1.0.0
 lib/pkgconfig/gobject-introspection-1.0.pc
 lib/pkgconfig/gobject-introspection-no-export-1.0.pc
 man/man1/g-ir-compiler.1
@@ -202,20 +164,3 @@
 share/gir-1.0/xrandr-1.3.gir
 share/gobject-introspection-1.0/Makefile.introspection
 share/gobject-introspection-1.0/gdump.c
-share/gobject-introspection-1.0/tests/annotation.c