mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-09 05:20:08 +01:00
Switch to sip 4.19.7 final
This commit is contained in:
10
build.py
10
build.py
@@ -75,12 +75,12 @@ wxICON = 'docs/sphinx/_static/images/sphinxdocs/mondrian.png'
|
||||
|
||||
# Some tools will be downloaded for the builds. These are the versions and
|
||||
# MD5s of the tool binaries currently in use.
|
||||
sipCurrentVersion = '4.19.7.dev1801141749'
|
||||
sipCurrentVersion = '4.19.7'
|
||||
sipMD5 = {
|
||||
'darwin' : '9f2c414004ec4b98d6d6bb4d5fe9fb85',
|
||||
'win32' : 'cd65b94938a5f95182b21cd7688ab703',
|
||||
'linux32' : 'a295ae11fa67e74e5e01a393deebbefa',
|
||||
'linux64' : 'c763ab917f816b42502e6b2d19fefbb1',
|
||||
'darwin' : 'd30ca1ffb09c0dbb6326e99d012c55b8',
|
||||
'win32' : 'dbb882f4f95b1a7419a436280407899c',
|
||||
'linux32' : '56a763acdf7c0b5725b31a71a9a56160',
|
||||
'linux64' : 'b349127a4d46452936e4181d96b12c2d',
|
||||
}
|
||||
|
||||
wafCurrentVersion = '1.7.15-p1'
|
||||
|
||||
@@ -55,7 +55,7 @@ extern "C" {
|
||||
* Define the SIP version number.
|
||||
*/
|
||||
#define SIP_VERSION 0x041307
|
||||
#define SIP_VERSION_STR "4.19.7.dev1801141749"
|
||||
#define SIP_VERSION_STR "4.19.7"
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -4579,7 +4579,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
|
||||
case 'F':
|
||||
{
|
||||
/* Python callable object. */
|
||||
|
||||
|
||||
PyObject **p = va_arg(va, PyObject **);
|
||||
|
||||
if (arg != NULL)
|
||||
@@ -4595,14 +4595,14 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
|
||||
Py_INCREF(arg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case 'H':
|
||||
{
|
||||
/* Python callable object or None. */
|
||||
|
||||
|
||||
PyObject **p = va_arg(va, PyObject **);
|
||||
|
||||
if (arg != NULL)
|
||||
@@ -4618,14 +4618,14 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
|
||||
Py_INCREF(arg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case '!':
|
||||
{
|
||||
/* Python object that implements the buffer protocol. */
|
||||
|
||||
|
||||
PyObject **p = va_arg(va, PyObject **);
|
||||
|
||||
if (arg != NULL)
|
||||
@@ -4647,7 +4647,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
|
||||
Py_INCREF(arg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -4656,7 +4656,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
|
||||
/*
|
||||
* Python object that implements the buffer protocol or None.
|
||||
*/
|
||||
|
||||
|
||||
PyObject **p = va_arg(va, PyObject **);
|
||||
|
||||
if (arg != NULL)
|
||||
@@ -4678,7 +4678,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp,
|
||||
Py_INCREF(arg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -7124,7 +7124,7 @@ static int isNonlazyMethod(PyMethodDef *pmd)
|
||||
"__aexit__",
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
};
|
||||
|
||||
const char **l;
|
||||
|
||||
@@ -9680,11 +9680,11 @@ void sipSaveMethod(sipPyMethod *pm, PyObject *meth)
|
||||
static void sip_api_call_hook(const char *hookname)
|
||||
{
|
||||
PyObject *dictofmods, *mod, *dict, *hook, *res;
|
||||
|
||||
|
||||
/* Get the dictionary of modules. */
|
||||
if ((dictofmods = PyImport_GetModuleDict()) == NULL)
|
||||
return;
|
||||
|
||||
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
/* Get the builtins module. */
|
||||
if ((mod = PyDict_GetItemString(dictofmods, "builtins")) == NULL)
|
||||
@@ -9694,18 +9694,18 @@ static void sip_api_call_hook(const char *hookname)
|
||||
if ((mod = PyDict_GetItemString(dictofmods, "__builtin__")) == NULL)
|
||||
return;
|
||||
#endif
|
||||
|
||||
|
||||
/* Get it's dictionary. */
|
||||
if ((dict = PyModule_GetDict(mod)) == NULL)
|
||||
return;
|
||||
|
||||
|
||||
/* Get the function hook. */
|
||||
if ((hook = PyDict_GetItemString(dict, hookname)) == NULL)
|
||||
return;
|
||||
|
||||
|
||||
/* Call the hook and discard any result. */
|
||||
res = PyObject_Call(hook, empty_tuple, NULL);
|
||||
|
||||
|
||||
Py_XDECREF(res);
|
||||
}
|
||||
|
||||
@@ -10543,7 +10543,7 @@ static int sipSimpleWrapper_init(sipSimpleWrapper *self, PyObject *args,
|
||||
*/
|
||||
new_unused_p = &new_unused;
|
||||
}
|
||||
|
||||
|
||||
if (final_func((PyObject *)self, sipNew, unused, new_unused_p) < 0)
|
||||
{
|
||||
Py_XDECREF(unused);
|
||||
@@ -11336,7 +11336,7 @@ static int sipSimpleWrapper_set_dict(sipSimpleWrapper *sw, PyObject *value,
|
||||
}
|
||||
|
||||
Py_XDECREF(sw->dict);
|
||||
|
||||
|
||||
Py_XINCREF(value);
|
||||
sw->dict = value;
|
||||
|
||||
@@ -12006,7 +12006,7 @@ static void forgetObject(sipSimpleWrapper *sw)
|
||||
}
|
||||
|
||||
/*
|
||||
* This is needed because we release the GIL when calling a C++ dtor.
|
||||
* This is needed because we might release the GIL when calling a C++ dtor.
|
||||
* Without it the cyclic garbage collector can be invoked from another
|
||||
* thread resulting in a crash.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user