CVS commit: pkgsrc/devel/gobject-introspection

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Wed Sep  4 06:05:05 UTC 2024

Modified Files:
        pkgsrc/devel/gobject-introspection: Makefile distinfo
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_ccompiler.py
Added Files:
        pkgsrc/devel/gobject-introspection/patches:
            patch-giscanner_msvccompiler.py

Log Message:
gobject-introspection: Fix build with py-setuptools-74.0.0 PR pkg/58662

https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/a2139dba59eac283a7f543ed737f038deebddc19


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/devel/gobject-introspection/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gobject-introspection/patches/patch-giscanner_msvccompiler.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gobject-introspection/Makefile
diff -u pkgsrc/devel/gobject-introspection/Makefile:1.94 pkgsrc/devel/gobject-introspection/Makefile:1.95
--- pkgsrc/devel/gobject-introspection/Makefile:1.94    Wed Apr 10 09:15:08 2024
+++ pkgsrc/devel/gobject-introspection/Makefile Wed Sep  4 06:05:05 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2024/04/10 09:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2024/09/04 06:05:05 prlw1 Exp $
 
 DISTNAME=      gobject-introspection-1.80.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.55 pkgsrc/devel/gobject-introspection/distinfo:1.56
--- pkgsrc/devel/gobject-introspection/distinfo:1.55    Fri Aug 30 16:31:19 2024
+++ pkgsrc/devel/gobject-introspection/distinfo Wed Sep  4 06:05:05 2024
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.55 2024/08/30 16:31:19 ryoon Exp $
+$NetBSD: distinfo,v 1.56 2024/09/04 06:05:05 prlw1 Exp $
 
 BLAKE2s (gobject-introspection-1.80.1.tar.xz) = 7c2c1b4225ea68afbe91b6718b1f1c6d4f102cf1a3b8bdf27599b199ef1480b6
 SHA512 (gobject-introspection-1.80.1.tar.xz) = f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a
 Size (gobject-introspection-1.80.1.tar.xz) = 1040228 bytes
 SHA1 (patch-girepository_gitypelib.c) = b5fa0fe0fc22a5dfb2b2916dfbb87e16fc732640
 SHA1 (patch-giscanner_ast.py) = 24d31e9675af3779a9399a1611cf6bc985285360
-SHA1 (patch-giscanner_ccompiler.py) = 1c5b38f5720b0174ace77645df0985060408d26f
+SHA1 (patch-giscanner_ccompiler.py) = 3a2a73c407b7d436ae540578318c56a60f1efa70
+SHA1 (patch-giscanner_msvccompiler.py) = f7ce9c14903a4eca4cdcae1a0289979e95af0a47
 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
 SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
 SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py
diff -u pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.7 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.8
--- pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py:1.7 Fri Aug 30 16:31:19 2024
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_ccompiler.py     Wed Sep  4 06:05:05 2024
@@ -1,22 +1,29 @@
-$NetBSD: patch-giscanner_ccompiler.py,v 1.7 2024/08/30 16:31:19 ryoon Exp $
-
-Fix build with py-setuptools-74.0.0.
+$NetBSD: patch-giscanner_ccompiler.py,v 1.8 2024/09/04 06:05:05 prlw1 Exp $
 
+Fix build with py-setuptools-74.0.0. (upstream a2139dba59)
 Exclude system paths from LD_LIBRARY_PATH.
 Do not use -Wl,--no-as-needed on SunOS.
 
 --- giscanner/ccompiler.py.orig        2024-04-01 13:21:25.000000000 +0000
 +++ giscanner/ccompiler.py
-@@ -26,7 +26,7 @@ import tempfile
+@@ -26,7 +26,6 @@ import tempfile
  import sys
  import distutils
  
 -from distutils.msvccompiler import MSVCCompiler
-+from distutils._msvccompiler import MSVCCompiler
  from distutils.unixccompiler import UnixCCompiler
  from distutils.cygwinccompiler import Mingw32CCompiler
  from distutils.sysconfig import get_config_vars
