CVS commit: pkgsrc/devel/gobject-introspection

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr  9 17:55:46 UTC 2024

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile PLIST distinfo
        pkgsrc/devel/gobject-introspection/patches: patch-giscanner_ast.py
            patch-giscanner_ccompiler.py
Removed Files:
        pkgsrc/devel/gobject-introspection/patches:
            patch-tests_scanner_Regress-1.0-expected.gir

Log Message:
gobject-introspection: update to 1.80.1.

1.80.1 - 2024-04-01
-------------------

* Require Python 3.8 when running mypy
* Ensure that POSIX types follow the target architecture
* Look for finish functions inside the list of constructors

1.80.0 - 2024-03-09
-------------------

* Allow using `transfer none` with GClosure
* Only allow loading GIRepository-2.0
* Add marshalling tests for uninitialized and NaN arguments
* Check for setuptools when building with Python >= 3.12
* Add fallback doc elements for virtual functions
* Add doc elements for callback fields
* Support static inline declarations in the GIR
* Add annotations for sync, async, and async-finish functions in the GIR
* Simplify the giscanner module build with Python >= 3.12
* Allow passing full shared library paths on Windows

1.79.1 - 2023-12-28
-------------------

* Build fixes
* Require Meson ≥ 1.2
* Avoid test failures with Python ≥ 3.12
* Update the GIR schema, and validate GIR files as part of the test suite
* Support (not optional) annotation
* Allow ownership transfer of structure types with copy/free functions

1.79.0 - 2023-12-24
-------------------

* Require GLib >= 2.79
* Require Python >= 3.8
* Simplify libtool use with wrappers
* Drop GIO dependency from libgirepository
* Do not install the GLib introspection data


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/gobject-introspection/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_Regress-1.0-expected.gir

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.91 pkgsrc/devel/gobject-introspection/Makefile:1.92
--- pkgsrc/devel/gobject-introspection/Makefile:1.91    Sat Nov 25 05:10:27 2023
+++ pkgsrc/devel/gobject-introspection/Makefile Tue Apr  9 17:55:46 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2023/11/25 05:10:27 tsutsui Exp $
+# $NetBSD: Makefile,v 1.92 2024/04/09 17:55:46 wiz Exp $
 
-DISTNAME=      gobject-introspection-1.78.1
-PKGREVISION=   2
+DISTNAME=      gobject-introspection-1.80.1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -13,6 +12,12 @@ LICENSE=     gnu-gpl-v2 AND gnu-lgpl-v2
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+.include "../../lang/python/pyversion.mk"
+
+.if ${PYTHON_VERSION} > 311
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+.endif
+
 USE_TOOLS+=    pkg-config flex bison
 
 MESON_ARGS+=   -Dpython=${PYTHONBIN}
@@ -23,19 +28,6 @@ PKGCONFIG_OVERRIDE+= output/meson-privat
 
 PKGCONFIG_OVERRIDE_STAGE=      post-build
 
-SUBST_CLASSES+=                timet
-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 ${MACHINE_PLATFORM:MNetBSD-*} || ${MACHINE_PLATFORM:MMirBSD-*}
-SUBST_SED.timet=       -e 's,@TIMET_TYPENAME@,TYPE_INT64,g'
-SUBST_SED.timet+=      -e 's,@TIMET_CTYPE@,gint64,g'
-.else
-SUBST_SED.timet=       -e 's,@TIMET_TYPENAME@,TYPE_LONG,g'
-SUBST_SED.timet+=      -e 's,@TIMET_CTYPE@,glong,g'
-.endif
-
 SUBST_CLASSES+=                libdirs
 SUBST_STAGE.libdirs=   pre-configure
 SUBST_FILES.libdirs=   giscanner/ccompiler.py
@@ -50,7 +42,7 @@ MAKE_ENV+=    DYLD_LIBRARY_PATH=${WRKSRC}/o
 # Disable cache to keep fake homedir clean
 MAKE_ENV+=     GI_SCANNER_DISABLE_CACHE=yes
 
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.78.1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.79
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0
 .include "../../devel/libffi/buildlink3.mk"

Index: pkgsrc/devel/gobject-introspection/PLIST
diff -u pkgsrc/devel/gobject-introspection/PLIST:1.16 pkgsrc/devel/gobject-introspection/PLIST:1.17
--- pkgsrc/devel/gobject-introspection/PLIST:1.16       Tue Feb 15 17:34:32 2022
+++ pkgsrc/devel/gobject-introspection/PLIST    Tue Apr  9 17:55:46 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2022/02/15 17:34:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2024/04/09 17:55:46 wiz Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -30,10 +30,6 @@ lib/girepository-1.0/DBus-1.0.typelib
 lib/girepository-1.0/DBusGLib-1.0.typelib
 lib/girepository-1.0/GIRepository-2.0.typelib
 lib/girepository-1.0/GL-1.0.typelib
-lib/girepository-1.0/GLib-2.0.typelib
-lib/girepository-1.0/GModule-2.0.typelib
-lib/girepository-1.0/GObject-2.0.typelib
-lib/girepository-1.0/Gio-2.0.typelib
 lib/girepository-1.0/Vulkan-1.0.typelib
 lib/girepository-1.0/cairo-1.0.typelib
 lib/girepository-1.0/fontconfig-2.0.typelib
@@ -151,10 +147,6 @@ share/gir-1.0/DBus-1.0.gir
 share/gir-1.0/DBusGLib-1.0.gir
 share/gir-1.0/GIRepository-2.0.gir
 share/gir-1.0/GL-1.0.gir
