diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-01 23:11:14 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-01 23:11:14 +0000 |
| commit | a81bc5be2e3672119ca0313a1fde10397a31211e (patch) | |
| tree | df4a74a90bd4186a7aab0c935caa8c0a469b9c23 /extra/sip | |
| parent | 76400556d9e8a5dedc692487c13b76a541813a23 (diff) | |
Fri Jul 1 23:11:14 UTC 2011
Diffstat (limited to 'extra/sip')
| -rw-r--r-- | extra/sip/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/sip/fix-regression.patch | 26 |
2 files changed, 35 insertions, 4 deletions
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 510afc089..5d73e1d73 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127700 2011-06-17 17:59:14Z andrea $ +# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> @@ -6,15 +6,20 @@ pkgbase=sip pkgname=('sip' 'python2-sip') pkgver=4.12.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('d0f1fa60494db04b4d115d4c2d92f79e') +source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz" + 'fix-regression.patch') +md5sums=('d0f1fa60494db04b4d115d4c2d92f79e' + '598ffc65ebaf1c0e8855a352b02c43e7') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-regression.patch + cd "${srcdir}" cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch new file mode 100644 index 000000000..d4dc794ad --- /dev/null +++ b/extra/sip/fix-regression.patch @@ -0,0 +1,26 @@ + +# HG changeset patch +# User Phil Thompson <phil@riverbankcomputing.com> +# Date 1308852953 -3600 +# Node ID f9f4b161c94021c117e995eccba945d4dd3d0ed4 +# Parent df42f6bf92c8cd12dd7cc5a30231728a4c23ead4 +Fixed a regression introduced in the recent sipIsPyMethod() changes in the +handling of special methods implemented by object (eg. __lt__). + +diff -r df42f6bf92c8 -r f9f4b161c940 siplib/siplib.c.in +--- a/siplib/siplib.c.in Thu Jun 23 17:24:41 2011 +0100 ++++ b/siplib/siplib.c.in Thu Jun 23 19:15:53 2011 +0100 +@@ -7604,9 +7604,10 @@ + #endif + + /* +- * Check any possible reimplementation is not the wrapped C++ method. ++ * Check any possible reimplementation is not the wrapped C++ method or ++ * a default special method implementation.. + */ +- if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type) ++ if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type) + { + reimp = cls_attr; + break; + |