[121456] trunk/dports/python/py-pyobjc
jmr at macports.org
jmr at macports.org
Wed Jun 25 17:17:51 PDT 2014
Revision: 121456
https://trac.macports.org/changeset/121456
Author: jmr at macports.org
Date: 2014-06-25 17:17:51 -0700 (Wed, 25 Jun 2014)
Log Message:
-----------
py-pyobjc: fix build with current setuptools (#43586)
Modified Paths:
--------------
trunk/dports/python/py-pyobjc/Portfile
trunk/dports/python/py-pyobjc/files/setup.py.diff
Removed Paths:
-------------
trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff
trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff
trunk/dports/python/py-pyobjc/files/undef_snprintf.diff
Modified: trunk/dports/python/py-pyobjc/Portfile
===================================================================
--- trunk/dports/python/py-pyobjc/Portfile 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/Portfile 2014-06-26 00:17:51 UTC (rev 121456)
@@ -20,7 +20,7 @@
Python based functionality.
homepage http://pyobjc.sourceforge.net/
-master_sites http://pypi.python.org/packages/source/p/pyobjc-core/
+master_sites https://pypi.python.org/packages/source/p/pyobjc-core/
distname pyobjc-core-${version}
checksums rmd160 26e9764fda522993670898369115f0af9c480bce \
sha256 164617f61ede177ff60cb4a6103326645c9d87aadee04b15493c3b49e31049e6
@@ -31,6 +31,8 @@
depends_lib port:py${python.version}-setuptools \
port:py${python.version}-py2app
+ patchfiles setup.py.diff
+
set readme_name README.txt
if {${python.version} == 25} {
version 2.2
@@ -46,7 +48,6 @@
}
platform darwin 8 {
- depends_fetch
depends_lib
pre-fetch {
return -code error "PyObjC 2 requires Mac OS X 10.5 or later"
@@ -66,6 +67,6 @@
livecheck.type none
} else {
livecheck.type regex
- livecheck.url http://pypi.python.org/pypi/pyobjc-core/
+ livecheck.url https://pypi.python.org/pypi/pyobjc-core/
livecheck.regex {pyobjc-core ([0-9.]+)}
}
Deleted: trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff
===================================================================
--- trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/patch-Modules-2.0.diff 2014-06-26 00:17:51 UTC (rev 121456)
@@ -1,93 +0,0 @@
-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
Deleted: trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff
===================================================================
--- trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/patch-PyErr_WarnEx.diff 2014-06-26 00:17:51 UTC (rev 121456)
@@ -1,63 +0,0 @@
-Index: Modules/objc/function.m
-===================================================================
---- Modules/objc/function.m (revision 1995)
-+++ Modules/objc/function.m (working copy)
-@@ -132,8 +132,8 @@
- plain_count + byref_in_count, PyTuple_Size(args));
- return NULL;
- } else {
-- if (PyErr_WarnEx(PyExc_DeprecationWarning,
-- "Not all arguments to an Objective-C function are present", 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning,
-+ "Not all arguments to an Objective-C function are present") < 0) {
- return NULL;
- }
- }
-Index: Modules/objc/module.m
-===================================================================
---- Modules/objc/module.m (revision 1995)
-+++ Modules/objc/module.m (working copy)
-@@ -495,8 +495,8 @@
- return NULL;
- }
-
-- if (PyErr_WarnEx(PyExc_DeprecationWarning,
-- "Use the new metadata machinery", 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning,
-+ "Use the new metadata machinery") < 0) {
-
- return NULL;
- }
-Index: Modules/objc/libffi_support.m
-===================================================================
---- Modules/objc/libffi_support.m (revision 1995)
-+++ Modules/objc/libffi_support.m (working copy)
-@@ -1708,7 +1708,7 @@
- "Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
- Py_DECREF(repr);
-
-- if (PyErr_WarnEx(PyExc_DeprecationWarning, buffer, 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning, buffer) < 0) {
- Py_DECREF(methinfo);
- PyMem_Free(stubUserdata);
- return NULL;
-@@ -1769,8 +1769,8 @@
- snprintf(buffer, sizeof(buffer),
- "Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
- Py_DECREF(repr);
-- if (PyErr_WarnEx(PyExc_DeprecationWarning,
-- buffer, 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning,
-+ buffer) < 0) {
- Py_DECREF(methinfo);
- PyMem_Free(stubUserdata);
- return NULL;
-@@ -3413,7 +3413,7 @@
- plain_count + byref_in_count, PyTuple_Size(args));
- goto error_cleanup;
- } else {
-- if (PyErr_WarnEx(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present", 1) < 0) {
-+ if (PyErr_Warn(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present") < 0) {
- goto error_cleanup;
- }
- }
Modified: trunk/dports/python/py-pyobjc/files/setup.py.diff
===================================================================
--- trunk/dports/python/py-pyobjc/files/setup.py.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/setup.py.diff 2014-06-26 00:17:51 UTC (rev 121456)
@@ -1,12 +1,11 @@
---- setup.py.orig 2007-11-02 00:04:34.000000000 +1100
-+++ setup.py 2009-08-30 11:09:09.000000000 +1000
-@@ -87,9 +87,6 @@
- CFLAGS=[
- "-DPyObjC_STRICT_DEBUGGING",
- "-DMACOSX",
-- "-no-cpp-precomp",
-- "-Wno-long-double",
-- #"-Wselector",
- "-g",
- #"-fobjc-gc",
+--- setup.py.orig 2014-05-29 06:40:31.000000000 -0700
++++ setup.py 2014-05-29 06:41:50.000000000 -0700
+@@ -268,7 +268,7 @@
+ class pyobjc_install_lib (install_lib.install_lib):
+ def get_exclusions(self):
+ result = install_lib.install_lib.get_exclusions(self)
+- for fn in install_lib._install_lib.get_outputs(self):
++ for fn in install_lib.orig.install_lib.get_outputs(self):
+ if 'PyObjCTest' in fn:
+ result[fn] = 1
Deleted: trunk/dports/python/py-pyobjc/files/undef_snprintf.diff
===================================================================
--- trunk/dports/python/py-pyobjc/files/undef_snprintf.diff 2014-06-25 23:31:29 UTC (rev 121455)
+++ trunk/dports/python/py-pyobjc/files/undef_snprintf.diff 2014-06-26 00:17:51 UTC (rev 121456)
@@ -1,12 +0,0 @@
---- Modules/objc/objc_inject.m.orig 2007-11-02 00:04:34.000000000 +1100
-+++ Modules/objc/objc_inject.m 2009-09-14 21:44:14.000000000 +1000
-@@ -39,6 +39,9 @@
- static void INJECT_test_func(void);
- static pascal void INJECT_EventLoopTimerEntry(EventLoopTimerRef inTimer, void *p);
-
-+#ifdef snprintf
-+#undef snprintf
-+#endif
- #define DEFWRAP(func) __typeof__(&func) func
- typedef struct {
- /* internal */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140625/38b2f97f/attachment.html>
More information about the macports-changes
mailing list