wok-next annotate pygtk/stuff/patches/python27.patch @ rev 19988

Add qt5 - now it's look good enough
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Oct 20 03:29:40 2017 +0300 (2017-10-20)
parents
children
rev   line source
al@19741 1 https://bugzilla.gnome.org/show_bug.cgi?id=623965
al@19741 2
al@19741 3 diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
al@19741 4 index c0e1493..aa8cf10 100644
al@19741 5 --- a/gtk/gtkmodule.c
al@19741 6 +++ b/gtk/gtkmodule.c
al@19741 7 @@ -227,8 +227,12 @@ init_gtk(void)
al@19741 8 pygtk_add_stock_items(d);
al@19741 9
al@19741 10 /* extension API */
al@19741 11 - PyDict_SetItemString(d, "_PyGtk_API",
al@19741 12 - o=PyCObject_FromVoidPtr(&functions, NULL));
al@19741 13 +#if PY_VERSION_HEX >= 0x02070000
al@19741 14 + o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL);
al@19741 15 +#else
al@19741 16 + o = PyCObject_FromVoidPtr(&functions, NULL);
al@19741 17 +#endif
al@19741 18 + PyDict_SetItemString(d, "_PyGtk_API", o);
al@19741 19 Py_DECREF(o);
al@19741 20
al@19741 21 PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning",
al@19741 22 diff --git a/gtk/pygtk.h b/gtk/pygtk.h
al@19741 23 index 573c3b9..e4c680f 100644
al@19741 24 --- a/gtk/pygtk.h
al@19741 25 +++ b/gtk/pygtk.h
al@19741 26 @@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
al@19741 27
al@19741 28
al@19741 29 /* a function to initialise the pygtk functions */
al@19741 30 +
al@19741 31 +/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
al@19741 32 +#if PY_VERSION_HEX >= 0x02070000
al@19741 33 +#define init_pygtk() G_STMT_START { \
al@19741 34 + void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \
al@19741 35 + if (!capsule) { \
al@19741 36 + return; \
al@19741 37 + } \
al@19741 38 + _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
al@19741 39 +} G_STMT_END
al@19741 40 +#else /* PY_VERSION_HEX */
al@19741 41 +/* Python 2.6 and earlier use the CObject API */
al@19741 42 #define init_pygtk() G_STMT_START { \
al@19741 43 PyObject *pygtk = PyImport_ImportModule("gtk"); \
al@19741 44 if (pygtk != NULL) { \
al@19741 45 @@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
al@19741 46 return; \
al@19741 47 } \
al@19741 48 } G_STMT_END
al@19741 49 +#endif /* PY_VERSION_HEX */
al@19741 50
al@19741 51 #endif
al@19741 52