<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch stellarium_0.15.0
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/28881672fb065521a6cb7f81fb153711f99659dc">https://github.com/macports/macports-ports/commit/28881672fb065521a6cb7f81fb153711f99659dc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 28881672fb065521a6cb7f81fb153711f99659dc
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 5 21:41:01 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-pyobjc-cocoa: allow 32-bit build on macOS Sierra
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/52743
</span><span style='display:block; white-space:pre;color:#404040;'> On 64-bit systems, py-pyobjc-cocoa does not include pymactoolbox.h.
</span><span style='display:block; white-space:pre;color:#404040;'> It declares the parts it needs.
</span><span style='display:block; white-space:pre;color:#404040;'> On macOS Sierra, the same trick is needed on 32-bit systems.
</span>---
python/py-pyobjc-cocoa/Portfile | 3 +++
.../files/patch-python2-32mode.diff | 23 ++++++++++++++++++++++
2 files changed, 26 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyobjc-cocoa/Portfile b/python/py-pyobjc-cocoa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71216ac..8f2640b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyobjc-cocoa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyobjc-cocoa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup python 1.0
</span> name py-pyobjc-cocoa
python.rootname pyobjc-framework-Cocoa
version 3.0.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append devel
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +29,8 @@ python.versions 27 34 35
</span> if {${name} ne ${subport}} {
depends_lib port:py${python.version}-pyobjc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-python2-32mode.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
depends_fetch
depends_lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyobjc-cocoa/files/patch-python2-32mode.diff b/python/py-pyobjc-cocoa/files/patch-python2-32mode.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5327bf3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyobjc-cocoa/files/patch-python2-32mode.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/_AppKit_carbon.m.orig 2014-01-15 09:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/_AppKit_carbon.m 2016-11-03 15:49:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,20 +5,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PY_MAJOR_VERSION == 2 && defined(USE_TOOLBOX_OBJECT_GLUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* FIXME: the bits of pymactoolbox.h that we need,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * because said header doesn't work in 64-bit mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern PyObject *WinObj_New(WindowPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int WinObj_Convert(PyObject *, WindowPtr *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern PyObject *WinObj_WhichWindow(WindowPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py2window(PyObject* obj, void* output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>