<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/65aa5a64193dc1cbb57807ea8d4fac2524831065">https://github.com/macports/macports-ports/commit/65aa5a64193dc1cbb57807ea8d4fac2524831065</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 65aa5a6 py-pyobjc: update patch links (and use patches extracted by git)
</span>65aa5a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 65aa5a64193dc1cbb57807ea8d4fac2524831065
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sat Apr 4 15:06:24 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> py-pyobjc: update patch links (and use patches extracted by git)
</span>---
.../py-pyobjc/files/patch-method-signature.m.diff | 8 +++++-
python/py-pyobjc/files/pyobjc_setup.py.patch | 32 ++++++++++++----------
2 files changed, 25 insertions(+), 15 deletions(-)
<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><span style='display:block; white-space:pre;color:#808080;'>index a8afc23..12f6122 100644
</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;'>+++ b/python/py-pyobjc/files/patch-method-signature.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ronaldoussoren/pyobjc/pull/301
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git pyobjc-core/Modules/objc/method-signature.m pyobjc-core/Modules/objc/method-signature.m
<span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6ee75d741..fe77bc1f1 100644
</span> --- pyobjc-core/Modules/objc/method-signature.m
+++ pyobjc-core/Modules/objc/method-signature.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,7 +577,10 @@ setup_descr(struct _PyObjC_ArgDescr* des
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -577,7 +577,10 @@ setup_descr(struct _PyObjC_ArgDescr* descr, PyObject* meta, BOOL is_native)
</span> } else {
if (descr == NULL || (descr->tmpl && descr->alreadyRetained))
return -2;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,3 +16,6 @@ diff --git pyobjc-core/Modules/objc/method-signature.m pyobjc-core/Modules/objc/
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.26.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;color:#808080;'>index 589e2f2..02e987a 100644
</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;'>+++ b/python/py-pyobjc/files/pyobjc_setup.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see @jmroot his patch submitted upstream:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bitbucket.org/ronaldoussoren/pyobjc/pull-requests/22/pyobjc_setuppy-sdk-detection-fixes/diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyobjc-core/Tools/pyobjc_setup.py.orig 2020-03-25 12:26:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyobjc-core/Tools/pyobjc_setup.py 2020-04-01 08:00:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,23 +203,45 @@
</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:#e0ffe0;'>+https://github.com/ronaldoussoren/pyobjc/pull/302
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pyobjc-core/Tools/pyobjc_setup.py pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7e1a8358c..4457c34bf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,23 +203,44 @@ def get_os_level():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ".".join(v.split(".")[:2])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -def get_sdk_level():
- cflags = get_config_var("CFLAGS")
- cflags = shlex.split(cflags)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,16 +33,15 @@ https://bitbucket.org/ronaldoussoren/pyobjc/pull-requests/22/pyobjc_setuppy-sdk-
</span> +
+ return sdk
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +def get_sdk_level():
+ sdk = get_sdk()
+
+ if not sdk:
return None
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if sdk == "/":
return get_os_level()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - sdk = os.path.basename(sdk)
- assert sdk.startswith("MacOSX")
- assert sdk.endswith(".sdk")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,13 +57,13 @@ https://bitbucket.org/ronaldoussoren/pyobjc/pull-requests/22/pyobjc_setuppy-sdk-
</span> + raise SystemExit("Cannot determine SDK version")
+ else:
+ return sdkname[6:-4]
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> class pyobjc_install_lib(install_lib.install_lib):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -394,15 +416,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -394,15 +415,14 @@ def Extension(*args, **kwds):
</span> if "clang" in get_config_var("CC"):
cflags.append("-Wno-deprecated-declarations")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - CFLAGS = get_config_var("CFLAGS")
- if "-isysroot" not in CFLAGS: # and os.path.exists('/usr/include/stdio.h'):
- # We're likely on a system with de Xcode Command Line Tools.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,3 +80,6 @@ https://bitbucket.org/ronaldoussoren/pyobjc/pull-requests/22/pyobjc_setuppy-sdk-
</span> if data:
cflags.append("-isysroot")
cflags.append(data)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.26.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>