Revision: 96076 https://trac.macports.org/changeset/96076 Author: eborisch@macports.org Date: 2012-07-30 19:08:50 -0700 (Mon, 30 Jul 2012) Log Message: ----------- py27-pyobjc: Appled patches from tamyrvoll for experimental 10.8 support. See #35325. Modified Paths: -------------- trunk/dports/python/py27-pyobjc/Portfile Added Paths: ----------- trunk/dports/python/py27-pyobjc/files/patch-Modules.diff Modified: trunk/dports/python/py27-pyobjc/Portfile =================================================================== --- trunk/dports/python/py27-pyobjc/Portfile 2012-07-30 22:45:35 UTC (rev 96075) +++ trunk/dports/python/py27-pyobjc/Portfile 2012-07-31 02:08:50 UTC (rev 96076) @@ -30,8 +30,12 @@ path:${python.pkgd}/py2app/__init__.py:py27-py2app \ port:libxml2 -patchfiles setup.py.diff +patchfiles setup.py.diff +platform darwin 12 { + patchfiles-append patch-Modules.diff +} + post-destroot { xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.txt \ License.txt NEWS.txt README.txt \ Added: trunk/dports/python/py27-pyobjc/files/patch-Modules.diff =================================================================== --- trunk/dports/python/py27-pyobjc/files/patch-Modules.diff (rev 0) +++ trunk/dports/python/py27-pyobjc/files/patch-Modules.diff 2012-07-31 02:08:50 UTC (rev 96076) @@ -0,0 +1,116 @@ +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 +@@ -981,27 +981,4 @@ size_t PyObjC_methodlist_magic(Class cls + + #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_getName(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 +@@ -150,68 +150,7 @@ + -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie; + @end /* PyObjCSupport */ + +-@implementation Protocol (PyObjCSupport) + +--(PyObject*)__pyobjc_PythonObject__ +-{ +- PyObject *rval; +- +- rval = PyObjC_FindPythonProxy(self); +- if (rval == NULL) { +- rval = PyObjCFormalProtocol_ForProtocol(self); +- } +- return rval; +-} +- +--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie +-{ +- PyObject *rval; +- +- *cookie = 0; +- rval = PyObjC_FindPythonProxy(self); +- if (rval == NULL) { +- rval = PyObjCFormalProtocol_ForProtocol(self); +- } +- return rval; +-} +- +-@end /* PyObjCSupport */ +- +-@interface Object (PyObjCSupport) +--(PyObject*)__pyobjc_PythonObject__; +--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie; +-@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; +-} +- +--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie +-{ +- PyObject *rval; +- +- *cookie = 0; +- 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 +@@ -798,9 +798,6 @@ PyObjCSelector_FindNative(PyObject* self + } + } + +- if (Object_class == nil) { +- Object_class = [Object class]; +- } + + if (name[0] == '_' && name[1] == '_') { + /* No known Objective-C class has methods whose name