From f310de9dc9f16bd016e06d6c9a1decc07a918273 Mon Sep 17 00:00:00 2001
From: Vincent Le Garrec <github@le-garrec.fr>
Date: Wed, 11 Feb 2026 08:12:30 +0100
Subject: [PATCH] [gobject-introspection] Fix setuptools 81 (#49918)

---
 ports/gobject-introspection/portfile.cmake         |  2 ++
 .../gobject-introspection/setuptools-compat.patch  | 14 ++++++++++++++
 ports/gobject-introspection/vcpkg.json             |  2 +-
 versions/baseline.json                             |  2 +-
 versions/g-/gobject-introspection.json             |  5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 ports/gobject-introspection/setuptools-compat.patch

diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake
index e32f455bd6..1090f90bec 100644
--- a/ports/gobject-introspection/portfile.cmake
+++ b/ports/gobject-introspection/portfile.cmake
@@ -13,6 +13,8 @@ vcpkg_extract_source_archive(
     PATCHES
         0001-g-ir-tool-template.in.patch
         gir-scanner-runtime.diff
+        # https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/575
+        setuptools-compat.patch
 )
 
 include("${CURRENT_PORT_DIR}/vcpkg-port-config.cmake")
diff --git a/ports/gobject-introspection/setuptools-compat.patch b/ports/gobject-introspection/setuptools-compat.patch
new file mode 100644
index 0000000000..c9672fef1f
--- /dev/null
+++ b/ports/gobject-introspection/setuptools-compat.patch
@@ -0,0 +1,14 @@
+diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
+index c9f14b5..1cd57df 100644
+--- a/giscanner/msvccompiler.py
++++ b/giscanner/msvccompiler.py
+@@ -40,7 +40,8 @@ class MSVCCompiler(DistutilsMSVCCompiler):
+ 
+     def __init__(self, verbose=0, dry_run=0, force=0):
+         super(DistutilsMSVCCompiler, self).__init__()
+-        CCompiler.__init__(self, verbose, dry_run, force)
++        # dry_run removed in setuptools 81; just ignore it
++        CCompiler.__init__(self, verbose=verbose, force=force)
+         self.__paths = []
+         self.__arch = None  # deprecated name
+         self.initialized = False
diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json
index de336a0cb4..2e56d56f6e 100644
--- a/ports/gobject-introspection/vcpkg.json
+++ b/ports/gobject-introspection/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gobject-introspection",
   "version": "1.86.0",
-  "port-version": 1,
+  "port-version": 2,
   "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.",
diff --git a/versions/baseline.json b/versions/baseline.json
index b43865c396..f225a8c6fd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3466,7 +3466,7 @@
     },
     "gobject-introspection": {
       "baseline": "1.86.0",
-      "port-version": 1
+      "port-version": 2
     },
     "godot-cpp": {
       "baseline": "4.4",
diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json
index e3a685f972..9d26bec496 100644
--- a/versions/g-/gobject-introspection.json
+++ b/versions/g-/gobject-introspection.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ab81d4194cc3a975fd12793d4ca8893986702f5a",
+      "version": "1.86.0",
+      "port-version": 2
+    },
     {
       "git-tree": "9fc1dbba428c95f5b53e5839d05c681035ceb1e5",
       "version": "1.86.0",