pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-sip4: support python 3.12 and lator



Module Name:	pkgsrc-wip
Committed By:	Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By:	steleto
Date:		Thu Aug 13 15:14:54 2026 +0900
Changeset:	7ba3520be70c79d5d023f8fe2ab2744a60aa1dec

Modified Files:
	py-sip4/Makefile
	py-sip4/distinfo
	py-sip4/patches/patch-configure.py

Log Message:
py-sip4: support python 3.12 and lator

removed distutils

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7ba3520be70c79d5d023f8fe2ab2744a60aa1dec

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

diffstat:
 py-sip4/Makefile                   |  2 --
 py-sip4/distinfo                   |  2 +-
 py-sip4/patches/patch-configure.py | 34 +++++++++++++++++++++++++++++++---
 3 files changed, 32 insertions(+), 6 deletions(-)

diffs:
diff --git a/py-sip4/Makefile b/py-sip4/Makefile
index 95660abed7..7c3ae12bbc 100644
--- a/py-sip4/Makefile
+++ b/py-sip4/Makefile
@@ -56,8 +56,6 @@ SUBST_STAGE.pyversfx=	pre-configure
 SUBST_FILES.pyversfx=	sipgen/sipgen.sbf
 SUBST_VARS.pyversfx=	PYVERSSUFFIX
 
-PYTHON_VERSIONS_ACCEPTED=	311 312
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
diff --git a/py-sip4/distinfo b/py-sip4/distinfo
index 3193dcecf2..141f22f7dd 100644
--- a/py-sip4/distinfo
+++ b/py-sip4/distinfo
@@ -3,7 +3,7 @@ $NetBSD$
 BLAKE2s (sip-4.19.25.tar.gz) = fb9290de418db91c8597c0210dea5738eba23950ba469766ee427cb813c6d05b
 SHA512 (sip-4.19.25.tar.gz) = 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 Size (sip-4.19.25.tar.gz) = 1056384 bytes
-SHA1 (patch-configure.py) = b200e5dc1b33e21d866136efa3809fc7a2ce4d82
+SHA1 (patch-configure.py) = 695db6720a7c7b9db5066d83f32f16e452776763
 SHA1 (patch-sipgen_sipgen.sbf) = f90554d3d0e4cdcf33e69f492281a028ed6975fb
 SHA1 (patch-siplib_siplib.c) = 683d7384db93b3ee8738ab33b62db619fc0b4a5d
 SHA1 (patch-siputils.py) = 39436983efbf6719b376084a14b8c71b708ed329
diff --git a/py-sip4/patches/patch-configure.py b/py-sip4/patches/patch-configure.py
index c29129d9f0..7a7e6e7ae9 100644
--- a/py-sip4/patches/patch-configure.py
+++ b/py-sip4/patches/patch-configure.py
@@ -1,10 +1,38 @@
 $NetBSD$
 
 Add PYVERSSUFFIX.
+Support python >3.12.
 
---- configure.py.orig	2018-10-01 13:22:40.000000000 +0000
+--- configure.py.orig	2021-02-26 15:28:41.621025600 +0000
 +++ configure.py
-@@ -250,7 +250,7 @@ def set_platform_directories():
+@@ -20,7 +20,7 @@ import optparse
+ import os
+ import glob
+ import optparse
+-from distutils import sysconfig
++import sysconfig
+ 
+ try:
+     from importlib import invalidate_caches
+@@ -220,9 +220,9 @@ def set_platform_directories():
+     global plat_py_conf_inc_dir, plat_bin_dir, plat_py_lib_dir, plat_sip_dir
+ 
+     # We trust distutils for some stuff.
+-    plat_py_site_dir = sysconfig.get_python_lib(plat_specific=1)
+-    plat_py_inc_dir = sysconfig.get_python_inc()
+-    plat_py_venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
++    plat_py_site_dir = sysconfig.get_path('platlib')
++    plat_py_inc_dir = sysconfig.get_path('include')
++    plat_py_venv_inc_dir = sysconfig.get_path('include', vars={'base': sys.prefix, 'platbase': sys.prefix})
+     plat_py_conf_inc_dir = os.path.dirname(sysconfig.get_config_h_filename())
+ 
+     if sys.platform == "win32":
+@@ -249,11 +249,11 @@ def set_platform_directories():
+         plat_bin_dir = bin_dir
+         plat_sip_dir = sys.prefix + "\\sip"
+     else:
+-        lib_dir = sysconfig.get_python_lib(plat_specific=1, standard_lib=1)
++        lib_dir = sysconfig.get_path('platstdlib')
  
          plat_py_lib_dir = lib_dir + "/config"
          plat_bin_dir = sys.exec_prefix + "/bin"
@@ -13,7 +41,7 @@ Add PYVERSSUFFIX.
  
  
  def create_config(module, template, macros):
-@@ -268,7 +268,7 @@ def create_config(module, template, macr
+@@ -271,7 +271,7 @@ def create_config(module, template, macros):
          "sip_version":      sip_version,
          "sip_version_str":  sip_version_str,
          "platform":         build_platform,


Home | Main Index | Thread Index | Old Index