[127075] trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff

aronnax at macports.org aronnax at macports.org
Mon Oct 20 10:00:17 PDT 2014


Revision: 127075
          https://trac.macports.org/changeset/127075
Author:   aronnax at macports.org
Date:     2014-10-20 10:00:16 -0700 (Mon, 20 Oct 2014)
Log Message:
-----------
py-pyobjc: remove some more references to Object

Modified Paths:
--------------
    trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff

Modified: trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff
===================================================================
--- trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff	2014-10-20 16:38:08 UTC (rev 127074)
+++ trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff	2014-10-20 17:00:16 UTC (rev 127075)
@@ -36,7 +36,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
++++ Modules/objc/objc_support.m	2014-10-20 09:59:31.000000000 -0700
 @@ -42,69 +42,6 @@
  +(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
  @end /* PyObjCSupport */
@@ -107,6 +107,51 @@
  @interface NSProxy (PyObjCSupport)
  -(PyObject*)__pyobjc_PythonObject__;
  +(PyObject*)__pyobjc_PythonObject__;
+@@ -191,44 +128,6 @@
+ @end /* PyObjCSupport */
+ 
+ 
+-#if PyObjC_BUILD_RELEASE < 1008
+- 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;
 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141020/4333b27e/attachment.html>


More information about the macports-changes mailing list