diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 11:14:21 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 11:14:21 -0300 |
| commit | 3de3a024e4363dffac1dd89c5d8ad6ecdeb6794e (patch) | |
| tree | f0c55d9558ab8b6537b746434276d4a39b60365c /extra/sip | |
| parent | b73709861e566f564c8cf5cde4b40bd3d17982d9 (diff) | |
| parent | 3abfc1ebef5936241997dd882938581c91743ee9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/aria2/PKGBUILD
community-staging/ekg2/PKGBUILD
community-staging/filezilla/PKGBUILD
community-staging/freerdp/PKGBUILD
community-staging/gloox/PKGBUILD
community-staging/gnustep-base/PKGBUILD
community-staging/gsasl/PKGBUILD
community-staging/gtk-gnutella/PKGBUILD
community-staging/gwenhywfar/PKGBUILD
community-staging/ifuse/PKGBUILD
community-staging/jabberd14/PKGBUILD
community-staging/libinfinity/PKGBUILD
community-staging/libmicrohttpd/PKGBUILD
community-staging/libvirt/PKGBUILD
community-staging/mailutils/PKGBUILD
community-staging/minbif/PKGBUILD
community-staging/net6/PKGBUILD
community-staging/nzbget/PKGBUILD
community-staging/openscenegraph/PKGBUILD
community-staging/qwtpolar-svn/PKGBUILD
community-staging/remmina-plugins/PKGBUILD
community-staging/rsyslog/PKGBUILD
community-staging/smalltalk/PKGBUILD
community/musca/PKGBUILD
community/ogre/PKGBUILD
community/thoggen/PKGBUILD
extra/archboot/PKGBUILD
extra/esound/PKGBUILD
extra/hal/PKGBUILD
staging/claws-mail/PKGBUILD
staging/cups/PKGBUILD
staging/empathy/PKGBUILD
staging/glib-networking/PKGBUILD
staging/gnome-vfs/PKGBUILD
staging/gnutls/PKGBUILD
staging/gtk-vnc/PKGBUILD
staging/lftp/PKGBUILD
staging/libgpod/PKGBUILD
staging/libimobiledevice/PKGBUILD
staging/libvncserver/PKGBUILD
staging/msmtp/PKGBUILD
staging/nettle/PKGBUILD
staging/telepathy-gabble/PKGBUILD
staging/vino/PKGBUILD
staging/vlc/PKGBUILD
staging/weechat/PKGBUILD
staging/wireshark/PKGBUILD
staging/xfce4-mailwatch-plugin/PKGBUILD
staging/xmlsec/PKGBUILD
testing/wget/PKGBUILD
Diffstat (limited to 'extra/sip')
| -rw-r--r-- | extra/sip/fix-regression.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch deleted file mode 100644 index d4dc794ad..000000000 --- a/extra/sip/fix-regression.patch +++ /dev/null @@ -1,26 +0,0 @@ - -# 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; - |