Ticket #37221: pyobjc2.patch

File pyobjc2.patch, 9.8 KB (added by seanfarley (Sean Farley), 12 years ago)

finally, remove pyobjc2 and pyobjc2-cocoa

  • deleted file dports/python/py-pyobjc2-cocoa/Portfile 

    # HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1354589841 21600
# Node ID a68e3aaab9f31695f8e61cb0096e0876d77fe1da
# Parent  7ba42c795408446d51e408b56c23b4027f56bb3a
py-pyobjc2: remove decrepit port since nothing else depends on it

diff --git a/dports/python/py-pyobjc2-cocoa/Portfile b/dports/python/py-pyobjc2-cocoa/Portfile
deleted file mode 100644
    + -  
    1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id$
    3 
    4 PortSystem 1.0
    5 PortGroup python24 1.0
    6 
    7 name            py-pyobjc2-cocoa
    8 version         2.0
    9 revision        1
    10 categories      python devel
    11 license         MIT
    12 maintainers     nomaintainer
    13 platforms       darwin
    14 description     cocoa wrappers for py-pyobjc2
    15 long_description    This port provides the CoreFoundation, Foundation and AppKit wrappers \
    16                     for use with py-pyobjc2.
    17 
    18 homepage        http://pyobjc.sourceforge.net/
    19 
    20 depends_lib-append     port:py-pyobjc2
    21 
    22 fetch.type      svn
    23 svn.url         http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-framework-Cocoa/
    24 worksrcdir      pyobjc-framework-Cocoa
    25 
    26 if {${os.major} < 9} {
    27     pre-fetch {
    28         return -code error "PyObjC 2.0 requires Mac OS X 10.5"
    29     }
    30 }
    31 
    32 post-destroot {
    33     xinstall -m 644 -W ${worksrcpath} \
    34         LICENSE.txt README.txt \
    35         ${destroot}${prefix}/share/doc/${name}
    36     copy ${worksrcpath}/Examples \
    37         ${destroot}${prefix}/share/doc/${name}/examples
    38 }
    39 
    40 livecheck.type  none

  • deleted file dports/python/py-pyobjc2/Portfile 

    diff --git a/dports/python/py-pyobjc2/Portfile b/dports/python/py-pyobjc2/Portfile
