<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96fdd5cd816c41e63dc947340b560707f92313da">https://github.com/macports/macports-ports/commit/96fdd5cd816c41e63dc947340b560707f92313da</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 96fdd5cd816 gobject-introspection-devel: Fix giscanner with setuptools 74
</span>96fdd5cd816 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96fdd5cd816c41e63dc947340b560707f92313da
</span>Author: christophecvr <stefansat@proximus.be>
AuthorDate: Mon Sep 2 10:34:50 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> gobject-introspection-devel: Fix giscanner with setuptools 74
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70667
</span>---
gnome/gobject-introspection-devel/Portfile | 3 +-
.../files/msvccompiler.patch | 87 ++++++++++++++++++++++
2 files changed, 89 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/Portfile b/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66f3d7c75a1..fe291b7f54d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ conflicts gobject-introspection
</span> set my_name gobject-introspection
version 1.78.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 1
categories gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,7 @@ depends_lib-append \
</span> patchfiles-append patch-fix-rpath-gir-typelib.diff
patchfiles-append patch-fix-scanner-in-build-execution.diff
patchfiles-append patch-fix-tools-python.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append msvccompiler.patch
</span>
post-patch {
reinplace "s|libcairo-gobject\\.2\\.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/gir/meson.build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/files/msvccompiler.patch b/gnome/gobject-introspection-devel/files/msvccompiler.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..408a9975e79
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection-devel/files/msvccompiler.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,87 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+giscanner: remove dependency on distutils.msvccompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It was removed with setuptools 74.0.0. Since we still depend on the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MSVCCompiler class use new_compiler() to get it some other way.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove any reference to MSVC9Compiler, which was for Visual Studio 2008
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which we no longer support anyway.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- giscanner/ccompiler.py.orig 2024-09-01 21:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ giscanner/ccompiler.py 2024-09-01 21:06:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import distutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from distutils.msvccompiler import MSVCCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils.unixccompiler import UnixCCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils.cygwinccompiler import Mingw32CCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils.sysconfig import get_config_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Now, create the distutils ccompiler instance based on the info we have.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if compiler_name == 'msvc':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For MSVC, we need to create a instance of a subclass of distutil's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # MSVC9Compiler class, as it does not provide a preprocess()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # MSVCCompiler class, as it does not provide a preprocess()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # implementation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from . import msvccompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.compiler = msvccompiler.get_msvc_compiler()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -453,7 +452,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return self.compiler.linker_exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def check_is_msvc(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return isinstance(self.compiler, MSVCCompiler)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return self.compiler.compiler_type == "msvc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Private APIs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _set_cpp_options(self, options):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,7 +478,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macros for compiling using distutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # get dropped for MSVC builds, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # escape the escape character.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if isinstance(self.compiler, MSVCCompiler):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if self.check_is_msvc():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macro_value = macro_value.replace('\"', '\\\"')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macros.append((macro_name, macro_value))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif option.startswith('-U'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- giscanner/msvccompiler.py.orig 2023-09-16 06:32:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ giscanner/msvccompiler.py 2024-09-01 21:07:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,30 +19,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import distutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from typing import Type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils.errors import DistutilsExecError, CompileError
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from distutils.ccompiler import CCompiler, gen_preprocess_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils.dep_util import newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Distutil's MSVCCompiler does not provide a preprocess()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Implementation, so do our own here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_msvc_compiler():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return MSVCCompiler()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class MSVCCompiler(DistutilsMSVCCompiler):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __init__(self, verbose=0, dry_run=0, force=0):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- super(distutils.msvccompiler.MSVCCompiler, self).__init__()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ super(DistutilsMSVCCompiler, self).__init__()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CCompiler.__init__(self, verbose, dry_run, force)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.__paths = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.__arch = None # deprecated name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if os.name == 'nt':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.__version = distutils.msvc9compiler.VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.initialized = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.preprocess_options = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.check_is_clang_cl():
</span></pre><pre style='margin:0'>
</pre>