<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121456] trunk/dports/python/py-pyobjc</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121456">121456</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-06-25 17:17:51 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-pyobjc: fix build with current setuptools (#43586)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyobjcPortfile">trunk/dports/python/py-pyobjc/Portfile</a></li>
<li><a href="#trunkdportspythonpypyobjcfilessetuppydiff">trunk/dports/python/py-pyobjc/files/setup.py.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyobjcfilespatchModules20diff">trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff</a></li>
<li><a href="#trunkdportspythonpypyobjcfilespatchPyErr_WarnExdiff">trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff</a></li>
<li><a href="#trunkdportspythonpypyobjcfilesundef_snprintfdiff">trunk/dports/python/py-pyobjc/files/undef_snprintf.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpypyobjcPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyobjc/Portfile (121455 => 121456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyobjc/Portfile 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/Portfile 2014-06-26 00:17:51 UTC (rev 121456)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> Python based functionality.
</span><span class="cx">
</span><span class="cx"> homepage http://pyobjc.sourceforge.net/
</span><del>-master_sites http://pypi.python.org/packages/source/p/pyobjc-core/
</del><ins>+master_sites https://pypi.python.org/packages/source/p/pyobjc-core/
</ins><span class="cx"> distname pyobjc-core-${version}
</span><span class="cx"> checksums rmd160 26e9764fda522993670898369115f0af9c480bce \
</span><span class="cx"> sha256 164617f61ede177ff60cb4a6103326645c9d87aadee04b15493c3b49e31049e6
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> depends_lib port:py${python.version}-setuptools \
</span><span class="cx"> port:py${python.version}-py2app
</span><span class="cx">
</span><ins>+ patchfiles setup.py.diff
+
</ins><span class="cx"> set readme_name README.txt
</span><span class="cx"> if {${python.version} == 25} {
</span><span class="cx"> version 2.2
</span><span class="lines">@@ -46,7 +48,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> platform darwin 8 {
</span><del>- depends_fetch
</del><span class="cx"> depends_lib
</span><span class="cx"> pre-fetch {
</span><span class="cx"> return -code error "PyObjC 2 requires Mac OS X 10.5 or later"
</span><span class="lines">@@ -66,6 +67,6 @@
</span><span class="cx"> livecheck.type none
</span><span class="cx"> } else {
</span><span class="cx"> livecheck.type regex
</span><del>- livecheck.url http://pypi.python.org/pypi/pyobjc-core/
</del><ins>+ livecheck.url https://pypi.python.org/pypi/pyobjc-core/
</ins><span class="cx"> livecheck.regex {pyobjc-core ([0-9.]+)}
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpypyobjcfilespatchModules20diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff (121455 => 121456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff 2014-06-26 00:17:51 UTC (rev 121456)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-diff -rupN Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
---- Modules-original/objc/objc-runtime-compat.m 2009-05-25 03:56:04.000000000 +0900
-+++ Modules/objc/objc-runtime-compat.m 2012-05-12 01:43:46.000000000 +0900
-@@ -984,27 +984,3 @@
-
- #endif
-
--#if defined(__x86_64__)
--
--@implementation Protocol (NSOBjectCompat)
--- self
--{
-- return self;
--}
--@end
--
--@implementation Object (NSOBjectCompat)
--- self
--{
-- return self;
--}
--
---doesNotRecognizeSelector:(SEL)sel
--{
-- printf("--> %s\n", sel);
-- abort();
--}
--@end
--
--
--#endif
-diff -rupN Modules-original/objc/objc_support.m Modules/objc/objc_support.m
---- Modules-original/objc/objc_support.m 2010-06-30 05:28:09.000000000 +0900
-+++ Modules/objc/objc_support.m 2012-05-12 01:46:11.000000000 +0900
-@@ -104,45 +104,6 @@
-
- @end /* PyObjCSupport */
-
--@interface Protocol (PyObjCSupport)
---(PyObject*)__pyobjc_PythonObject__;
--@end /* PyObjCSupport */
--
--@implementation Protocol (PyObjCSupport)
--
---(PyObject*)__pyobjc_PythonObject__
--{
-- PyObject *rval;
--
-- rval = PyObjC_FindPythonProxy(self);
-- if (rval == NULL) {
-- rval = PyObjCFormalProtocol_ForProtocol(self);
-- }
-- return rval;
--}
--
--@end /* PyObjCSupport */
--
--@interface Object (PyObjCSupport)
---(PyObject*)__pyobjc_PythonObject__;
--@end /* PyObjCSupport */
--
--@implementation Object (PyObjCSupport)
--
---(PyObject*)__pyobjc_PythonObject__
--{
-- PyObject *rval;
--
-- rval = PyObjC_FindPythonProxy(self);
-- if (rval == NULL) {
-- rval = (PyObject *)PyObjCObject_New(self,
-- PyObjCObject_kCLASSIC, NO);
-- PyObjC_RegisterPythonProxy(self, rval);
-- }
-- return rval;
--}
--
--@end /* PyObjCSupport */
-
- @interface NSString (PyObjCSupport)
- -(PyObject*)__pyobjc_PythonObject__;
-diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
---- Modules-original/objc/selector.m 2010-06-24 17:53:29.000000000 +0900
-+++ Modules/objc/selector.m 2012-05-12 01:49:44.000000000 +0900
-@@ -724,9 +724,6 @@
- NSMethodSignature* methsig;
- char buf[1024];
-
-- if (Object_class == nil) {
-- Object_class = [Object class];
-- }
-
- if (name[0] == '_' && name[1] == '_') {
- /* No known Objective-C class has methods whose name
</del></span></pre></div>
<a id="trunkdportspythonpypyobjcfilespatchPyErr_WarnExdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff (121455 => 121456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff 2014-06-26 00:17:51 UTC (rev 121456)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-Index: Modules/objc/function.m
-===================================================================
---- Modules/objc/function.m (revision 1995)
-+++ Modules/objc/function.m (working copy)
-@@ -132,8 +132,8 @@
- plain_count + byref_in_count, PyTuple_Size(args));
- return NULL;
- } else {
-- if (PyErr_WarnEx(PyExc_DeprecationWarning,
-- "Not all arguments to an Objective-C function are present", 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning,
-+ "Not all arguments to an Objective-C function are present") < 0) {
- return NULL;
- }
- }
-Index: Modules/objc/module.m
-===================================================================
---- Modules/objc/module.m (revision 1995)
-+++ Modules/objc/module.m (working copy)
-@@ -495,8 +495,8 @@
- return NULL;
- }
-
-- if (PyErr_WarnEx(PyExc_DeprecationWarning,
-- "Use the new metadata machinery", 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning,
-+ "Use the new metadata machinery") < 0) {
-
- return NULL;
- }
-Index: Modules/objc/libffi_support.m
-===================================================================
---- Modules/objc/libffi_support.m (revision 1995)
-+++ Modules/objc/libffi_support.m (working copy)
-@@ -1708,7 +1708,7 @@
- "Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
- Py_DECREF(repr);
-
-- if (PyErr_WarnEx(PyExc_DeprecationWarning, buffer, 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning, buffer) < 0) {
- Py_DECREF(methinfo);
- PyMem_Free(stubUserdata);
- return NULL;
-@@ -1769,8 +1769,8 @@
- snprintf(buffer, sizeof(buffer),
- "Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
- Py_DECREF(repr);
-- if (PyErr_WarnEx(PyExc_DeprecationWarning,
-- buffer, 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning,
-+ buffer) < 0) {
- Py_DECREF(methinfo);
- PyMem_Free(stubUserdata);
- return NULL;
-@@ -3413,7 +3413,7 @@
- plain_count + byref_in_count, PyTuple_Size(args));
- goto error_cleanup;
- } else {
-- if (PyErr_WarnEx(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present", 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present") < 0) {
- goto error_cleanup;
- }
- }
</del></span></pre></div>
<a id="trunkdportspythonpypyobjcfilessetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyobjc/files/setup.py.diff (121455 => 121456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyobjc/files/setup.py.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/setup.py.diff 2014-06-26 00:17:51 UTC (rev 121456)
</span><span class="lines">@@ -1,12 +1,11 @@
</span><del>---- setup.py.orig 2007-11-02 00:04:34.000000000 +1100
-+++ setup.py 2009-08-30 11:09:09.000000000 +1000
-@@ -87,9 +87,6 @@
- CFLAGS=[
- "-DPyObjC_STRICT_DEBUGGING",
- "-DMACOSX",
-- "-no-cpp-precomp",
-- "-Wno-long-double",
-- #"-Wselector",
- "-g",
- #"-fobjc-gc",
</del><ins>+--- setup.py.orig 2014-05-29 06:40:31.000000000 -0700
++++ setup.py 2014-05-29 06:41:50.000000000 -0700
+@@ -268,7 +268,7 @@
+ class pyobjc_install_lib (install_lib.install_lib):
+ def get_exclusions(self):
+ result = install_lib.install_lib.get_exclusions(self)
+- for fn in install_lib._install_lib.get_outputs(self):
++ for fn in install_lib.orig.install_lib.get_outputs(self):
+ if 'PyObjCTest' in fn:
+ result[fn] = 1
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpypyobjcfilesundef_snprintfdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-pyobjc/files/undef_snprintf.diff (121455 => 121456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyobjc/files/undef_snprintf.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/undef_snprintf.diff 2014-06-26 00:17:51 UTC (rev 121456)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- Modules/objc/objc_inject.m.orig 2007-11-02 00:04:34.000000000 +1100
-+++ Modules/objc/objc_inject.m 2009-09-14 21:44:14.000000000 +1000
-@@ -39,6 +39,9 @@
- static void INJECT_test_func(void);
- static pascal void INJECT_EventLoopTimerEntry(EventLoopTimerRef inTimer, void *p);
-
-+#ifdef snprintf
-+#undef snprintf
-+#endif
- #define DEFWRAP(func) __typeof__(&func) func
- typedef struct {
- /* internal */
</del></span></pre>
</div>
</div>
</body>
</html>