Ticket #37222: 4.patch

dports/python/py-pyobjc/Portfile

@@ -3 +3 @@
 
 PortSystem          1.0
 PortGroup           python 1.0
 
 name                py-pyobjc
-version             2.3
+version             2.4
 categories          python devel
 license             MIT
 maintainers         nomaintainer
 platforms           darwin
 
@@ -22 +22 @@
 
 homepage            http://pyobjc.sourceforge.net/
 master_sites        http://pypi.python.org/packages/source/p/pyobjc-core/
 distname            pyobjc-core-${version}
 
-checksums           sha1    ef7c5489e86e5ff219e7ae15de84fe28bc1572f6 \
-                    rmd160  8c7b5ec7478035490bcb78193b7659ee6293c785
+checksums           rmd160  9ec46a504e272128aeadff93c9dce8c1b26f73df \
+                    sha256  7f9fc1b481a6f91ad668631b69e3c9e0f3cbf2474eb2d67aea8d1082c54a9a91
 
-python.versions     26 27
+python.versions     26 27 31 32 33
 python.default_version 27
 
 if {$subport != $name} {
     depends_lib     port:py${python.version}-distribute \
                     path:${python.pkgd}/py2app/__init__.py:py${python.version}-py2app \
                     port:libxml2
 
-    patchfiles      setup.py.diff
-
-    platform darwin 12 {
-        patchfiles-append patch-Modules.diff
-    }
-
     post-destroot {
         xinstall -W ${worksrcpath} -m 644 HISTORIC.txt Install.txt \
             License.txt NEWS.txt README.txt \
             ${destroot}${prefix}/share/doc/${subport}
         xinstall -d ${destroot}${prefix}/share/doc/${subport}/html

deleted file dports/python/py-pyobjc/files/patch-Modules.diff

@@ -1 @@
-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

deleted file dports/python/py-pyobjc/files/setup.py.diff

@@ -1 @@
---- setup.py.orig       2010-07-25 00:38:17.000000000 +1000
-+++ setup.py    2011-05-25 22:47:49.000000000 +1000
-@@ -22,7 +22,7 @@
- # Set USE_SYSTEM_LIBXML to True to link to the system version
- # of libxml2 (defaults to False to avoid problems when building
- # on 10.6 and running on an earlier release)
--USE_SYSTEM_LIBXML = False
-+USE_SYSTEM_LIBXML = True
- 
- if sys.version_info < MIN_PYTHON:
-     vstr = '.'.join(map(str, MIN_PYTHON))