[gobject-introspection] Update to 1.86.0 (#48463)

This commit is contained in:
Kai Pastor 2025-11-26 23:24:00 +01:00 committed by GitHub
parent fedd9426fc
commit 8c077366d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 25 additions and 22 deletions

View File

@ -1,5 +1,5 @@
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index 469af0c..f165a98 100755
index 648c9ab..b5e3568 100755
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -1,4 +1,4 @@
@ -36,8 +36,7 @@ index 469af0c..f165a98 100755
# EXT_SUFFIX for py3 SO for py2
py_mod_suffix = sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO')
@@ -89,13 +87,19 @@ if not os.path.isfile(os.path.join(pylibdir, 'giscanner', '_giscanner' + py_mod_
gdump_path = os.path.join(builddir, 'giscanner', 'gdump.c')
@@ -90,12 +88,18 @@ if not os.path.isfile(os.path.join(pylibdir, 'giscanner', '_giscanner' + py_mod_
if os.path.isfile(gdump_path):
builtins.__dict__['GDUMP_PATH'] = gdump_path
else:

View File

@ -1,12 +0,0 @@
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
index 38e21534edfa6c92f2ecb6c8a68b6d0360c21c64..4ca62d21f8fa8e663db152415d0ef85cfe6107f5 100644
--- a/giscanner/scannerlexer.l
+++ b/giscanner/scannerlexer.l
@@ -193,6 +193,7 @@ stringtext ([^\\\"])|(\\.)
"__declspec(deprecated(".*"))" { /* Ignore */ }
"__declspec"[\t ]*"("[a-z\t ]+")" { /* Ignore */ }
"__stdcall" { /* ignore */ }
+"__fastcall" { /* ignore */ }
"__w64" { /* ignore */ }
"G_GINT64_CONSTANT" { return INTL_CONST; }

View File

@ -0,0 +1,12 @@
diff --git a/meson.build b/meson.build
index ea3ae94..9cd88fe 100644
--- a/meson.build
+++ b/meson.build
@@ -220,6 +220,7 @@ current_library_path = run_command(
g_ir_scanner_env.set(var, current_library_path.stdout().strip())
if host_system in ['windows', 'cygwin']
g_ir_scanner_env.prepend(var, gio_dep.get_variable('giomoduledir'))
+ g_ir_scanner_env.prepend(var, glib_dep.get_variable('bindir'))
endif
configure_file(

View File

@ -3,7 +3,7 @@ string(REGEX REPLACE "^([0-9]+[.][0-9]+).*\$" "\\1" GI_MAJOR_MINOR "${VERSION}")
vcpkg_download_distfile(ARCHIVE
URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${VERSION}.tar.xz"
FILENAME "gobject-introspection-${VERSION}.tar.xz"
SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7
SHA512 a9d2edbe1cea710e10ef1ea8059a45cf5689bace43b5d2a6861809e863a6de7114b4763db8df3916ad6202c9967f48f7997acd0810a86e5e88dea7e0be88b585
)
vcpkg_extract_source_archive(
@ -11,7 +11,7 @@ vcpkg_extract_source_archive(
ARCHIVE "${ARCHIVE}"
PATCHES
0001-g-ir-tool-template.in.patch
0004-fastcall.patch # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/498
gir-scanner-runtime.diff
)
include("${CURRENT_PORT_DIR}/vcpkg-port-config.cmake")

View File

@ -1,7 +1,6 @@
{
"name": "gobject-introspection",
"version": "1.82.0",
"port-version": 1,
"version": "1.86.0",
"description": [
"A middleware layer between C libraries (using GObject) and language bindings.",
"Building (with) gobject-introspection is based on dynamic library linkage. Static builds of the core feature set are supported only for CI purposes.",

View File

@ -106,6 +106,7 @@ gflags(uwp)=fail
glfw3(uwp)=fail
glibmm:x64-windows-static-md=fail
glibmm:x64-windows-static=fail
gobject-introspection(android)=fail
google-cloud-cpp(uwp)=fail
graphicsmagick(uwp)=fail
graphqlparser:arm64-osx=fail # python2 required
@ -577,7 +578,6 @@ gmsh[mpi]:x64-windows = cascade
gmsh[mpi]:x64-windows-static = cascade
gmsh[mpi]:x64-windows-static-md = cascade
gmsh[mpi]:x86-windows = cascade
gobject-introspection(android) = cascade # from python3
google-cloud-cpp-common:arm64-uwp = cascade
google-cloud-cpp-common:x64-uwp = cascade
google-cloud-cpp-spanner:arm64-uwp = cascade

View File

@ -3409,8 +3409,8 @@
"port-version": 0
},
"gobject-introspection": {
"baseline": "1.82.0",
"port-version": 1
"baseline": "1.86.0",
"port-version": 0
},
"godot-cpp": {
"baseline": "4.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "955ccf39bab4317cbcdd48b404e153a5d4087b94",
"version": "1.86.0",
"port-version": 0
},
{
"git-tree": "ea77d8c01f088c46520c98ec3682c93148150b80",
"version": "1.82.0",