Date: Thursday, August 11, 2011 @ 12:54:11 Author: andrea Revision: 135247
upgpkg: sip 4.12.4-1 upstream release Modified: sip/trunk/PKGBUILD Deleted: sip/trunk/fix-regression.patch ----------------------+ PKGBUILD | 13 ++++--------- fix-regression.patch | 26 -------------------------- 2 files changed, 4 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-11 16:22:11 UTC (rev 135246) +++ PKGBUILD 2011-08-11 16:54:11 UTC (rev 135247) @@ -5,21 +5,16 @@ pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.12.3 -pkgrel=2 +pkgver=4.12.4 +pkgrel=1 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" - 'fix-regression.patch') -md5sums=('d0f1fa60494db04b4d115d4c2d92f79e' - '598ffc65ebaf1c0e8855a352b02c43e7') +source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") +md5sums=('6cbd56abb7d35aad833789c98ae61652') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-regression.patch - cd "${srcdir}" cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} Deleted: fix-regression.patch =================================================================== --- fix-regression.patch 2011-08-11 16:22:11 UTC (rev 135246) +++ fix-regression.patch 2011-08-11 16:54:11 UTC (rev 135247) @@ -1,26 +0,0 @@ - -# HG changeset patch -# User Phil Thompson <p...@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; -