Fix build with latest sip; upstream commit found by drochner.

3 files changed, 99 insertions, 7 deletions

diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile
index 489681a27b4..3159d002fec 100644
--- a/x11/kdebindings4-python/Makefile
+++ b/x11/kdebindings4-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/01/13 13:39:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2011/01/18 09:14:13 wiz Exp $
 
 PKGNAME=	kdebindings4-python-${_KDE_VERSION}
 DISTNAME=	kdebindings-${_KDE_VERSION}
@@ -33,7 +33,7 @@ post-extract:
 	${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
 
 # patched by pkgsrc; remove them, otherwise they get installed
-post-patch:
+post-build:
 	rm ${WRKSRC}/python/pykde4/sip/kdecore/typedefs.sip.orig
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo
index a2df1d95bc1..69f5d7c513e 100644
--- a/x11/kdebindings4-python/distinfo
+++ b/x11/kdebindings4-python/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2010/12/06 11:43:42 markd Exp $
+$NetBSD: distinfo,v 1.17 2011/01/18 09:14:14 wiz Exp $
 
 SHA1 (kdebindings-4.5.4.tar.bz2) = 1562ca0e58450ed72bc18ed9a1c4c6ec62fd4a8f
 RMD160 (kdebindings-4.5.4.tar.bz2) = 59504a5e617f8d472c4a6220ce2e0353c16fde69
@@ -6,4 +6,4 @@ Size (kdebindings-4.5.4.tar.bz2) = 7135083 bytes
 SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158
 SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec
 SHA1 (patch-ac) = 698eaecc5cb2489b16409bc14c4beee5ca93a296
-SHA1 (patch-am) = 21146fef7852f5316b606195686163372fc3a35e
+SHA1 (patch-am) = c2f5907c53185941a5fd2bb58deada46c19e31ae
diff --git a/x11/kdebindings4-python/patches/patch-am b/x11/kdebindings4-python/patches/patch-am
index d256c0e53d8..ecb500f9ff6 100644
--- a/x11/kdebindings4-python/patches/patch-am
+++ b/x11/kdebindings4-python/patches/patch-am
@@ -1,10 +1,102 @@
-$NetBSD: patch-am,v 1.1 2010/09/06 12:22:51 wiz Exp $
+$NetBSD: patch-am,v 1.2 2011/01/18 09:14:14 wiz Exp $
 
 http://websvn.kde.org/?view=revision&revision=1170602
+https://projects.kde.org/projects/kde/kdebindings/pykde4/repository/diff/sip/kdecore/typedefs.sip?rev=e0b183d78884c8af3396e3877ec7284a0bbce7e4&type=sbs
 
---- python/pykde4/sip/kdecore/typedefs.sip.orig	2010-01-19 23:24:08.000000000 +0000
+--- python/pykde4/sip/kdecore/typedefs.sip.orig	2010-11-02 12:51:10.000000000 +0000
 +++ python/pykde4/sip/kdecore/typedefs.sip
-@@ -733,61 +733,6 @@ template <TYPE1,TYPE2>
+@@ -582,90 +582,6 @@ template <TYPE1,TYPE2*>
+ %End
+ };
+ 
+-template <TYPE>
+-%MappedType QSet<TYPE>
+-{
+-%TypeHeaderCode
+-#include <qset.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    QSet<TYPE> set = *sipCpp;
+-    int i = 0;
+-    foreach (TYPE value, set)
+-    {
+-        PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
+-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+-        {
+-            Py_DECREF(l);
+-
+-            if (obj)
+-                Py_DECREF(obj);
+-
+-            return NULL;
+-        }
+-
+-        Py_DECREF(obj);
+-        i++;
+-    }
+-   
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-    }
+-
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-            if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+-                return 0;
+-    }
+-
+-    QSet<TYPE> *qs = new QSet<TYPE>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        int state;
+-
+-        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+- 
+-        if (*sipIsErr)
+-        {
+-            sipReleaseType(t, sipType_TYPE, state);
+-
+-            delete qs;
+-            return 0;
+-        }
+-
+-        *qs << *t;
+-
+-        sipReleaseType(t, sipType_TYPE, state);
+-    }
+- 
+-    *sipCppPtr = qs;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE1,TYPE2>
+ %MappedType QPair<TYPE1,TYPE2>
+ {
+@@ -733,61 +649,6 @@ template <TYPE1,TYPE2>
  };