rpms/swig
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve patch for #623854 (PyCObjects->PyCapsule transition)

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2010-08-20 12:15:25 +02:00
parent ca6fe127cf
commit b50aa24565
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swig.spec
View File

@ -4,7 +4,7 @@
Summary: Connects C/C++/Objective C to some high-level programming languages Summary: Connects C/C++/Objective C to some high-level programming languages
Name: swig Name: swig
Version: 2.0.0 Version: 2.0.0
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv3+ and BSD License: GPLv3+ and BSD
Group: Development/Tools Group: Development/Tools
URL: http://swig.sourceforge.net/ URL: http://swig.sourceforge.net/
@ -115,6 +115,9 @@ rm -rf %{buildroot}
%doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
%changelog %changelog
* Fri Aug 20 2010 Adam Tkac <atkac redhat com> 2.0.0-4
- improve patch for #623854 (PyCObjects->PyCapsule transition)
* Tue Aug 17 2010 Adam Tkac <atkac redhat com> 2.0.0-3 * Tue Aug 17 2010 Adam Tkac <atkac redhat com> 2.0.0-3
- python: use new PyCapsule API instead of former PyCObjects API - python: use new PyCapsule API instead of former PyCObjects API

16
swig200-rh623854.patch
View File

@ -1,6 +1,6 @@
diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.swg 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-08-17 14:18:36.998343153 +0200 --- 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 14:32:16.880249117 +0200 +++ swig-2.0.0/Lib/python/pyrun.swg 2010-08-17 16:32:16.581604656 +0200
@@ -45,8 +45,18 @@ @@ -45,8 +45,18 @@
#define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg
#define SWIG_ErrorType(code) SWIG_Python_ErrorType(code) #define SWIG_ErrorType(code) SWIG_Python_ErrorType(code)
@ -16,7 +16,7 @@ diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.sw
+ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0)) + (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0))
+#define USE_CAPSULES +#define USE_CAPSULES
+#define TYPE_POINTER_NAME \ +#define TYPE_POINTER_NAME \
+ ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer" SWIG_TYPE_TABLE_NAME) + ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
+#endif +#endif
/* Runtime API implementation */ /* Runtime API implementation */
@ -50,7 +50,7 @@ diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.sw
for (i =0; i < swig_module->size; ++i) { for (i =0; i < swig_module->size; ++i) {
swig_type_info *ty = types[i]; swig_type_info *ty = types[i];
if (ty->owndata) { if (ty->owndata) {
@@ -1426,7 +1445,12 @@ SWIG_Python_SetModule(swig_module_info * @@ -1426,9 +1445,18 @@ SWIG_Python_SetModule(swig_module_info *
PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
swig_empty_runtime_method_table); swig_empty_runtime_method_table);
#endif #endif
@ -61,9 +61,15 @@ diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.sw
PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
+#endif +#endif
if (pointer && module) { 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); PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+#endif
} else { } else {
@@ -1449,12 +1473,20 @@ SWIG_Python_TypeQuery(const char *type) Py_XDECREF(pointer);
}
@@ -1449,12 +1477,20 @@ SWIG_Python_TypeQuery(const char *type)
PyObject *obj = PyDict_GetItem(cache, key); PyObject *obj = PyDict_GetItem(cache, key);
swig_type_info *descriptor; swig_type_info *descriptor;
if (obj) { if (obj) {