Signed-off-by: Alexander Marx alexander.marx@ipfire.org --- swig/patches/swig-1.3.23-pylib.patch | 29 ------------ swig/patches/swig200-rh623854.patch | 92 ------------------------------------ swig/swig.nm | 2 +- 3 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 swig/patches/swig-1.3.23-pylib.patch delete mode 100644 swig/patches/swig200-rh623854.patch
diff --git a/swig/patches/swig-1.3.23-pylib.patch b/swig/patches/swig-1.3.23-pylib.patch deleted file mode 100644 index 85fa1e3..0000000 --- a/swig/patches/swig-1.3.23-pylib.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- SWIG-1.3.23/configure.in.pylib 2004-11-02 00:45:57.000000000 +0100 -+++ SWIG-1.3.23/configure.in 2004-11-23 12:20:12.552926982 +0100 -@@ -574,9 +574,11 @@ - - # Set the include directory - -+ PYLIB=`$PYTHON -c "import sys; print sys.path[[1]]"` -+ - AC_MSG_CHECKING(for Python header files) - if test -r $PYPREFIX/include/$PYVERSION/Python.h; then -- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config" -+ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYLIB/config" - fi - if test -z "$PYINCLUDE"; then - if test -r $PYPREFIX/include/Py/Python.h; then -@@ -587,13 +589,6 @@ - - # Set the library directory blindly. This probably won't work with older versions - AC_MSG_CHECKING(for Python library) -- dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR" -- for i in $dirs; do -- if test -d $PYEPREFIX/$PYLIBDIR/$i; then -- PYLIB="$PYEPREFIX/$PYLIBDIR/$i" -- break -- fi -- done - if test -z "$PYLIB"; then - AC_MSG_RESULT(Not found) - else diff --git a/swig/patches/swig200-rh623854.patch b/swig/patches/swig200-rh623854.patch deleted file mode 100644 index 5665252..0000000 --- a/swig/patches/swig200-rh623854.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.swg ---- swig-2.0.0/Lib/python/pyrun.swg.rh623854 2010-02-28 00:26:02.000000000 +0100 -+++ swig-2.0.0/Lib/python/pyrun.swg 2010-08-17 16:32:16.581604656 +0200 -@@ -45,8 +45,18 @@ - #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg - #define SWIG_ErrorType(code) SWIG_Python_ErrorType(code) - #define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) --#define SWIG_fail goto fail -+#define SWIG_fail goto fail - -+/* -+ * Python 2.7 and newer and Python 3.1 and newer should use Capsules API instead of -+ * CObjects API. -+ */ -+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \ -+ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0)) -+#define USE_CAPSULES -+#define TYPE_POINTER_NAME \ -+ ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME) -+#endif - - /* Runtime API implementation */ - -@@ -1356,8 +1366,12 @@ SWIG_Python_GetModule(void) { - #ifdef SWIG_LINK_RUNTIME - type_pointer = SWIG_ReturnGlobalTypeList((void *)0); - #else -+#ifdef USE_CAPSULES -+ type_pointer = PyCapsule_Import(TYPE_POINTER_NAME, 0); -+#else - type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); -+#endif - if (PyErr_Occurred()) { - PyErr_Clear(); - type_pointer = (void *)0; -@@ -1402,9 +1416,14 @@ PyModule_AddObject(PyObject *m, char *na - SWIGRUNTIME void - SWIG_Python_DestroyModule(void *vptr) - { -+ size_t i; -+#ifdef USE_CAPSULES -+ swig_module_info *swig_module = -+ (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME); -+#else - swig_module_info *swig_module = (swig_module_info *) vptr; -+#endif - swig_type_info **types = swig_module->types; -- size_t i; - for (i =0; i < swig_module->size; ++i) { - swig_type_info *ty = types[i]; - if (ty->owndata) { -@@ -1426,9 +1445,18 @@ SWIG_Python_SetModule(swig_module_info * - PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - swig_empty_runtime_method_table); - #endif -+#ifdef USE_CAPSULES -+ PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME, -+ (PyCapsule_Destructor)SWIG_Python_DestroyModule); -+#else - PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); -+#endif - if (pointer && module) { -+#ifdef USE_CAPSULES -+ PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer); -+#else - PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); -+#endif - } else { - Py_XDECREF(pointer); - } -@@ -1449,12 +1477,20 @@ SWIG_Python_TypeQuery(const char *type) - PyObject *obj = PyDict_GetItem(cache, key); - swig_type_info *descriptor; - if (obj) { -+#ifdef USE_CAPSULES -+ descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, type); -+#else - descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj); -+#endif - } else { - swig_module_info *swig_module = SWIG_Python_GetModule(); - descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); - if (descriptor) { -+#ifdef USE_CAPSULES -+ obj = PyCapsule_New(descriptor, type, NULL); -+#else - obj = PyCObject_FromVoidPtr(descriptor, NULL); -+#endif - PyDict_SetItem(cache, key, obj); - Py_DECREF(obj); - } diff --git a/swig/swig.nm b/swig/swig.nm index e3e68cc..675dc1f 100644 --- a/swig/swig.nm +++ b/swig/swig.nm @@ -4,7 +4,7 @@ ###############################################################################
name = swig -version = 2.0.1 +version = 3.0.10 release = 1
groups = Development/Tools