CVS commit: pkgsrc/devel/gobject-introspection

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jan  5 14:49:02 UTC 2026

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/gobject-introspection/patches: patch-gir_meson.build
            patch-giscanner_maintransformer.py

Log Message:
devel/gobject-introspection: Update to 1.86.0

* Build gir files for GioUnix-2.0 for pkgsrc/devel/glib2.

Changelog:
1.86.0 - 2025-09-13
-------------------

- giscanner: Added ability to add wrapper script arguments [!530]
- g-ir-tools: Support reading @rspfiles for arguments [!532]
- Update gobject-introspection-tests [!536]
- giscanner: support alignof expressions [!538]
- dumper: Fix introspection binaries missing rpaths for uninstalled ELF shlibs [!540]
- meson: Fix fs.copyfile semantics breaking GIR build with Ninja 1.12+ [!534]
- giscanner: Deduplicate arguments and use response files for MSVC [!535]
- scanner: Prefer some getters over others [!473]
- girepository: Initialize the async functions parameters [!544]


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/gobject-introspection/PLIST
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r0 -r1.7 \
    pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_maintransformer.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.98 pkgsrc/devel/gobject-introspection/Makefile:1.99
--- pkgsrc/devel/gobject-introspection/Makefile:1.98    Thu Oct 23 20:36:20 2025
+++ pkgsrc/devel/gobject-introspection/Makefile Mon Jan  5 14:49:02 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2025/10/23 20:36:20 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2026/01/05 14:49:02 ryoon Exp $
 
-DISTNAME=      gobject-introspection-1.84.0
-PKGREVISION=   1
+DISTNAME=      gobject-introspection-1.86.0
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/gobject-introspection/PLIST
diff -u pkgsrc/devel/gobject-introspection/PLIST:1.19 pkgsrc/devel/gobject-introspection/PLIST:1.20
--- pkgsrc/devel/gobject-introspection/PLIST:1.19       Tue Jan 14 13:17:12 2025
+++ pkgsrc/devel/gobject-introspection/PLIST    Mon Jan  5 14:49:02 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2025/01/14 13:17:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2026/01/05 14:49:02 ryoon Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -34,6 +34,7 @@ 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/GioUnix-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
@@ -155,6 +156,7 @@ 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/GioUnix-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.60 pkgsrc/devel/gobject-introspection/distinfo:1.61
--- pkgsrc/devel/gobject-introspection/distinfo:1.60    Fri Jul 18 08:37:35 2025
+++ pkgsrc/devel/gobject-introspection/distinfo Mon Jan  5 14:49:02 2026
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.60 2025/07/18 08:37:35 adam Exp $
+$NetBSD: distinfo,v 1.61 2026/01/05 14:49:02 ryoon Exp $
 
-BLAKE2s (gobject-introspection-1.84.0.tar.xz) = 59fbad674cbb8b76ee42e5241afa557e651926417b217e53644f888c22cc9d63
-SHA512 (gobject-introspection-1.84.0.tar.xz) = 764b5071472f93ed62bd64983c16fc4f73d4e20575d31eb475b40f4c6643080249aec4c5e9536d0ade719a99844cefa5a6e902b4d58e5644d0c0793212da3e5b
-Size (gobject-introspection-1.84.0.tar.xz) = 1080316 bytes
+BLAKE2s (gobject-introspection-1.86.0.tar.xz) = ce6be0ff2c9de0dcb08acb656f6d83a3c6091147f246a564b82cc49bea98774b
+SHA512 (gobject-introspection-1.86.0.tar.xz) = a9d2edbe1cea710e10ef1ea8059a45cf5689bace43b5d2a6861809e863a6de7114b4763db8df3916ad6202c9967f48f7997acd0810a86e5e88dea7e0be88b585
+Size (gobject-introspection-1.86.0.tar.xz) = 1083172 bytes
+SHA1 (patch-gir_meson.build) = 6d3af4a17b88ab49efb71da91b1169dc050b9081
 SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640
 SHA1 (patch-giscanner_ast.py) = 76ac2965000833cc6b8d1f37fb997706557d8c5e
 SHA1 (patch-giscanner_ccompiler.py) = f2bf40307a9ed5847f760612f985acdb1d413472
+SHA1 (patch-giscanner_maintransformer.py) = 070a8b658b9057701d3760197ccd41107d530d96
 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
 SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
 SHA1 (patch-tools_meson.build) = 775fff212ccbd964352c25e1d94469ab8db318ec

Added files:

Index: pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.7
--- /dev/null   Mon Jan  5 14:49:02 2026
+++ pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build    Mon Jan  5 14:49:02 2026
@@ -0,0 +1,46 @@
+$NetBSD: patch-gir_meson.build,v 1.7 2026/01/05 14:49:02 ryoon Exp $
+
+--- gir/meson.build.orig       2025-12-07 09:28:42.235445373 +0000
++++ gir/meson.build
+@@ -384,7 +384,6 @@ gio_command = scanner_command + [
+   '--identifier-prefix=G',
+   '--symbol-prefix=g',
+   '--c-include=gio/gio.h',
+-  '--namespace=Gio',
+   '--nsversion=2.0',
+   '--library=gio-2.0',
+ ]
+@@ -470,12 +469,33 @@ gio_gir = custom_target('gir-gio',
+     '-DGIO_COMPILATION',
+     '-DG_SETTINGS_ENABLE_BACKEND',
+     '--cflags-end',
++    '--namespace=Gio',
+     '@INPUT@',
+   ]
+ )
+ 
+ uninstalled_gir_files += gio_gir
+ 
++gio_unix_gir = custom_target('gir-gio-unix',
++  input: gio_files,
++  output: 'GioUnix-2.0.gir',
++  depends: [gobject_gir, gir_giscanner_pymod, gio_gir_dep, gdump],
++  depend_files: gir_giscanner_built_files,
++  env: g_ir_scanner_env,
++  command: gio_command + [
++    '--include-uninstalled=' + gobject_gir.full_path(),
++    '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [
++    '-DGIO_COMPILATION',
++    '-DG_SETTINGS_ENABLE_BACKEND',
++    '--cflags-end',
++    '--namespace=GioUnix',
++    '--pkg-export=gio-unix-2.0',
++    '@INPUT@',
++  ]
++)
++
++uninstalled_gir_files += gio_unix_gir
++
+ # GIRepository
+ 
+ girepository_command = scanner_command + [

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_maintransformer.py
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_maintransformer.py:1.1
--- /dev/null   Mon Jan  5 14:49:02 2026
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_maintransformer.py       Mon Jan  5 14:49:02 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-giscanner_maintransformer.py,v 1.1 2026/01/05 14:49:02 ryoon Exp $
+
+* For building GioUnix too.
+
+--- giscanner/maintransformer.py.orig  2025-12-07 09:37:11.904841636 +0000
++++ giscanner/maintransformer.py
+@@ -1215,7 +1215,7 @@ the ones that failed to resolve removed.
+             short = short[:-len('_quark')]
+             if full == "g_io_error":
+                 # Special case; GIOError was already taken forcing GIOErrorEnum
+-                assert self._namespace.name == 'Gio'
++                #assert self._namespace.name == 'Gio'
+                 enum = self._namespace.get('IOErrorEnum')
+             else:
+                 enum = self._uscore_type_names.get(short)