pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/gobject-introspection

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Mon Jun  3 10:47:20 UTC 2019

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile PLIST distinfo
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_ccompiler.py
Added Files:
        pkgsrc/devel/gobject-introspection/patches: patch-giscanner_ast.py
            patch-meson.build patch-tests_scanner_Regress-1.0-expected.gir
            patch-tools_meson.build
Removed Files:
        pkgsrc/devel/gobject-introspection/patches: patch-aa patch-ac

Log Message:
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`


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/gobject-introspection/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/gobject-introspection/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/gobject-introspection/patches/patch-ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py \
    pkgsrc/devel/gobject-introspection/patches/patch-meson.build \
    pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir \
    pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/devel/gobject-introspection/Makefile
diff -u pkgsrc/devel/gobject-introspection/Makefile:1.58 pkgsrc/devel/gobject-introspection/Makefile:1.59
--- pkgsrc/devel/gobject-introspection/Makefile:1.58    Thu Apr 25 07:32:46 2019
+++ pkgsrc/devel/gobject-introspection/Makefile Mon Jun  3 10:47:20 2019
@@ -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 @@ COMMENT=    GObject Introspection
 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_STAGE.timet=    pre-configure
 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_TYPENAME@,
 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"

Index: pkgsrc/devel/gobject-introspection/PLIST
diff -u pkgsrc/devel/gobject-introspection/PLIST:1.11 pkgsrc/devel/gobject-introspection/PLIST:1.12
--- pkgsrc/devel/gobject-introspection/PLIST:1.11       Wed Oct 18 21:32:24 2017
+++ pkgsrc/devel/gobject-introspection/PLIST    Mon Jun  3 10:47:20 2019
@@ -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/gitype
 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/xft-2.0.typelib
 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/xlib-2.0.gir
 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
-share/gobject-introspection-1.0/tests/annotation.h
-share/gobject-introspection-1.0/tests/drawable.c
-share/gobject-introspection-1.0/tests/drawable.h
-share/gobject-introspection-1.0/tests/everything.c
-share/gobject-introspection-1.0/tests/everything.h
-share/gobject-introspection-1.0/tests/foo.c
-share/gobject-introspection-1.0/tests/foo.h
-share/gobject-introspection-1.0/tests/gimarshallingtests.c
-share/gobject-introspection-1.0/tests/gimarshallingtests.h
-share/gobject-introspection-1.0/tests/gitestmacros.h
-share/gobject-introspection-1.0/tests/regress.c
-share/gobject-introspection-1.0/tests/regress.h
-share/gobject-introspection-1.0/tests/utility.c
-share/gobject-introspection-1.0/tests/utility.h
-share/gobject-introspection-1.0/tests/warnlib.c
-share/gobject-introspection-1.0/tests/warnlib.h

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.30 pkgsrc/devel/gobject-introspection/distinfo:1.31
--- pkgsrc/devel/gobject-introspection/distinfo:1.30    Wed Feb  6 11:15:43 2019
+++ pkgsrc/devel/gobject-introspection/distinfo Mon Jun  3 10:47:20 2019
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.30 2019/02/06 11:15:43 martin Exp $
+$NetBSD: distinfo,v 1.31 2019/06/03 10:47:20 prlw1 Exp $
 
-SHA1 (gobject-introspection-1.56.1.tar.xz) = eef277357cf724bc521f203f0d47faaea2ae4f0c
-RMD160 (gobject-introspection-1.56.1.tar.xz) = 55938f879f3211390063b56298604cb766142c60
-SHA512 (gobject-introspection-1.56.1.tar.xz) = 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
-Size (gobject-introspection-1.56.1.tar.xz) = 1397812 bytes
-SHA1 (patch-aa) = 562071f5524de4c50571cb0c4625dcf3c933bac5
-SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183
-SHA1 (patch-giscanner_ccompiler.py) = a9408624d799be35941b7db3f4cbfe35cf6a8797
+SHA1 (gobject-introspection-1.60.1.tar.xz) = c4c55fbc207fd777371c960274be29f7c9fe3551
+RMD160 (gobject-introspection-1.60.1.tar.xz) = 71ca6db1b174272525ee991ab723957003f66891
+SHA512 (gobject-introspection-1.60.1.tar.xz) = 01adbeffee08ff6487f11a303fd7a59a99c36714dce21be9bbae7fd2bf8f080665e830bc3a47566140a6081dc74f6c2f8d8232286759b761f70493545a9d90ea
+Size (gobject-introspection-1.60.1.tar.xz) = 1284460 bytes
+SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
+SHA1 (patch-giscanner_ccompiler.py) = 03faf472ad9384670e7f15a647e069606d44daba
+SHA1 (patch-meson.build) = eb67bfe1a9dd46986b9b6e0d296c385e2924a0e8
+SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
 SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
+SHA1 (patch-tools_meson.build) = 6b9f2f1b11d1eca62fbc136c3ac56692db7cacde

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py
diff -u pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.1 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.2
--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.1 Tue Feb  6 15:44:01 2018
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py     Mon Jun  3 10:47:20 2019
@@ -1,12 +1,12 @@
-$NetBSD: patch-giscanner_ccompiler.py,v 1.1 2018/02/06 15:44:01 jperkin Exp $
+$NetBSD: patch-giscanner_ccompiler.py,v 1.2 2019/06/03 10:47:20 prlw1 Exp $
 
 Do not set LD_LIBRARY_PATH when calling the compiler.
 
---- giscanner/ccompiler.py.orig        2017-05-18 05:42:52.000000000 +0000
+--- giscanner/ccompiler.py.orig        2019-03-02 17:10:05.000000000 +0000
 +++ giscanner/ccompiler.py
-@@ -161,13 +161,6 @@ class CCompiler(object):
- 
-             runtime_paths.append(library_path)
+@@ -227,13 +227,6 @@ class CCompiler(object):
+                 else:
+                     args.append('-l' + library)
  
 -        for envvar in runtime_path_envvar:
 -            if envvar in os.environ:

Added files:

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py:1.1
--- /dev/null   Mon Jun  3 10:47:20 2019
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py   Mon Jun  3 10:47:20 2019
@@ -0,0 +1,32 @@
+$NetBSD: patch-giscanner_ast.py,v 1.1 2019/06/03 10:47:20 prlw1 Exp $
+
+- add double underscore versions
+- 32/64-bit time_t fix
+
+--- giscanner/ast.py.orig      2019-01-06 10:32:10.000000000 +0000
++++ giscanner/ast.py
+@@ -307,6 +307,15 @@ type_names['uint32_t'] = TYPE_UINT32
+ type_names['int64_t'] = TYPE_INT64
+ type_names['uint64_t'] = TYPE_UINT64
+ 
++type_names['__int8_t'] = TYPE_INT8
++type_names['__uint8_t'] = TYPE_UINT8
++type_names['__int16_t'] = TYPE_INT16
++type_names['__uint16_t'] = TYPE_UINT16
++type_names['__int32_t'] = TYPE_INT32
++type_names['__uint32_t'] = TYPE_UINT32
++type_names['__int64_t'] = TYPE_INT64
++type_names['__uint64_t'] = TYPE_UINT64
++
+ # A few additional GLib type aliases
+ type_names['guchar'] = TYPE_UINT8
+ type_names['gchararray'] = TYPE_STRING
+@@ -344,7 +353,7 @@ type_names['FILE*'] = TYPE_ANY
+ # integers it's easy enough to expand them.
+ type_names['size_t'] = type_names['gsize']
+ type_names['ssize_t'] = type_names['gssize']
+-type_names['time_t'] = TYPE_LONG
++type_names['time_t'] = @TIMET_TYPENAME@
+ type_names['off_t'] = type_names['gsize']
+ type_names['pid_t'] = TYPE_INT
+ type_names['uid_t'] = TYPE_UINT
Index: pkgsrc/devel/gobject-introspection/patches/patch-meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-meson.build:1.1
--- /dev/null   Mon Jun  3 10:47:20 2019
+++ pkgsrc/devel/gobject-introspection/patches/patch-meson.build        Mon Jun  3 10:47:20 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-meson.build,v 1.1 2019/06/03 10:47:20 prlw1 Exp $
+
+Don't build tests as they depend on many other packages.
+
+--- meson.build.orig   2019-04-07 13:42:45.000000000 +0000
++++ meson.build
+@@ -166,7 +166,6 @@ subdir('giscanner')
+ subdir('gir')
+ subdir('examples')
+ subdir('docs')
+-subdir('tests')
+ 
+ install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
+ install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
Index: pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir:1.1
--- /dev/null   Mon Jun  3 10:47:20 2019
+++ pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir     Mon Jun  3 10:47:20 2019
@@ -0,0 +1,29 @@
+$NetBSD: patch-tests_scanner_Regress-1.0-expected.gir,v 1.1 2019/06/03 10:47:20 prlw1 Exp $
+
+32/64-bit time_t fix
+
+--- tests/scanner/Regress-1.0-expected.gir.orig        2019-01-16 18:03:21.000000000 +0000
++++ tests/scanner/Regress-1.0-expected.gir
+@@ -1877,7 +1877,7 @@ uses a C sugar return type.</doc>
+             <type name="FooObject" c:type="RegressFooObject*"/>
+           </instance-parameter>
+           <parameter name="time" transfer-ownership="none">
+-            <type name="glong" c:type="time_t"/>
++            <type name="@TIMET_CTYPE@" c:type="time_t"/>
+           </parameter>
+         </parameters>
+       </method>
+@@ -7975,11 +7975,11 @@ https://bugzilla.gnome.org/show_bug.cgi?
+     <function name="test_timet" c:identifier="regress_test_timet">
+       <source-position filename="regress.h" line="94"/>
+       <return-value transfer-ownership="none">
+-        <type name="glong" c:type="time_t"/>
++        <type name="@TIMET_CTYPE@" c:type="time_t"/>
+       </return-value>
+       <parameters>
+         <parameter name="in" transfer-ownership="none">
+-          <type name="glong" c:type="time_t"/>
++          <type name="@TIMET_CTYPE@" c:type="time_t"/>
+         </parameter>
+       </parameters>
+     </function>
Index: pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build:1.1
--- /dev/null   Mon Jun  3 10:47:20 2019
+++ pkgsrc/devel/gobject-introspection/patches/patch-tools_meson.build  Mon Jun  3 10:47:20 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_meson.build,v 1.1 2019/06/03 10:47:20 prlw1 Exp $
+
+After testing for the meson_option "python", meson.build then overwrites it.
+
+--- tools/meson.build.orig     2019-01-11 14:16:09.000000000 +0000
++++ tools/meson.build
+@@ -12,7 +12,7 @@ endif
+ if cc.get_id() == 'msvc'
+   python_cmd = '/usr/bin/env ' + python.get_variable('prefix') + '\\python.exe'
+ else
+-  python_cmd = '/usr/bin/env python@0@'.format(python.language_version().split('.')[0])
++  python_cmd = python.path()
+ endif
+ 
+ tool_output = []
Home | Main Index | Thread Index | Old Index