CVS commit: pkgsrc/devel/gobject-introspection

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jan 14 13:17:12 UTC 2025

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile PLIST distinfo
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_ccompiler.py
Removed Files:
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_msvccompiler.py

Log Message:
gobject-introspection: updated to 1.82.0

1.82.0 - 2024-09-13

* Require GLib 2.82.0

1.81.4 - 2024-09-03

* Add rpath when building the type dumper on macOS
* Fix regression in the installation of GIRepository-2.0.typelib

1.81.2 - 2024-09-03

* Add strict mode warning for enumeration members starting with a number
* Set deprecation message for signals and properties
* Fix HTML definition lists in the documentation generator
* Catch up with Python-Markdown 3.4 extension API changes
* Propagate scanner errors
* Do not break when parsing ARM SVE types in system headers
* Pair pointer GTypes with their opaque structure
* Fix property accessor pairing
* Handle pid_t, etc. as their own top-level types
* Add warning for closure annotation
* Warn on invalid callback annotations
* Make sure to set a GError with an invalid introspect-dump string
* Move gobject-introspection tests to a submodule
* Remove dependency on distutils.msvccompiler
* Be more thorough about applying -Wl,--no-as-needed option
* Documentation and build fixes


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/gobject-introspection/PLIST
cvs rdiff -u -r1.56 -r1.57 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_msvccompiler.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.95 pkgsrc/devel/gobject-introspection/Makefile:1.96
--- pkgsrc/devel/gobject-introspection/Makefile:1.95    Wed Sep  4 06:05:05 2024
+++ pkgsrc/devel/gobject-introspection/Makefile Tue Jan 14 13:17:12 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2024/09/04 06:05:05 prlw1 Exp $
+# $NetBSD: Makefile,v 1.96 2025/01/14 13:17:12 adam Exp $
 
-DISTNAME=      gobject-introspection-1.80.1
-PKGREVISION=   3
+DISTNAME=      gobject-introspection-1.82.0
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,8 +10,6 @@ HOMEPAGE=     https://gi.readthedocs.io/en/l
 COMMENT=       GObject Introspection
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYTHON_VERSION} > 311
@@ -48,7 +45,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/output/gir/*.typelib ${DESTDIR}${PREFIX}/lib/girepository-1.0
        ${INSTALL_DATA} ${WRKSRC}/output/gir/*.gir ${DESTDIR}${PREFIX}/share/gir-1.0
 
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.79
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.82
 .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.18 pkgsrc/devel/gobject-introspection/PLIST:1.19
--- pkgsrc/devel/gobject-introspection/PLIST:1.18       Tue Apr  9 18:20:30 2024
+++ pkgsrc/devel/gobject-introspection/PLIST    Tue Jan 14 13:17:12 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2024/04/09 18:20:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2025/01/14 13:17:12 adam Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -179,6 +179,8 @@ share/gobject-introspection-1.0/tests/fo
 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-unix.c
+share/gobject-introspection-1.0/tests/regress-unix.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

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.56 pkgsrc/devel/gobject-introspection/distinfo:1.57
--- pkgsrc/devel/gobject-introspection/distinfo:1.56    Wed Sep  4 06:05:05 2024
+++ pkgsrc/devel/gobject-introspection/distinfo Tue Jan 14 13:17:12 2025
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.56 2024/09/04 06:05:05 prlw1 Exp $
+$NetBSD: distinfo,v 1.57 2025/01/14 13:17:12 adam Exp $
 
-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
+BLAKE2s (gobject-introspection-1.82.0.tar.xz) = 0826aeb50e34053903884a5a30c8f90e2a2aec8696a6e574309d4cd463d1a2c0
+SHA512 (gobject-introspection-1.82.0.tar.xz) = e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7
+Size (gobject-introspection-1.82.0.tar.xz) = 1052872 bytes
 SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640
 SHA1 (patch-giscanner_ast.py) = 24d31e9675af3779a9399a1611cf6bc985285360
-SHA1 (patch-giscanner_ccompiler.py) = 3a2a73c407b7d436ae540578318c56a60f1efa70
-SHA1 (patch-giscanner_msvccompiler.py) = f7ce9c14903a4eca4cdcae1a0289979e95af0a47
+SHA1 (patch-giscanner_ccompiler.py) = b108172f440f8ea11a3bf9b7292d09c9df85deb8
 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_ccompiler.py
diff -u pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.8 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.9
--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.8 Wed Sep  4 06:05:05 2024
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py     Tue Jan 14 13:17:12 2025
@@ -1,38 +1,20 @@
-$NetBSD: patch-giscanner_ccompiler.py,v 1.8 2024/09/04 06:05:05 prlw1 Exp $
+$NetBSD: patch-giscanner_ccompiler.py,v 1.9 2025/01/14 13:17:12 adam Exp $
 
-Fix build with py-setuptools-74.0.0. (upstream a2139dba59)
 Exclude system paths from LD_LIBRARY_PATH.
 Do not use -Wl,--no-as-needed on SunOS.
 
---- giscanner/ccompiler.py.orig        2024-04-01 13:21:25.000000000 +0000
+--- giscanner/ccompiler.py.orig        2024-09-13 13:08:54.000000000 +0000
 +++ giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
+@@ -242,7 +242,7 @@ class CCompiler(object):
  
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
-         # Now, create the distutils ccompiler instance based on the info we have.
-         if compiler_name == 'msvc':
-             # For MSVC, we need to create a instance of a subclass of distutil's
--            # MSVC9Compiler class, as it does not provide a preprocess()
-+            # MSVCCompiler class, as it does not provide a preprocess()
-             # implementation
-             from . import msvccompiler
-             self.compiler = msvccompiler.get_msvc_compiler()
-@@ -232,7 +231,7 @@ class CCompiler(object):
- 
-                 # Ensure libraries are always linked as we are going to use ldd to work
-                 # out their names later
--                if sys.platform != 'darwin':
-+                if sys.platform != 'darwin' and sys.platform != 'sunos5':
-                     args.append('-Wl,--no-as-needed')
+             # Ensure libraries are always linked as we are going to use ldd to work
+             # out their names later
+-            if sys.platform != 'darwin':
++            if sys.platform != 'darwin' and sys.platform != 'sunos5':
+                 args.append('-Wl,--no-as-needed')
  
          for library_path in libpaths:
-@@ -250,7 +249,8 @@ class CCompiler(object):
+@@ -260,7 +260,8 @@ class CCompiler(object):
                      else:
                          args.append('-Wl,-rpath,' + library_path)
  
@@ -42,21 +24,3 @@ Do not use -Wl,--no-as-needed on SunOS.
  
          for library in libraries + extra_libraries:
              if os.path.isfile(library):
-@@ -460,7 +460,7 @@ class CCompiler(object):
-             return self.compiler.linker_exe
- 
-     def check_is_msvc(self):
--        return isinstance(self.compiler, MSVCCompiler)
-+        return self.compiler.compiler_type == "msvc"
- 
-     # Private APIs
-     def _set_cpp_options(self, options):
-@@ -486,7 +486,7 @@ class CCompiler(object):
-                     # macros for compiling using distutils
-                     # get dropped for MSVC builds, so
-                     # escape the escape character.
--                    if isinstance(self.compiler, MSVCCompiler):
-+                    if self.check_is_msvc():
-                         macro_value = macro_value.replace('\"', '\\\"')
-                 macros.append((macro_name, macro_value))
-             elif option.startswith('-U'):