Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ports/gobject-introspection/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 14 additions & 0 deletions ports/gobject-introspection/setuptools-compat.patch
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ports/gobject-introspection/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3466,7 +3466,7 @@
},
"gobject-introspection": {
"baseline": "1.86.0",
"port-version": 1
"port-version": 2
},
"godot-cpp": {
"baseline": "4.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gobject-introspection.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ab81d4194cc3a975fd12793d4ca8893986702f5a",
"version": "1.86.0",
"port-version": 2
},
{
"git-tree": "9fc1dbba428c95f5b53e5839d05c681035ceb1e5",
"version": "1.86.0",
Expand Down