[127072] trunk/dports/python/py-pyobjc

[aronnax at macports.org]

Revision: 127072
          https://trac.macports.org/changeset/127072
Author:   aronnax at macports.org
Date:     2014-10-20 09:25:14 -0700 (Mon, 20 Oct 2014)
Log Message:
-----------
py-pyobjc: bring patch forward to version 3.0.1

Modified Paths:
--------------
    trunk/dports/python/py-pyobjc/Portfile

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

Modified: trunk/dports/python/py-pyobjc/Portfile
===================================================================
--- 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)
@@ -46,12 +46,12 @@
                         rmd160 a7063fe74ecc95b3105e78196e5b5adc3bba3d4a
     }
 
+    # Note: see upstream ticket https://bitbucket.org/ronaldoussoren/pyobjc/issue/100/cannot-find-interface-declaration-for
     platform darwin 11 {
-        patchfiles-append 		patch-Modules-2.2.diff
+        patchfiles-append 		patch-Modules-${version}.diff
     }
-
     platform darwin 12 {
-        patchfiles-append 		patch-Modules-2.2.diff
+        patchfiles-append 		patch-Modules-${version}.diff
     }
 
     platform darwin 8 {

Added: trunk/dports/python/py-pyobjc/files/patch-Modules-3.0.1.diff
===================================================================
--- 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)
@@ -0,0 +1,123 @@
+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__)
+-
+- 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;
+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 */
+ 
+- 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__;
+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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141020/f7083cc0/attachment.html>