-@@ -232,7 +232,7 @@ class CCompiler(object):
+@@ -167,7 +166,7 @@ class CCompiler(object):
+         # Now, create the distutils ccompiler instance based on the info we have.
+         if compiler_name == 'msvc':
+             # For MSVC, we need to create a instance of a subclass of distutil's
+-            # MSVC9Compiler class, as it does not provide a preprocess()
++            # MSVCCompiler class, as it does not provide a preprocess()
+             # implementation
+             from . import msvccompiler
+             self.compiler = msvccompiler.get_msvc_compiler()
+@@ -232,7 +231,7 @@ class CCompiler(object):
  
                  # Ensure libraries are always linked as we are going to use ldd to work
                  # out their names later
@@ -25,7 +32,7 @@ Do not use -Wl,--no-as-needed on SunOS.
                      args.append('-Wl,--no-as-needed')
  
          for library_path in libpaths:
-@@ -250,7 +250,8 @@ class CCompiler(object):
+@@ -250,7 +249,8 @@ class CCompiler(object):
                      else:
                          args.append('-Wl,-rpath,' + library_path)
  
@@ -35,3 +42,21 @@ Do not use -Wl,--no-as-needed on SunOS.
  
          for library in libraries + extra_libraries:
              if os.path.isfile(library):
+@@ -460,7 +460,7 @@ class CCompiler(object):
+             return self.compiler.linker_exe
+ 
+     def check_is_msvc(self):
+-        return isinstance(self.compiler, MSVCCompiler)
++        return self.compiler.compiler_type == "msvc"
+ 
+     # Private APIs
+     def _set_cpp_options(self, options):
+@@ -486,7 +486,7 @@ class CCompiler(object):
+                     # macros for compiling using distutils
+                     # get dropped for MSVC builds, so
+                     # escape the escape character.
+-                    if isinstance(self.compiler, MSVCCompiler):
++                    if self.check_is_msvc():
+                         macro_value = macro_value.replace('\"', '\\\"')
+                 macros.append((macro_name, macro_value))
+             elif option.startswith('-U'):

Added files:

Index: pkgsrc/devel/gobject-introspection/patches/patch-giscanner_msvccompiler.py
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-giscanner_msvccompiler.py:1.1
--- /dev/null   Wed Sep  4 06:05:05 2024
+++ pkgsrc/devel/gobject-introspection/patches/patch-giscanner_msvccompiler.py  Wed Sep  4 06:05:05 2024
@@ -0,0 +1,44 @@
+$NetBSD: patch-giscanner_msvccompiler.py,v 1.1 2024/09/04 06:05:05 prlw1 Exp $
+
+Fix build with py-setuptools-74.0.0. (upstream a2139dba59)
+
+--- giscanner/msvccompiler.py.orig     2024-04-01 13:21:25.000000000 +0000
++++ giscanner/msvccompiler.py
+@@ -19,30 +19,30 @@
+ #
+ 
+ import os
+-import distutils
++from typing import Type
+ 
+ from distutils.errors import DistutilsExecError, CompileError
+-from distutils.ccompiler import CCompiler, gen_preprocess_options
++from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
+ from distutils.dep_util import newer
+ 
+ # Distutil's MSVCCompiler does not provide a preprocess()
+ # Implementation, so do our own here.
+ 
+ 
++DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
++
++
+ def get_msvc_compiler():
+     return MSVCCompiler()
+ 
+ 
+-class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
++class MSVCCompiler(DistutilsMSVCCompiler):
+ 
+     def __init__(self, verbose=0, dry_run=0, force=0):
+-        super(distutils.msvccompiler.MSVCCompiler, self).__init__()
++      super(DistutilsMSVCCompiler, self).__init__()
+         CCompiler.__init__(self, verbose, dry_run, force)
+         self.__paths = []
+         self.__arch = None  # deprecated name
+-        if os.name == 'nt':
+-            if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
+-                self.__version = distutils.msvc9compiler.VERSION
+         self.initialized = False
+         self.preprocess_options = None
+         if self.check_is_clang_cl():