<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/240792222f19ae1a02a1beae6f0c3745cb968b46">https://github.com/macports/macports-ports/commit/240792222f19ae1a02a1beae6f0c3745cb968b46</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 2407922 py-pyobjc: update to 6.2, moved to GitHub
</span>2407922 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 240792222f19ae1a02a1beae6f0c3745cb968b46
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Mar 31 11:13:44 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pyobjc: update to 6.2, moved to GitHub
</span>---
python/py-pyobjc/Portfile | 12 +++---
python/py-pyobjc/files/patch-docs-conf.py.diff | 9 ++---
python/py-pyobjc/files/patch-install.py.diff | 7 ++--
python/py-pyobjc/files/pyobjc_setup.py.patch | 54 ++++++++++++--------------
4 files changed, 38 insertions(+), 44 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 355f693..44aea00 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;'>@@ -2,14 +2,14 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup bitbucket 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup ronaldoussoren pyobjc 6.1 pyobjc-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ronaldoussoren pyobjc 6.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 93a213137223054789e42c198d3daad5a962c937 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d46d061b6156df60db4562c6bb4dd886ada54c41c0463f290b3ee2650d56b3cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12915723
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 290ae501ed3c6d6959f4e955511664b4eaa4dac3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0835402fdc831d19cb02d6c6faab9e27a4930f452ffc8eeaeeb7f2f31c192624 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12971644
</span>
name py-pyobjc
categories-append devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyobjc/files/patch-docs-conf.py.diff b/python/py-pyobjc/files/patch-docs-conf.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f1604a6..6041bca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyobjc/files/patch-docs-conf.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyobjc/files/patch-docs-conf.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git docs/conf.py docs/conf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- docs/conf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docs/conf.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,6 @@ extensions = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docs/conf.py.orig 2020-04-01 07:47:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docs/conf.py 2020-04-01 07:47:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,6 @@
</span> "sphinx.ext.ifconfig",
"sphinx.ext.extlinks",
"examples",
- "sphinx_sitemap",
]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extlinks = {"issue": ("https://bitbucket.org/ronaldoussoren/pyobjc/issues/%s", "issue ")}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extlinks = {"issue": ("https://github.com/ronaldoussoren/pyobjc/issues/%s", "issue ")}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyobjc/files/patch-install.py.diff b/python/py-pyobjc/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a49c50f..c76b35e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyobjc/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyobjc/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git install.py install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,17 +186,6 @@ def sorted_framework_wrappers():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install.py.orig 2020-03-25 12:26:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install.py 2020-04-01 07:49:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,17 +187,6 @@
</span> def build_project(project, extra_args):
proj_dir = os.path.join(TOPDIR, project)
<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 65c18cf..589e2f2 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,13 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see @jmroot his patch submitted upstream:
</span> https://bitbucket.org/ronaldoussoren/pyobjc/pull-requests/22/pyobjc_setuppy-sdk-detection-fixes/diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pyobjc-core/Tools/pyobjc_setup.py b/pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/pyobjc-core/Tools/pyobjc_setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,25 +219,46 @@ def get_os_level():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v = pl["ProductVersion"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyobjc-core/Tools/pyobjc_setup.py.orig 2020-03-25 12:26:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyobjc-core/Tools/pyobjc_setup.py 2020-04-01 08:00:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,23 +203,45 @@
</span> return ".".join(v.split(".")[:2])
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-def get_sdk_level():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cflags = get_config_var("CFLAGS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cflags = shlex.split(cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for i, val in enumerate(cflags):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if val == "-isysroot":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sdk = cflags[i + 1]
</span> +def get_sdk():
+ env_cflags = os.environ.get("CFLAGS", "")
+ config_cflags = get_config_var("CFLAGS")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,26 +26,21 @@ diff --git a/pyobjc-core/Tools/pyobjc_setup.py b/pyobjc-core/Tools/pyobjc_setup.
</span> + sdk = val[len("-isysroot"):]
+ break
+ if sdk:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span> +
+ return sdk
+
<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;'>-- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++def get_sdk_level():
</span> + 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;'>@@ -57,15 +56,13 @@ diff --git a/pyobjc-core/Tools/pyobjc_setup.py b/pyobjc-core/Tools/pyobjc_setup.
</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;'>- def get_exclusions(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -411,17 +432,16 @@ def Extension(*args, **kwds):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ldflags = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -394,15 +416,14 @@
</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;'>@@ -75,11 +72,10 @@ diff --git a/pyobjc-core/Tools/pyobjc_setup.py b/pyobjc-core/Tools/pyobjc_setup.
</span> + # We're likely on a system with the Xcode Command Line Tools.
+ # Explicitly use the most recent SDK to avoid compile problems.
data = subprocess.check_output(
<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:#e0ffe0;'>+ ["/usr/bin/xcrun", "-sdk", "macosx", "--show-sdk-path"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_newlines=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ).strip()
</span> - data = data.strip()
if data:
cflags.append("-isysroot")
cflags.append(data)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags.append(
</span></pre><pre style='margin:0'>
</pre>