diff options
| author | drochner <drochner@pkgsrc.org> | 2007-02-23 20:35:12 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-02-23 20:35:12 +0000 |
| commit | 8fdfea0995f1b040b220d57046dbf7dad9b08d78 (patch) | |
| tree | 4da63b934a46f92d2d8206efc661aa8efa6987fe /net/py-libdnet/patches | |
| parent | abae2a81167a776f4a742813573a321f90387c95 (diff) | |
| download | pkgsrc-8fdfea0995f1b040b220d57046dbf7dad9b08d78.tar.gz | |
sync with base libdnet and patch some lhs casts to make it build with
newer gcc
Diffstat (limited to 'net/py-libdnet/patches')
| -rw-r--r-- | net/py-libdnet/patches/patch-aa | 8 | ||||
| -rw-r--r-- | net/py-libdnet/patches/patch-ac | 26 |
2 files changed, 26 insertions, 8 deletions
diff --git a/net/py-libdnet/patches/patch-aa b/net/py-libdnet/patches/patch-aa index 4925de5ef24..ec0c8aeb741 100644 --- a/net/py-libdnet/patches/patch-aa +++ b/net/py-libdnet/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/08/10 13:52:52 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2007/02/23 20:35:13 drochner Exp $ ---- python/setup.py.in.orig 2005-08-10 13:33:42.000000000 +0200 +--- python/setup.py.in.orig 2006-01-19 04:49:14.000000000 +0100 +++ python/setup.py.in @@ -6,7 +6,7 @@ from distutils.core import setup, Extens - dnet_srcs = [ './dnet.c' ] - dnet_incdirs = [ '../include' ] + dnet_srcs = [ '@srcdir@/dnet.c' ] + dnet_incdirs = [ '@top_srcdir@/include' ] dnet_libdirs = [] -dnet_libs = [] +dnet_libs = [ 'dnet' ] diff --git a/net/py-libdnet/patches/patch-ac b/net/py-libdnet/patches/patch-ac index 05459b7b80f..9ee548fd3a2 100644 --- a/net/py-libdnet/patches/patch-ac +++ b/net/py-libdnet/patches/patch-ac @@ -1,12 +1,30 @@ -$NetBSD: patch-ac,v 1.1 2006/03/23 00:59:05 joerg Exp $ +$NetBSD: patch-ac,v 1.2 2007/02/23 20:35:13 drochner Exp $ ---- python/dnet.c.orig 2006-03-23 00:56:28.000000000 +0000 +--- python/dnet.c.orig 2006-01-19 08:08:23.000000000 +0100 +++ python/dnet.c -@@ -270,7 +270,6 @@ static PyObject *__pyx_f_4dnet___memcpy( - +@@ -438,7 +438,6 @@ static PyObject *__pyx_f_4dnet___memcpy( + } static PyObject *__pyx_f_4dnet___oserror(void) { - extern int errno; PyObject *__pyx_r; PyObject *__pyx_1 = 0; +@@ -2726,7 +2725,7 @@ static PyObject *__pyx_f_4dnet_15__addr_ + PyObject *__pyx_3 = 0; + unsigned short __pyx_4; + Py_INCREF(__pyx_v_self); +- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); ++ __pyx_v_next = (void *)Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); + + /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ + __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); +@@ -2738,7 +2737,7 @@ static PyObject *__pyx_f_4dnet_15__addr_ + Py_DECREF(__pyx_2); __pyx_2 = 0; + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} + Py_DECREF(((PyObject *)__pyx_v_next)); +- ((PyObject *)__pyx_v_next) = __pyx_3; ++ __pyx_v_next = (void *)__pyx_3; + __pyx_3 = 0; + + /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ |