[144922] trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.4.diff
khindenburg at macports.org
khindenburg at macports.org
Wed Jan 20 19:27:12 PST 2016
Revision: 144922
https://trac.macports.org/changeset/144922
Author: khindenburg at macports.org
Date: 2016-01-20 19:27:12 -0800 (Wed, 20 Jan 2016)
Log Message:
-----------
py-pyobjc: add patch for darwin 11/12 #50390
Added Paths:
-----------
trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.4.diff
Copied: trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.4.diff (from rev 144920, trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff)
===================================================================
--- trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.4.diff (rev 0)
+++ trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.4.diff 2016-01-21 03:27:12 UTC (rev 144922)
@@ -0,0 +1,153 @@
+--- Modules/objc-runtime-compat.m 2016-01-20 22:15:49.000000000 -0500
++++ Modules/objc/objc-runtime-compat.m 2016-01-20 22:18:21.000000000 -0500
+@@ -872,32 +872,6 @@
+
+ #endif /* (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) || defined(__OBJC2__) */
+
+-#if defined(__x86_64__)
+-
+- at implementation Protocol (NSObjectCompat)
+-- (id)self
+-{
+- return self;
+-}
+- at end
+-
+-#if PyObjC_BUILD_RELEASE < 1008
+- at implementation Object (NSObjectCompat)
+-- (id)self
+-{
+- return self;
+-}
+-
+--doesNotRecognizeSelector:(SEL)sel
+-{
+- printf("--> %s\n", sel_getName(sel));
+- abort();
+-}
+- at 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;
+--- Modules/objc_support.m 2016-01-20 22:16:08.000000000 -0500
++++ Modules/objc/objc_support.m 2016-01-20 22:19:23.000000000 -0500
+@@ -42,69 +42,6 @@
+ +(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
+ @end /* PyObjCSupport */
+
+- at 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);
+-}
+-
+- at end /* PyObjCSupport */
+-
+ @interface NSProxy (PyObjCSupport)
+ -(PyObject*)__pyobjc_PythonObject__;
+ +(PyObject*)__pyobjc_PythonObject__;
+@@ -190,45 +127,6 @@
+
+ @end /* PyObjCSupport */
+
+-
+-#if PyObjC_BUILD_RELEASE < 1008 || !defined(__LP64__)
+- at interface Object (PyObjCSupport)
+--(PyObject*)__pyobjc_PythonObject__;
+--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
+- at end /* PyObjCSupport */
+-
+- at 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;
+-}
+-
+- at end /* PyObjCSupport */
+-#endif
+-
+ @interface NSString (PyObjCSupport)
+ -(PyObject*)__pyobjc_PythonObject__;
+ -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160120/a8086e6e/attachment.html>
More information about the macports-changes
mailing list