<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/3f0bb839202602be604347641ab50c32ba6a882b">https://github.com/macports/macports-ports/commit/3f0bb839202602be604347641ab50c32ba6a882b</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 3f0bb839202 py-pyobjc: update to 6.2.1
</span>3f0bb839202 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3f0bb839202602be604347641ab50c32ba6a882b
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Jun 25 22:17:39 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pyobjc: update to 6.2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove patch-method-signature.m.diff and pyobjc_setup.py.patch, both
</span><span style='display:block; white-space:pre;color:#404040;'> are accepted by upstream
</span>---
python/py-pyobjc/Portfile | 19 +----
.../py-pyobjc/files/patch-method-signature.m.diff | 21 ------
python/py-pyobjc/files/pyobjc_setup.py.patch | 85 ----------------------
3 files changed, 4 insertions(+), 121 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyobjc/Portfile b/python/py-pyobjc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 44aea00568b..b1eadfe8f82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyobjc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyobjc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ronaldoussoren pyobjc 6.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ronaldoussoren pyobjc 6.2.1 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 290ae501ed3c6d6959f4e955511664b4eaa4dac3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0835402fdc831d19cb02d6c6faab9e27a4930f452ffc8eeaeeb7f2f31c192624 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12971644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c4c22cba85c8c4e215e34ac719bfb607b0d93d3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b17c37465fa4aaae87b696da5cbdb58b3cc7c52fd8061374ba8a048e8ce71507 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13008027
</span>
name py-pyobjc
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,12 +41,6 @@ if {${name} ne ${subport}} {
</span> patch-docs-conf.py.diff \
patch-install.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary fix for https://trac.macports.org/ticket/59781
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 19.0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-method-signature.m.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|use-system-libffi = 0|\\
use-system-libffi = 1\\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,11 +50,6 @@ deployment-target = ${macosx_deployment_target}\\
</span> reinplace \
"s/sphinx-build /sphinx-build-${python.branch} /g" \
${worksrcpath}/docs/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "patch ${worksrcpath}/pyobjc-core/Tools/pyobjc_setup.py < ${filespath}/pyobjc_setup.py.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -directory ${worksrcpath} */pyobjc_setup.py] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "patch ${f} < ${filespath}/pyobjc_setup.py.patch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {${configure.sdkroot} eq ""} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyobjc/files/patch-method-signature.m.diff b/python/py-pyobjc/files/patch-method-signature.m.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 12f61229d55..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyobjc/files/patch-method-signature.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/ronaldoussoren/pyobjc/pull/301
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pyobjc-core/Modules/objc/method-signature.m pyobjc-core/Modules/objc/method-signature.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6ee75d741..fe77bc1f1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyobjc-core/Modules/objc/method-signature.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyobjc-core/Modules/objc/method-signature.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,7 +577,10 @@ setup_descr(struct _PyObjC_ArgDescr* descr, PyObject* meta, BOOL is_native)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (descr == NULL || (descr->tmpl && descr->alreadyRetained))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- descr->alreadyRetained = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // descr may be loaded into read-only memory, so only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // write if truly necessary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (descr->alreadyRetained)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ descr->alreadyRetained = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.26.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyobjc/files/pyobjc_setup.py.patch b/python/py-pyobjc/files/pyobjc_setup.py.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 02e987a1a15..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyobjc/files/pyobjc_setup.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/ronaldoussoren/pyobjc/pull/302
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pyobjc-core/Tools/pyobjc_setup.py pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7e1a8358c..4457c34bf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,23 +203,44 @@ def get_os_level():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ".".join(v.split(".")[:2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--def get_sdk_level():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cflags = get_config_var("CFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cflags = shlex.split(cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for i, val in enumerate(cflags):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if val == "-isysroot":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sdk = cflags[i + 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def get_sdk():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ env_cflags = os.environ.get("CFLAGS", "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config_cflags = get_config_var("CFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sdk = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for cflags_str in [env_cflags, config_cflags]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cflags = shlex.split(cflags_str)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for i, val in enumerate(cflags):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if val == "-isysroot":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sdk = cflags[i + 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif val.find("-isysroot") == 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sdk = val[len("-isysroot"):]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if sdk:
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def get_sdk_level():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sdk = get_sdk()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not sdk:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sdk == "/":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return get_os_level()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sdk = os.path.basename(sdk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert sdk.startswith("MacOSX")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- assert sdk.endswith(".sdk")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return sdk[6:-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sdkname = os.path.basename(sdk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert sdkname.startswith("MacOSX")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert sdkname.endswith(".sdk")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if sdkname == "MacOSX.sdk":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pl = plistlib.readPlist(os.path.join(sdk, "SDKSettings.plist"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return pl["Version"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ raise SystemExit("Cannot determine SDK version")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return sdkname[6:-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class pyobjc_install_lib(install_lib.install_lib):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -394,15 +415,14 @@ def Extension(*args, **kwds):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if "clang" in get_config_var("CC"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags.append("-Wno-deprecated-declarations")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS = get_config_var("CFLAGS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if "-isysroot" not in CFLAGS: # and os.path.exists('/usr/include/stdio.h'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # We're likely on a system with de Xcode Command Line Tools.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Explicitly use the most recent problems to avoid compile problems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sdk = get_sdk()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not sdk: # and os.path.exists('/usr/include/stdio.h'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # We're likely on a system with the Xcode Command Line Tools.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Explicitly use the most recent SDK to avoid compile problems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data = subprocess.check_output(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ["/usr/bin/xcrun", "-sdk", "macosx", "--show-sdk-path"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_newlines=True,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ).strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- data = data.strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if data:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags.append("-isysroot")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags.append(data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.26.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>