-share/gir-1.0/GLib-2.0.gir
-share/gir-1.0/GModule-2.0.gir
-share/gir-1.0/GObject-2.0.gir
-share/gir-1.0/Gio-2.0.gir
 share/gir-1.0/Vulkan-1.0.gir
 share/gir-1.0/cairo-1.0.gir
 share/gir-1.0/fontconfig-2.0.gir

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.53 pkgsrc/devel/gobject-introspection/distinfo:1.54
--- pkgsrc/devel/gobject-introspection/distinfo:1.53    Tue Nov  7 12:46:58 2023
+++ pkgsrc/devel/gobject-introspection/distinfo Tue Apr  9 17:55:46 2024
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.53 2023/11/07 12:46:58 prlw1 Exp $
+$NetBSD: distinfo,v 1.54 2024/04/09 17:55:46 wiz Exp $
 
-BLAKE2s (gobject-introspection-1.78.1.tar.xz) = 7bbce871f9140f0096957a6cd938d39c7807e70da56c4dea7506d500431cddfa
-SHA512 (gobject-introspection-1.78.1.tar.xz) = a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97
-Size (gobject-introspection-1.78.1.tar.xz) = 1060296 bytes
+BLAKE2s (gobject-introspection-1.80.1.tar.xz) = 7c2c1b4225ea68afbe91b6718b1f1c6d4f102cf1a3b8bdf27599b199ef1480b6
+SHA512 (gobject-introspection-1.80.1.tar.xz) = f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a
+Size (gobject-introspection-1.80.1.tar.xz) = 1040228 bytes
 SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640
-SHA1 (patch-giscanner_ast.py) = bf9f7f6f5c548ca170d177f4d724481e0b6d1e29
-SHA1 (patch-giscanner_ccompiler.py) = c730488e66caf0bb2f258df04be66d72ca714ab4
-SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
+SHA1 (patch-giscanner_ast.py) = 24d31e9675af3779a9399a1611cf6bc985285360
+SHA1 (patch-giscanner_ccompiler.py) = c63c3a823661de880038aa2303d3961d66802341
 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
 SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
 SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py
diff -u pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py:1.2 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py:1.3
--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py:1.2       Wed Nov 23 10:56:40 2022
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ast.py   Tue Apr  9 17:55:46 2024
@@ -1,11 +1,10 @@
-$NetBSD: patch-giscanner_ast.py,v 1.2 2022/11/23 10:56:40 adam Exp $
+$NetBSD: patch-giscanner_ast.py,v 1.3 2024/04/09 17:55:46 wiz Exp $
 
 - add double underscore versions
-- 32/64-bit time_t fix
 
 --- giscanner/ast.py.orig      2022-09-17 18:52:38.000000000 +0000
 +++ giscanner/ast.py
-@@ -307,6 +307,15 @@ type_names['uint32_t'] = TYPE_UINT32
+@@ -307,6 +307,16 @@ type_names['uint32_t'] = TYPE_UINT32
  type_names['int64_t'] = TYPE_INT64
  type_names['uint64_t'] = TYPE_UINT64
  
@@ -17,16 +16,8 @@ $NetBSD: patch-giscanner_ast.py,v 1.2 20
 +type_names['__uint32_t'] = TYPE_UINT32
 +type_names['__int64_t'] = TYPE_INT64
 +type_names['__uint64_t'] = TYPE_UINT64
++type_names['__off_t'] = TYPE_OFF_T
 +
  # A few additional GLib type aliases
  type_names['guchar'] = TYPE_UINT8
  type_names['gchararray'] = TYPE_STRING
-@@ -346,7 +355,7 @@ type_names['size_t'] = type_names['gsize
- type_names['ssize_t'] = type_names['gssize']
- type_names['uintptr_t'] = type_names['guintptr']
- type_names['intptr_t'] = type_names['gintptr']
--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-giscanner_ccompiler.py
diff -u pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.5 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.6
--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.5 Wed Nov 16 16:08:34 2022
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py     Tue Apr  9 17:55:46 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-giscanner_ccompiler.py,v 1.5 2022/11/16 16:08:34 jperkin Exp $
+$NetBSD: patch-giscanner_ccompiler.py,v 1.6 2024/04/09 17:55:46 wiz Exp $
 
 Exclude system paths from LD_LIBRARY_PATH.
 Do not use -Wl,--no-as-needed on SunOS.
 
---- giscanner/ccompiler.py.orig        2021-09-17 16:02:42.520052200 +0000
+--- giscanner/ccompiler.py.orig        2024-04-01 13:21:25.000000000 +0000
 +++ giscanner/ccompiler.py
-@@ -197,7 +197,7 @@ class CCompiler(object):
+@@ -232,7 +232,7 @@ class CCompiler(object):
  
                  # Ensure libraries are always linked as we are going to use ldd to work
                  # out their names later
@@ -14,7 +14,7 @@ Do not use -Wl,--no-as-needed on SunOS.
                      args.append('-Wl,--no-as-needed')
  
          for library_path in libpaths:
-@@ -215,7 +215,8 @@ class CCompiler(object):
+@@ -250,7 +250,8 @@ class CCompiler(object):
                      else:
                          args.append('-Wl,-rpath,' + library_path)
  
@@ -23,4 +23,4 @@ Do not use -Wl,--no-as-needed on SunOS.
 +                runtime_paths.append(library_path)
  
          for library in libraries + extra_libraries:
-             if self.check_is_msvc():
+             if os.path.isfile(library):