Ticket #37222: 4.patch

File 4.patch, 5.4 KB (added by seanfarley (Sean Farley), 12 years ago)

py-pyobjc: update to 2.4

  • dports/python/py-pyobjc/Portfile

    # HG changeset patch
    # User Sean Farley <sean.michael.farley@gmail.com>
    # Date 1354587458 21600
    # Node ID 6d26c6f5d05b07b7a7445d1d9e341d6a5ca819b3
    # Parent  7ad35156020450315c44046d95a6872f3e27d921
    py-pyobjc: update to 2.4
    
    diff --git a/dports/python/py-pyobjc/Portfile b/dports/python/py-pyobjc/Portfile
    a b  
    33
    44PortSystem          1.0
    55PortGroup           python 1.0
    66
    77name                py-pyobjc
    8 version             2.3
     8version             2.4
    99categories          python devel
    1010license             MIT
    1111maintainers         nomaintainer
    1212platforms           darwin
    1313
     
    2222
    2323homepage            http://pyobjc.sourceforge.net/
    2424master_sites        http://pypi.python.org/packages/source/p/pyobjc-core/
    2525distname            pyobjc-core-${version}
    2626
    27 checksums           sha1    ef7c5489e86e5ff219e7ae15de84fe28bc1572f6 \
    28                     rmd160  8c7b5ec7478035490bcb78193b7659ee6293c785
     27checksums           rmd160  9ec46a504e272128aeadff93c9dce8c1b26f73df \
     28                    sha256  7f9fc1b481a6f91ad668631b69e3c9e0f3cbf2474eb2d67aea8d1082c54a9a91
    2929
    30 python.versions     26 27
     30python.versions     26 27 31 32 33
    3131python.default_version 27
    3232
    3333if {$subport != $name} {
    3434    depends_lib     port:py${python.version}-distribute \
    3535                    path:${python.pkgd}/py2app/__init__.py:py${python.version}-py2app \
    3636                    port:libxml2
    3737
    38     patchfiles      setup.py.diff
    39 
    40     platform darwin 12 {
    41         patchfiles-append patch-Modules.diff
    42     }
    43 
    4438    post-destroot {
    4539        xinstall -W ${worksrcpath} -m 644 HISTORIC.txt Install.txt \
    4640            License.txt NEWS.txt README.txt \
    4741            ${destroot}${prefix}/share/doc/${subport}
    4842        xinstall -d ${destroot}${prefix}/share/doc/${subport}/html
  • deleted file dports/python/py-pyobjc/files/patch-Modules.diff

    diff --git a/dports/python/py-pyobjc/files/patch-Modules.diff b/dports/python/py-pyobjc/files/patch-Modules.diff
    deleted file mode 100644
    + -  
    1 diff -rupN Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
    2 --- Modules-original/objc/objc-runtime-compat.m 2009-05-25 03:56:04.000000000 +0900
    3 +++ Modules/objc/objc-runtime-compat.m  2012-05-12 01:43:46.000000000 +0900
    4 @@ -981,27 +981,4 @@ size_t PyObjC_methodlist_magic(Class cls
    5  
    6  #endif
    7  
    8 -#if defined(__x86_64__)
    9  
    10 -@implementation Protocol (NSOBjectCompat)
    11 -- self
    12 -{
    13 -       return self;
    14 -}
    15 -@end
    16 -
    17 -@implementation Object (NSOBjectCompat)
    18 -- self
    19 -{
    20 -       return self;
    21 -}
    22 -
    23 --doesNotRecognizeSelector:(SEL)sel
    24 -{
    25 -       printf("--> %s\n", sel_getName(sel));
    26 -       abort();
    27 -}
    28 -@end
    29 -       
    30 -
    31 -#endif
    32 diff -rupN Modules-original/objc/objc_support.m Modules/objc/objc_support.m
    33 --- Modules-original/objc/objc_support.m        2010-06-30 05:28:09.000000000 +0900
    34 +++ Modules/objc/objc_support.m 2012-05-12 01:46:11.000000000 +0900
    35 @@ -150,68 +150,7 @@
    36  -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    37  @end /* PyObjCSupport */
    38  
    39 -@implementation Protocol (PyObjCSupport)
    40  
    41 --(PyObject*)__pyobjc_PythonObject__
    42 -{
    43 -       PyObject *rval;
    44 -
    45 -       rval = PyObjC_FindPythonProxy(self);
    46 -       if (rval == NULL) {
    47 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    48 -       }
    49 -       return rval;
    50 -}
    51 -
    52 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    53 -{
    54 -       PyObject *rval;
    55 -
    56 -       *cookie = 0;
    57 -       rval = PyObjC_FindPythonProxy(self);
    58 -       if (rval == NULL) {
    59 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    60 -       }
    61 -       return rval;
    62 -}
    63 -
    64 -@end /* PyObjCSupport */
    65 -
    66 -@interface Object (PyObjCSupport)
    67 --(PyObject*)__pyobjc_PythonObject__;
    68 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    69 -@end /* PyObjCSupport */
    70 -
    71 -@implementation Object (PyObjCSupport)
    72 -
    73 --(PyObject*)__pyobjc_PythonObject__
    74 -{
    75 -       PyObject *rval;
    76 -
    77 -       rval = PyObjC_FindPythonProxy(self);
    78 -       if (rval == NULL) {
    79 -               rval = (PyObject *)PyObjCObject_New(self,
    80 -                               PyObjCObject_kCLASSIC, NO);
    81 -               PyObjC_RegisterPythonProxy(self, rval);
    82 -       }
    83 -       return rval;
    84 -}
    85 -
    86 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    87 -{
    88 -       PyObject *rval;
    89 -
    90 -       *cookie = 0;
    91 -       rval = PyObjC_FindPythonProxy(self);
    92 -       if (rval == NULL) {
    93 -               rval = (PyObject *)PyObjCObject_New(self,
    94 -                               PyObjCObject_kCLASSIC, NO);
    95 -               PyObjC_RegisterPythonProxy(self, rval);
    96 -       }
    97 -       return rval;
    98 -}
    99 -
    100 -@end /* PyObjCSupport */
    101  
    102  @interface NSString (PyObjCSupport)
    103  -(PyObject*)__pyobjc_PythonObject__;
    104 diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
    105 --- Modules-original/objc/selector.m    2010-06-24 17:53:29.000000000 +0900
    106 +++ Modules/objc/selector.m     2012-05-12 01:49:44.000000000 +0900
    107 @@ -798,9 +798,6 @@ PyObjCSelector_FindNative(PyObject* self
    108                 }
    109         }
    110  
    111 -       if (Object_class == nil) {
    112 -               Object_class = [Object class];
    113 -       }
    114  
    115         if (name[0] == '_' && name[1] == '_') {
    116                 /* No known Objective-C class has methods whose name
  • deleted file dports/python/py-pyobjc/files/setup.py.diff

    diff --git a/dports/python/py-pyobjc/files/setup.py.diff b/dports/python/py-pyobjc/files/setup.py.diff
    deleted file mode 100644
    + -  
    1 --- setup.py.orig       2010-07-25 00:38:17.000000000 +1000
    2 +++ setup.py    2011-05-25 22:47:49.000000000 +1000
    3 @@ -22,7 +22,7 @@
    4  # Set USE_SYSTEM_LIBXML to True to link to the system version
    5  # of libxml2 (defaults to False to avoid problems when building
    6  # on 10.6 and running on an earlier release)
    7 -USE_SYSTEM_LIBXML = False
    8 +USE_SYSTEM_LIBXML = True
    9  
    10  if sys.version_info < MIN_PYTHON:
    11      vstr = '.'.join(map(str, MIN_PYTHON))