head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.4
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.2
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.2.0.8
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.6
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.2
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.1.0.4
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.2
	pkgsrc-2010Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2012.03.19.19.44.02;	author markd;	state dead;
branches;
next	1.2;

1.2
date	2011.01.18.09.14.14;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2010.09.06.12.22.51;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to KDE SC 4.8.0

add kactivities
rename kdebase4 -> kde-baseapps4
rename kdebase-runtime4 -> kde-runtime4
rename kdebase-workspace4 -> kde-workspace4
rename kdebindings4-python -> py-kde4
@
text
@$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-11-02 12:51:10.000000000 +0000
+++ python/pykde4/sip/kdecore/typedefs.sip
@@@@ -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>
 };
 
 
-%MappedType QList<uint>
-{
-%TypeHeaderCode
-#include <qlist.h>
-%End
-
-%ConvertFromTypeCode
-    // Create the list.
-    PyObject *l;
-
-    if ((l = PyList_New(sipCpp->size())) == NULL)
-        return NULL;
-
-    // Set the list elements.
-    for (int i = 0; i < sipCpp->size(); ++i) {
-        PyObject *pobj;
-
-#if PY_MAJOR_VERSION >= 3
-        if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
-#else
-        if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
-#endif
-            Py_DECREF(l);
-
-            return NULL;
-        }
-
-        PyList_SET_ITEM(l, i, pobj);
-    }
-
-    return l;
-%End
-
-%ConvertToTypeCode
-    // Check the type if that is all that is required.
-    if (sipIsErr == NULL)
-        return PyList_Check(sipPy);
-
-    QList<uint> *ql = new QList<uint>;
- 
-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
-#if PY_MAJOR_VERSION >= 3
-        ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
-#else
-        ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
-#endif        
-    }
-    
-    *sipCppPtr = ql;
- 
-    return sipGetState(sipTransferObj);
-%End
-};
-
-
 template <TYPE*>
 %MappedType QStack<TYPE*>
 {
@


1.2
log
@Fix build with latest sip; upstream commit found by drochner.
@
text
@d1 1
a1 1
$NetBSD: patch-am,v 1.1 2010/09/06 12:22:51 wiz Exp $
@


1.1
log
@Add patch from KDE SVN to fix build with latest sip; patch found by
drochner. Make pkglint happier while here.
@
text
@d1 1
a1 1
$NetBSD$
d4 1
d6 1
a6 1
--- python/pykde4/sip/kdecore/typedefs.sip.orig	2010-01-19 23:24:08.000000000 +0000
d8 92
a99 1
@@@@ -733,61 +733,6 @@@@ template <TYPE1,TYPE2>
@