<!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>[127072] 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/127072">127072</a></dd>
<dt>Author</dt> <dd>aronnax@macports.org</dd>
<dt>Date</dt> <dd>2014-10-20 09:25:14 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-pyobjc: bring patch forward to version 3.0.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyobjcPortfile">trunk/dports/python/py-pyobjc/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyobjcfilespatchModules301diff">trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.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 (127071 => 127072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyobjc/Portfile 2014-10-20 16:23:30 UTC (rev 127071)
+++ trunk/dports/python/py-pyobjc/Portfile 2014-10-20 16:25:14 UTC (rev 127072)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> rmd160 a7063fe74ecc95b3105e78196e5b5adc3bba3d4a
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # Note: see upstream ticket https://bitbucket.org/ronaldoussoren/pyobjc/issue/100/cannot-find-interface-declaration-for
</ins><span class="cx"> platform darwin 11 {
</span><del>- patchfiles-append patch-Modules-2.2.diff
</del><ins>+ patchfiles-append patch-Modules-${version}.diff
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> platform darwin 12 {
</span><del>- patchfiles-append patch-Modules-2.2.diff
</del><ins>+ patchfiles-append patch-Modules-${version}.diff
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> platform darwin 8 {
</span></span></pre></div>
<a id="trunkdportspythonpypyobjcfilespatchModules301diff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff (0 => 127072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff (rev 0)
+++ trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff 2014-10-20 16:25:14 UTC (rev 127072)
</span><span class="lines">@@ -0,0 +1,123 @@
</span><ins>+diff -ur Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
+--- Modules-original/objc/objc-runtime-compat.m 2014-10-20 09:09:49.000000000 -0700
++++ Modules/objc/objc-runtime-compat.m 2014-10-20 09:10:29.000000000 -0700
+@@ -872,32 +872,6 @@
+
+ #endif /* (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) || defined(__OBJC2__) */
+
+-#if defined(__x86_64__)
+-
+-@implementation Protocol (NSObjectCompat)
+-- (id)self
+-{
+- return self;
+-}
+-@end
+-
+-#if PyObjC_BUILD_RELEASE < 1008
+-@implementation Object (NSObjectCompat)
+-- (id)self
+-{
+- return self;
+-}
+-
+--doesNotRecognizeSelector:(SEL)sel
+-{
+- printf("--> %s\n", sel_getName(sel));
+- abort();
+-}
+-@end
+-#endif /* PyObjC_BUILD_RELEASE < 1008 */
+-
+-#endif /* __x86_64__ */
+-
+
+ #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7)
+ Protocol* (*PyObjC_objc_allocateProtocol)(const char *) = NULL;
+diff -ur Modules-original/objc/objc_support.m Modules/objc/objc_support.m
+--- Modules-original/objc/objc_support.m 2014-10-20 09:09:49.000000000 -0700
++++ Modules/objc/objc_support.m 2014-10-20 09:21:30.000000000 -0700
+@@ -42,69 +42,6 @@
+ +(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
+ @end /* PyObjCSupport */
+
+-@implementation NSObject (PyObjCSupport)
+-
+--(PyObject*)__pyobjc_PythonObject__
+-{
+- PyObject *rval;
+-
+- rval = PyObjC_FindPythonProxy(self);
+- if (rval == NULL) {
+- rval = PyObjC_TryCreateCFProxy(self);
+- if (rval == NULL && PyErr_Occurred()) {
+- return NULL;
+- }
+- }
+-
+- if (rval == NULL) {
+- rval = (PyObject *)PyObjCObject_New(self,
+- PyObjCObject_kDEFAULT, YES);
+- if (rval == NULL) {
+- return NULL;
+- }
+- }
+-
+- if (rval != NULL) {
+- PyObjC_RegisterPythonProxy(self, rval);
+- }
+-
+- return rval;
+-}
+-
+-+(PyObject*)__pyobjc_PythonObject__
+-{
+- PyObject *rval;
+-
+- //rval = PyObjC_FindPythonProxy(self);
+- rval = NULL;
+- if (rval == NULL) {
+- rval = (PyObject *)PyObjCClass_New(self);
+- //PyObjC_RegisterPythonProxy(self, rval);
+- }
+-
+- return rval;
+-}
+-
+--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
+-{
+- PyObject* result = PyObjC_FindPythonProxy(self);
+- if (result) {
+- *cookie = 0;
+- return result;
+- }
+-
+- *cookie = 1;
+- return PyObjCObject_New(self, PyObjCObject_kSHOULD_NOT_RELEASE, NO);
+-}
+-
+-+(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
+-{
+- *cookie = 0;
+- return (PyObject *)PyObjCClass_New(self);
+-}
+-
+-@end /* PyObjCSupport */
+-
+ @interface NSProxy (PyObjCSupport)
+ -(PyObject*)__pyobjc_PythonObject__;
+ +(PyObject*)__pyobjc_PythonObject__;
+diff -ur Modules-original/objc/selector.m Modules/objc/selector.m
+--- Modules-original/objc/selector.m 2014-10-20 09:09:49.000000000 -0700
++++ Modules/objc/selector.m 2014-10-20 09:21:56.000000000 -0700
+@@ -725,10 +725,6 @@
+ }
+ }
+
+- if (Object_class == nil) {
+- Object_class = objc_getClass("Object");
+- }
+-
+ if (name[0] == '_' && name[1] == '_') {
+ /* No known Objective-C class has methods whose name
+ * starts with '__' or '_:'. This allows us to shortcut
</ins></span></pre>
</div>
</div>
</body>
</html>