sip: update to 4.19.9 (#4000)

This commit is contained in:
Andrew Sun
2018-06-24 15:19:45 -04:00
committed by Алексей
parent 2b8be92a8d
commit 02e8223f89
2 changed files with 40 additions and 4 deletions

View File

@@ -0,0 +1,33 @@
diff -Naur sip-4.19.9.orig/siplib/siplib.c sip-4.19.9/siplib/siplib.c
--- sip-4.19.9.orig/siplib/siplib.c 2018-06-23 16:25:09.925487000 -0400
+++ sip-4.19.9/siplib/siplib.c 2018-06-23 16:27:22.043835300 -0400
@@ -5393,17 +5393,17 @@
PyErr_Format(PyExc_OverflowError, "argument %d overflowed: %S",
failure.arg_nr, failure.detail_obj);
#else
- PyErr_Format(PyExc_OverflowError, "argument %s overflowed: %s",
+ PyErr_Format(PyExc_OverflowError, "argument %d overflowed: %s",
failure.arg_nr, exc_str);
#endif
}
else
{
#if PY_MAJOR_VERSION >= 3
- PyErr_Format(PyExc_OverflowError, "argument '%s' overflowed: %S",
+ PyErr_Format(PyExc_OverflowError, "argument '%d' overflowed: %S",
failure.arg_nr, failure.detail_obj);
#else
- PyErr_Format(PyExc_OverflowError, "argument '%s' overflowed: %s",
+ PyErr_Format(PyExc_OverflowError, "argument '%d' overflowed: %s",
failure.arg_nr, exc_str);
#endif
}
@@ -13073,7 +13073,7 @@
name_str = _PyUnicode_AsString(name);
#else
/* We don't handle Unicode names. */
- if (!PyStringCheck(name))
+ if (!PyString_Check(name))
{
PyErr_Format(PyExc_TypeError,
"attribute name must be string, not '%.200s'",

View File

@@ -4,7 +4,7 @@
_realname=sip
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
pkgver=4.19.8
pkgver=4.19.9
#_pre_ver=4.19.1.dev1702081834
pkgrel=1
pkgdesc="Tool to create Python bindings for C and C++ libraries (mingw-w64)"
@@ -16,15 +16,18 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-python3")
source=("https://downloads.sourceforge.net/project/pyqt/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz"
#https://www.riverbankcomputing.com/static/Downloads/sip/sip-${_pre_ver}.tar.gz
"0001-mingw-python.patch")
sha256sums=('7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc'
'2e3400c7467faca17b6efaae2e2420b0a253df9070b1ed0adcafcc10f9499a8d')
"0001-mingw-python.patch"
"0002-sip-fix-build.patch")
sha256sums=('38a646ba483821ca4a6be7fa33e8634eb74812114e7081eccc4c3a8a6c92e438'
'2e3400c7467faca17b6efaae2e2420b0a253df9070b1ed0adcafcc10f9499a8d'
'b76b3eb3615ffa8dfd017f533214718812de22067802a749b32d9e2e84abf233')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
# Apply patches
patch -p1 -i "${srcdir}"/0001-mingw-python.patch
patch -p1 -i "${srcdir}"/0002-sip-fix-build.patch
}
build() {