<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fd7c4a3a170e27785f134332a59f643c4cda401">https://github.com/macports/macports-ports/commit/4fd7c4a3a170e27785f134332a59f643c4cda401</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 4fd7c4a3a17 py-ctypeslib2: Update to 2.3.3 (#18397)
</span>4fd7c4a3a17 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4fd7c4a3a170e27785f134332a59f643c4cda401
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Mon Apr 24 13:18:54 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-ctypeslib2: Update to 2.3.3 (#18397)
</span>---
python/py-ctypeslib2/Portfile | 15 ++----
python/py-ctypeslib2/files/init_py.patch | 78 +++++++++++++++++++++-----------
2 files changed, 57 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-ctypeslib2/Portfile b/python/py-ctypeslib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 716bcd0786a..beaeef7428b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-ctypeslib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-ctypeslib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,9 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup trolldbois ctypeslib 2.3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup trolldbois ctypeslib 2.3.3
</span> name py-ctypeslib2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> python.versions 37 38 39 310 311
platforms {darwin any}
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,9 @@ long_description This fork of ctypeslib is mainly about using the \
</span> code from C source code, instead of gccxml.
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 938436348701b2bf6b4da0bced28c037f4e38204 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 934ddbc6c7b4277a059ea89427ffa715ebb921f2fd71e2b7ad765ea1e9eaa913 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 86918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 35075d7355e5566391396dc879b33bcf1748bee1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4e4a1c74f71f87f8bf685708529d066d9f361303f33035a8059da205b44b3cf6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 90571
</span>
if {${name} ne ${subport}} {
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,6 @@ if {${name} ne ${subport}} {
</span> # Use the libclang that is provided by pyXX-clang (via its +clangY variant)
patchfiles init_py.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Latest tomli rejects "True"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s/True/true/g pyproject.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
set DOCDIR ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${DOCDIR}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-ctypeslib2/files/init_py.patch b/python/py-ctypeslib2/files/init_py.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1865ccff3bb..b34ead11f61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-ctypeslib2/files/init_py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-ctypeslib2/files/init_py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +1,57 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ctypeslib/__init__.py.orig 2021-05-25 09:57:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ctypeslib/__init__.py 2021-05-25 09:59:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,24 +23,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from ctypes.util import find_library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from clang import cindex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # debug for python-haystack travis-ci
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- v1 = ["clang-%d" % _ for _ in range(14, 6, -1)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ctypeslib/__init__.py.orig 2023-04-14 19:52:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ctypeslib/__init__.py 2023-04-24 12:29:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,32 +24,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __version__ = __dist.version
</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 __find_clang_libraries():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- """ configure python-clang to use the local clang library """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _libs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # try default system name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- v0 = ["libclang", "clang"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # tries clang version 16 to 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- v1 = ["clang-%d" % _ for _ in range(16, 6, -1)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # with the dotted form of clang 6.0 to 4.0
</span> - v2 = ["clang-%.1f" % _ for _ in range(6, 3, -1)]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- v_list = v1 + v2 + ["clang-3.9", "clang-3.8", "clang-3.7"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for version in ["libclang", "clang"] + v_list:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if find_library(version) is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cindex.Config.set_library_file(find_library(version))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if os.name == "posix" and sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # On darwin, consider either Xcode or CommandLineTools.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for f in ['/Applications/Xcode.app/Contents/Frameworks/libclang.dylib',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '/Library/Developer/CommandLineTools/usr/lib/libclang.dylib']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if os.path.exists(f):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cindex.Config.set_library_file(f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # clang 3 supported versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- v3 = ["clang-3.9", "clang-3.8", "clang-3.7"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- v_list = v0 + v1 + v2 + v3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for _version in v_list:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _filename = find_library(_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _filename:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _libs.append((_version, _filename))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # On darwin, also consider either Xcode or CommandLineTools.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if os.name == "posix" and sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for _ in ['/Library/Developer/CommandLineTools/usr/lib/libclang.dylib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '/Applications/Xcode.app/Contents/Frameworks/libclang.dylib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if os.path.exists(_):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _libs.insert(0, (_, _))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return _libs
</span> -
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def clang_version():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Pull the clang C library version from the API"""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid loading the cindex API (cindex.conf.lib) to avoid version conflicts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,18 +46,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __configure_clang_cindex():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global __clang_py_version__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __clang_py_version__ = get_distribution('clang').version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # first try for a perfect match.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __lib_filename = find_library("clang-" + __clang_py_version__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if __lib_filename is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cindex.Config.set_library_file(__lib_filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return __lib_filename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __libs = __find_clang_libraries()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if len(__libs) > 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __version, __filename = __libs[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cindex.Config.set_library_file(__filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return __filename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return None
</span> + # The (MacPorts) installed clang module already knows (and depends upon)
+ # the appropriate libclang; don't go searching for something else.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- def clang_version():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return cindex.Config.library_file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cfg = cindex.Config()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return cfg.get_filename()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except ImportError as e:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print(e)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return cindex.Config().get_filename()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check which clang python module is available
</span></pre><pre style='margin:0'>
</pre>