gobject-introspection: updated to 1.74.0

1.74.0 - 2022-09-17
-------------------
* Update the GIR data for GLib, GObject, GModule, and GIO

1.72.1 - 2022-09-21
-------------------
* Improve scanner support for C99 and pre-processor macros
* Build fixes
* Documentation fixes
* Update the GIR data for GLib, GObject, GModule, and GIO

1.72.0 - 2022-03-18
-------------------
* Add new utility API to libgirepository for bindings implementing an argument
  cache [Philip Chimento]
* Update the GIR data for GLib, GObject, GModule, and GIO

5 files changed, 12 insertions, 115 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 93761b8dde1..c14bf2789d8 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2022/11/16 16:08:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.84 2022/11/23 10:56:39 adam Exp $
 
-DISTNAME=	gobject-introspection-1.70.0
-PKGREVISION=	3
+DISTNAME=	gobject-introspection-1.74.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 8d2eb81d650..0e35f86e6ab 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.49 2022/11/16 16:08:34 jperkin Exp $
+$NetBSD: distinfo,v 1.50 2022/11/23 10:56:39 adam Exp $
 
-BLAKE2s (gobject-introspection-1.70.0.tar.xz) = 079f927cf357bc24d4df1d8130c61b9a1f3e5249f53bcf7cfe9db0989e28a4ea
-SHA512 (gobject-introspection-1.70.0.tar.xz) = 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
-Size (gobject-introspection-1.70.0.tar.xz) = 1029372 bytes
+BLAKE2s (gobject-introspection-1.74.0.tar.xz) = 0ad5a8a4c604de9103693f31a6cec1acccbc0a96d2b8772804d9974c2cb80dac
+SHA512 (gobject-introspection-1.74.0.tar.xz) = decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0
+Size (gobject-introspection-1.74.0.tar.xz) = 1044008 bytes
 SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640
-SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
+SHA1 (patch-giscanner_ast.py) = bf9f7f6f5c548ca170d177f4d724481e0b6d1e29
 SHA1 (patch-giscanner_ccompiler.py) = c730488e66caf0bb2f258df04be66d72ca714ab4
 SHA1 (patch-giscanner_doctemplates_devdocs_meson.build) = d65e229db068a99ecf78e03ff0dfae809e731612
 SHA1 (patch-giscanner_doctemplates_mallard_meson.build) = 71e65065b66ae3e58d5212642ac284854da3c13d
-SHA1 (patch-giscanner_meson.build) = f3f482ef460ea725cb45f385cd09eaab5063c46d
 SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
-SHA1 (patch-tests_scanner_meson.build) = 85fbe12f24516bf37c24bcd73974162a9249740d
 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
 SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
 SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14
diff --git a/devel/gobject-introspection/patches/patch-giscanner_ast.py b/devel/gobject-introspection/patches/patch-giscanner_ast.py
index 38e60689502..d2702c6b650 100644
--- a/devel/gobject-introspection/patches/patch-giscanner_ast.py
+++ b/devel/gobject-introspection/patches/patch-giscanner_ast.py
@@ -1,9 +1,9 @@
-$NetBSD: patch-giscanner_ast.py,v 1.1 2019/06/03 10:47:20 prlw1 Exp $
+$NetBSD: patch-giscanner_ast.py,v 1.2 2022/11/23 10:56:40 adam 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.orig	2022-09-17 18:52:38.000000000 +0000
 +++ giscanner/ast.py
 @@ -307,6 +307,15 @@ type_names['uint32_t'] = TYPE_UINT32
  type_names['int64_t'] = TYPE_INT64
@@ -21,10 +21,10 @@ $NetBSD: patch-giscanner_ast.py,v 1.1 2019/06/03 10:47:20 prlw1 Exp $
  # 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']
+@@ -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']
diff --git a/devel/gobject-introspection/patches/patch-giscanner_meson.build b/devel/gobject-introspection/patches/patch-giscanner_meson.build
deleted file mode 100644
index 3be4d6c0b70..00000000000
--- a/devel/gobject-introspection/patches/patch-giscanner_meson.build
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-giscanner_meson.build,v 1.1 2022/02/15 17:34:32 wiz Exp $
-
-Fix build with latest meson.
-https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2
-
---- giscanner/meson.build.orig	2021-09-17 16:02:42.526052200 +0000
-+++ giscanner/meson.build
-@@ -53,17 +53,9 @@ configure_file(input : '../girepository/
- 
- install_subdir('doctemplates', install_dir: giscannerdir)
- 
--# XXX: this doesn't track the input, but there is nothing to copy many files
--# in meson.
--doc_templates = custom_target('copy-templates',
--  input : 'doctemplates',
--  output : 'doctemplates',
--  command : [
--    python, '-c',
--      'import sys, shutil;' +
--      'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
--      'shutil.copytree(sys.argv[1], sys.argv[2])',
--    '@INPUT@', '@OUTPUT@'])
-+doc_templates = []
-+subdir('doctemplates/devdocs')
-+subdir('doctemplates/mallard')
- 
- flex = find_program('flex', 'win_flex')
- bison = find_program('bison', 'win_bison')
diff --git a/devel/gobject-introspection/patches/patch-tests_scanner_meson.build b/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
deleted file mode 100644
index 634ce5feb44..00000000000
--- a/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-tests_scanner_meson.build,v 1.2 2022/02/15 17:34:32 wiz Exp $
-
-Fix build with latest meson.
-https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2
-
---- tests/scanner/meson.build.orig	2021-09-17 16:02:42.597052800 +0000
-+++ tests/scanner/meson.build
-@@ -525,19 +525,26 @@ foreach gir : test_girs
- endforeach
- 
- if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
-+  doctool_env = environment()
-+  doctool_env.set('srcdir', meson.current_source_dir())
-+  doctool_env.set('builddir', meson.current_build_dir())
-+
-   foreach language : ['C', 'Python', 'Gjs']
-     regress_docs = custom_target(
-       'generate-docs-' + language,
-       input: regress_gir,
--      depends: [doc_templates],
-+      depend_files: doc_templates,
-       build_by_default: not cairo_deps_found,
-+      env: doctool_env,
-       output: 'Regress-1.0-' + language,
-       command: [
-         python, girdoctool,
-         '--add-include-path=' + join_paths(build_root, 'gir'),
-         '--add-include-path=' + meson.current_build_dir(),
-         '--language', language,
--        '@INPUT@', '-o', '@OUTPUT@'],
-+        '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
-+        '@INPUT@', '-o', '@OUTPUT@',
-+      ],
-     )
- 
-     if cairo_deps_found
-@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name
-         python,
-         args: [gi_tester, 'Regress-1.0-' + language],
-         depends: [regress_docs],
--        env: [
--          'srcdir=' + meson.current_source_dir(),
--          'builddir=' + meson.current_build_dir(),
--        ],
-+        env: doctool_env,
-       )
-     endif
-   endforeach
-@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name
-   regress_sections = custom_target(
-     'generate-docs-sections',
-     input: regress_gir,
--    depends: [doc_templates],
-+    depend_files: [doc_templates],
-     build_by_default: not cairo_deps_found,
-     output: 'Regress-1.0-sections.txt',
-+    env: doctool_env,
-     command: [
-       python, girdoctool,
-       '--add-include-path=' + join_paths(build_root, 'gir'),
-@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name
-       python,
-       args: [gi_tester, 'Regress-1.0-sections.txt'],
-       depends: [regress_sections],
--      env: [
--        'srcdir=' + meson.current_source_dir(),
--        'builddir=' + meson.current_build_dir(),
--      ],
-+      env: doctool_env,
-     )
-   endif
- endif