From 3420619ae55ea10e954d44f3f0f29db89cbbedaf Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 15 Feb 2017 16:49:52 -0800 Subject: [PATCH] Update sip to 4.19.1 release --- build.py | 10 +++++----- sip/siplib/sip.h | 2 +- sip/siplib/siplib.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.py b/build.py index 8619bdd9..7b200773 100755 --- a/build.py +++ b/build.py @@ -68,12 +68,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.1.dev1702021705' +sipCurrentVersion = '4.19.1' sipMD5 = { - 'darwin' : '2c54e223f88ef998e770cfe27139c80f', - 'win32' : '5d58bc5106185925f5b05fde0c7e87c8', - 'linux32' : 'dc0e17e86b56be994567b636aeef740e', - 'linux64' : '3699bb2d59692623dc1fa212237da335', + 'darwin' : '864b8b4b2d25594b052093cbcf3af639', + 'win32' : '08cb7b0ca7e4d16f6029c2ed3849a848', + 'linux32' : 'a63b59202a8d60e52f7731e484ef1291', + 'linux64' : 'ae56352f033212c94d3adfd2f48a0070', } wafCurrentVersion = '1.7.15-p1' diff --git a/sip/siplib/sip.h b/sip/siplib/sip.h index 53191099..da0b5be8 100644 --- a/sip/siplib/sip.h +++ b/sip/siplib/sip.h @@ -55,7 +55,7 @@ extern "C" { * Define the SIP version number. */ #define SIP_VERSION 0x041301 -#define SIP_VERSION_STR "4.19.1.dev1702021705" +#define SIP_VERSION_STR "4.19.1" /* diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c index 6369e689..83d3042f 100644 --- a/sip/siplib/siplib.c +++ b/sip/siplib/siplib.c @@ -9914,11 +9914,11 @@ static int sipWrapperType_init(sipWrapperType *self, PyObject *args, */ if (base != NULL && PyObject_TypeCheck((PyObject *)base, (PyTypeObject *)&sipWrapperType_Type)) { - /* Call any new type handler. */ sipNewUserTypeFunc new_user_type_handler; self->wt_td = ((sipWrapperType *)base)->wt_td; + /* Call any new type handler. */ new_user_type_handler = find_new_user_type_handler( (sipWrapperType *)sipTypeAsPyTypeObject(self->wt_td)); @@ -13482,7 +13482,7 @@ static int sip_api_enable_gc(int enable) return -1; /* Get the functions if we haven't already got them. */ - if (enable == NULL) + if (enable_func == NULL) { PyObject *gc_module;