[96478] trunk/dports/python
ryandesign at macports.org
ryandesign at macports.org
Fri Aug 10 18:34:18 PDT 2012
Revision: 96478
https://trac.macports.org/changeset/96478
Author: ryandesign at macports.org
Date: 2012-08-10 18:34:18 -0700 (Fri, 10 Aug 2012)
Log Message:
-----------
py-pyobjc2, py25-pyobjc, py26-pyobjc: merge r96076 from py27-pyobjc: Apply patches from tamyrvoll for experimental 10.8 support. See #35325.
Revision Links:
--------------
https://trac.macports.org/changeset/96076
Modified Paths:
--------------
trunk/dports/python/py-pyobjc2/Portfile
trunk/dports/python/py25-pyobjc/Portfile
trunk/dports/python/py26-pyobjc/Portfile
Added Paths:
-----------
trunk/dports/python/py-pyobjc2/files/patch-Modules.diff
trunk/dports/python/py25-pyobjc/files/patch-Modules.diff
trunk/dports/python/py26-pyobjc/files/patch-Modules.diff
Property Changed:
----------------
trunk/dports/python/py-pyobjc2/
trunk/dports/python/py25-pyobjc/
trunk/dports/python/py26-pyobjc/
Property changes on: trunk/dports/python/py-pyobjc2
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/python/py-pyobjc2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/python/py27-pyobjc:96076
Modified: trunk/dports/python/py-pyobjc2/Portfile
===================================================================
--- trunk/dports/python/py-pyobjc2/Portfile 2012-08-11 01:06:31 UTC (rev 96477)
+++ trunk/dports/python/py-pyobjc2/Portfile 2012-08-11 01:34:18 UTC (rev 96478)
@@ -38,6 +38,10 @@
}
}
+platform darwin 12 {
+ patchfiles-append patch-Modules.diff
+}
+
post-destroot {
xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.html Install.txt \
License.txt NEWS.html NEWS.txt ReadMe.txt ReadMe.html \
Copied: trunk/dports/python/py-pyobjc2/files/patch-Modules.diff (from rev 96076, trunk/dports/python/py27-pyobjc/files/patch-Modules.diff)
===================================================================
--- trunk/dports/python/py-pyobjc2/files/patch-Modules.diff (rev 0)
+++ trunk/dports/python/py-pyobjc2/files/patch-Modules.diff 2012-08-11 01:34:18 UTC (rev 96478)
@@ -0,0 +1,93 @@
+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
+@@ -984,27 +984,3 @@
+
+ #endif
+
+-#if defined(__x86_64__)
+-
+- at implementation Protocol (NSOBjectCompat)
+-- self
+-{
+- return self;
+-}
+- at end
+-
+- at implementation Object (NSOBjectCompat)
+-- self
+-{
+- return self;
+-}
+-
+--doesNotRecognizeSelector:(SEL)sel
+-{
+- printf("--> %s\n", sel);
+- abort();
+-}
+- at 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
+@@ -104,45 +104,6 @@
+
+ @end /* PyObjCSupport */
+
+- at interface Protocol (PyObjCSupport)
+--(PyObject*)__pyobjc_PythonObject__;
+- at end /* PyObjCSupport */
+-
+- at implementation Protocol (PyObjCSupport)
+-
+--(PyObject*)__pyobjc_PythonObject__
+-{
+- PyObject *rval;
+-
+- rval = PyObjC_FindPythonProxy(self);
+- if (rval == NULL) {
+- rval = PyObjCFormalProtocol_ForProtocol(self);
+- }
+- return rval;
+-}
+-
+- at end /* PyObjCSupport */
+-
+- at interface Object (PyObjCSupport)
+--(PyObject*)__pyobjc_PythonObject__;
+- 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;
+-}
+-
+- at 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
+@@ -724,9 +724,6 @@
+ NSMethodSignature* methsig;
+ char buf[1024];
+
+- if (Object_class == nil) {
+- Object_class = [Object class];
+- }
+
+ if (name[0] == '_' && name[1] == '_') {
+ /* No known Objective-C class has methods whose name
Property changes on: trunk/dports/python/py25-pyobjc
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/python/py25-pyobjc:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/python/py27-pyobjc:96076
Modified: trunk/dports/python/py25-pyobjc/Portfile
===================================================================
--- trunk/dports/python/py25-pyobjc/Portfile 2012-08-11 01:06:31 UTC (rev 96477)
+++ trunk/dports/python/py25-pyobjc/Portfile 2012-08-11 01:34:18 UTC (rev 96478)
@@ -31,6 +31,10 @@
patchfiles objc-class.m.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 \
Copied: trunk/dports/python/py25-pyobjc/files/patch-Modules.diff (from rev 96076, trunk/dports/python/py27-pyobjc/files/patch-Modules.diff)
===================================================================
--- trunk/dports/python/py25-pyobjc/files/patch-Modules.diff (rev 0)
+++ trunk/dports/python/py25-pyobjc/files/patch-Modules.diff 2012-08-11 01:34:18 UTC (rev 96478)
@@ -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__)
+
+- at implementation Protocol (NSOBjectCompat)
+-- self
+-{
+- return self;
+-}
+- at end
+-
+- at implementation Object (NSOBjectCompat)
+-- self
+-{
+- return self;
+-}
+-
+--doesNotRecognizeSelector:(SEL)sel
+-{
+- printf("--> %s\n", sel_getName(sel));
+- abort();
+-}
+- at 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 */
+
+- at 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;
+-}
+-
+- at end /* PyObjCSupport */
+-
+- 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 */
+
+ @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
Property changes on: trunk/dports/python/py26-pyobjc
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/dports/python/py27-pyobjc:96076
Modified: trunk/dports/python/py26-pyobjc/Portfile
===================================================================
--- trunk/dports/python/py26-pyobjc/Portfile 2012-08-11 01:06:31 UTC (rev 96477)
+++ trunk/dports/python/py26-pyobjc/Portfile 2012-08-11 01:34:18 UTC (rev 96478)
@@ -32,6 +32,10 @@
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 \
Copied: trunk/dports/python/py26-pyobjc/files/patch-Modules.diff (from rev 96076, trunk/dports/python/py27-pyobjc/files/patch-Modules.diff)
===================================================================
--- trunk/dports/python/py26-pyobjc/files/patch-Modules.diff (rev 0)
+++ trunk/dports/python/py26-pyobjc/files/patch-Modules.diff 2012-08-11 01:34:18 UTC (rev 96478)
@@ -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__)
+
+- at implementation Protocol (NSOBjectCompat)
+-- self
+-{
+- return self;
+-}
+- at end
+-
+- at implementation Object (NSOBjectCompat)
+-- self
+-{
+- return self;
+-}
+-
+--doesNotRecognizeSelector:(SEL)sel
+-{
+- printf("--> %s\n", sel_getName(sel));
+- abort();
+-}
+- at 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 */
+
+- at 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;
+-}
+-
+- at end /* PyObjCSupport */
+-
+- 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 */
+
+ @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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120810/9067e1ef/attachment-0001.html>
More information about the macports-changes
mailing list