deleted file mode 100644
    + -  
    1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id$
    3 
    4 PortSystem 1.0
    5 PortGroup python24 1.0
    6 
    7 name            py-pyobjc2
    8 version         2.0
    9 revision        1
    10 categories      python devel
    11 license         MIT
    12 maintainers     nomaintainer
    13 platforms       darwin
    14 description     bidirectional bridge between python and Objective C
    15 long_description    The PyObjC project aims to provide a bridge between \
    16                 the Python and Objective-C programming languages. The \
    17                 bridge is intended to be fully bidirectional, allowing \
    18                 the Python programmer to take full advantage of the \
    19                 power provided by various Objective-C based toolkits \
    20                 and the Objective-C programmer transparent access to \
    21                 Python based functionality.
    22 
    23 homepage        http://pyobjc.sourceforge.net/
    24 
    25 depends_lib-append     port:py24-distribute \
    26                 port:py24-py2app \
    27                 port:py24-elementtree
    28 
    29 fetch.type      svn
    30 svn.url         http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-core/
    31 worksrcdir      pyobjc-core
    32 
    33 patchfiles      patch-PyErr_WarnEx.diff undef_snprintf.diff setup.py.diff
    34 
    35 if {${os.major} < 9} {
    36     pre-fetch {
    37         return -code error "PyObjC 2.0 requires Mac OS X 10.5"
    38     }
    39 }
    40 
    41 platform darwin 12 {
    42         patchfiles-append               patch-Modules.diff
    43 }
    44 
    45 post-destroot {
    46     xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.html Install.txt \
    47         License.txt NEWS.html NEWS.txt ReadMe.txt ReadMe.html \
    48         ${destroot}${prefix}/share/doc/${name}
    49     copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${name}/html
    50     delete ${destroot}${prefix}/share/doc/${name}/examples
    51     copy ${worksrcpath}/Examples \
    52         ${destroot}${prefix}/share/doc/${name}/examples
    53 }
    54 
    55 livecheck.type  none

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

    diff --git a/dports/python/py-pyobjc2/files/patch-Modules.diff b/dports/python/py-pyobjc2/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 @@ -984,27 +984,3 @@
    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);
    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 @@ -104,45 +104,6 @@
    36  
    37  @end /* PyObjCSupport */
    38  
    39 -@interface Protocol (PyObjCSupport)
    40 --(PyObject*)__pyobjc_PythonObject__;
    41 -@end /* PyObjCSupport */
    42 -
    43 -@implementation Protocol (PyObjCSupport)
    44 -
    45 --(PyObject*)__pyobjc_PythonObject__
    46 -{
    47 -       PyObject *rval;
    48 -
    49 -       rval = PyObjC_FindPythonProxy(self);
    50 -       if (rval == NULL) {
    51 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    52 -       }
    53 -       return rval;
    54 -}
    55 -
    56 -@end /* PyObjCSupport */
    57 -
    58 -@interface Object (PyObjCSupport)
    59 --(PyObject*)__pyobjc_PythonObject__;
    60 -@end /* PyObjCSupport */
    61 -
    62 -@implementation Object (PyObjCSupport)
    63 -
    64 --(PyObject*)__pyobjc_PythonObject__
    65 -{
    66 -       PyObject *rval;
    67 -
    68 -       rval = PyObjC_FindPythonProxy(self);
    69 -       if (rval == NULL) {
    70 -               rval = (PyObject *)PyObjCObject_New(self,
    71 -                               PyObjCObject_kCLASSIC, NO);
    72 -               PyObjC_RegisterPythonProxy(self, rval);
    73 -       }
    74 -       return rval;
    75 -}
    76 -
    77 -@end /* PyObjCSupport */
    78  
    79  @interface NSString (PyObjCSupport)
    80  -(PyObject*)__pyobjc_PythonObject__;
    81 diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
    82 --- Modules-original/objc/selector.m    2010-06-24 17:53:29.000000000 +0900
    83 +++ Modules/objc/selector.m     2012-05-12 01:49:44.000000000 +0900
    84 @@ -724,9 +724,6 @@
    85         NSMethodSignature* methsig;
    86         char  buf[1024];
    87  
    88 -       if (Object_class == nil) {
    89 -               Object_class = [Object class];
    90 -       }
    91  
    92         if (name[0] == '_' && name[1] == '_') {
    93                 /* No known Objective-C class has methods whose name

  • deleted file dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff 

    diff --git a/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff b/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff
deleted file mode 100644
    + -  
    1 Index: Modules/objc/function.m
    2 ===================================================================
    3 --- Modules/objc/function.m     (revision 1995)
    4 +++ Modules/objc/function.m     (working copy)
    5 @@ -132,8 +132,8 @@
    6                         plain_count + byref_in_count, PyTuple_Size(args));
    7                 return NULL;
    8         } else {
    9 -               if (PyErr_WarnEx(PyExc_DeprecationWarning,
    10 -                       "Not all arguments to an Objective-C function are present", 1) < 0) {
    11 +               if (PyErr_Warn(PyExc_DeprecationWarning,
    12 +                       "Not all arguments to an Objective-C function are present") < 0) {
    13                         return NULL;
    14                 }
    15         }
    16 Index: Modules/objc/module.m
    17 ===================================================================
    18 --- Modules/objc/module.m       (revision 1995)
    19 +++ Modules/objc/module.m       (working copy)
    20 @@ -495,8 +495,8 @@
    21                 return NULL;
    22         }
    23  
    24 -       if (PyErr_WarnEx(PyExc_DeprecationWarning,
    25 -               "Use the new metadata machinery", 1) < 0) {
    26 +       if (PyErr_Warn(PyExc_DeprecationWarning,
    27 +               "Use the new metadata machinery") < 0) {
    28  
    29                 return NULL;
    30         }
    31 Index: Modules/objc/libffi_support.m
    32 ===================================================================
    33 --- Modules/objc/libffi_support.m       (revision 1995)
    34 +++ Modules/objc/libffi_support.m       (working copy)
    35 @@ -1708,7 +1708,7 @@
    36                                 "Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
    37                         Py_DECREF(repr);
    38  
    39 -                       if (PyErr_WarnEx(PyExc_DeprecationWarning, buffer, 1) < 0) {
    40 +                       if (PyErr_Warn(PyExc_DeprecationWarning, buffer) < 0) {
    41                                 Py_DECREF(methinfo);
    42                                 PyMem_Free(stubUserdata);
    43                                 return NULL;
    44 @@ -1769,8 +1769,8 @@
    45                         snprintf(buffer, sizeof(buffer),
    46                                 "Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
    47                         Py_DECREF(repr);
    48 -                       if (PyErr_WarnEx(PyExc_DeprecationWarning,
    49 -                               buffer, 1) < 0) {
    50 +                       if (PyErr_Warn(PyExc_DeprecationWarning,
    51 +                               buffer) < 0) {
    52                                 Py_DECREF(methinfo);
    53                                 PyMem_Free(stubUserdata);
    54                                 return NULL;
    55 @@ -3413,7 +3413,7 @@
    56                         plain_count + byref_in_count, PyTuple_Size(args));
    57                 goto error_cleanup;
    58         } else {
    59 -               if (PyErr_WarnEx(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present", 1) < 0) {
    60 +               if (PyErr_Warn(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present") < 0) {
    61                         goto error_cleanup;
    62                 }
    63         }

  • deleted file dports/python/py-pyobjc2/files/setup.py.diff 

    diff --git a/dports/python/py-pyobjc2/files/setup.py.diff b/dports/python/py-pyobjc2/files/setup.py.diff
deleted file mode 100644
    + -  
    1 --- setup.py.orig       2007-11-02 00:04:34.000000000 +1100
    2 +++ setup.py    2009-08-30 11:09:09.000000000 +1000
    3 @@ -87,9 +87,6 @@
    4  CFLAGS=[
    5      "-DPyObjC_STRICT_DEBUGGING",
    6      "-DMACOSX",
    7 -    "-no-cpp-precomp",
    8 -    "-Wno-long-double",
    9 -    #"-Wselector",
    10      "-g",
    11      #"-fobjc-gc",
    12  

  • deleted file dports/python/py-pyobjc2/files/undef_snprintf.diff 

    diff --git a/dports/python/py-pyobjc2/files/undef_snprintf.diff b/dports/python/py-pyobjc2/files/undef_snprintf.diff
deleted file mode 100644
    + -  
    1 --- Modules/objc/objc_inject.m.orig     2007-11-02 00:04:34.000000000 +1100
    2 +++ Modules/objc/objc_inject.m  2009-09-14 21:44:14.000000000 +1000
    3 @@ -39,6 +39,9 @@
    4  static void INJECT_test_func(void);
    5  static pascal void INJECT_EventLoopTimerEntry(EventLoopTimerRef inTimer, void *p);
    6  
    7 +#ifdef snprintf
    8 +#undef snprintf
    9 +#endif
    10  #define DEFWRAP(func) __typeof__(&func) func
    11  typedef struct {
    12      /* internal */