[gentoo-commits] gentoo-x86 commit in kde-base/pykde4/files: pykde4-4.4.5-sip-4.12.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    10/12/30 00:58:57

  Added:                pykde4-4.4.5-sip-4.12.patch
  Log:
  Fix building with newer versions of dev-python/sip (bug #332503, bug #349707).
  
  (Portage version: 2.2.0_alpha10_p17/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/pykde4/files/pykde4-4.4.5-sip-4.12.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.4.5-sip-4.12.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/files/pykde4-4.4.5-sip-4.12.patch?rev=1.1&content-type=text/plain

Index: pykde4-4.4.5-sip-4.12.patch
===================================================================
--- python/pykde4/sip/kdecore/typedefs.sip
+++ python/pykde4/sip/kdecore/typedefs.sip
@@ -582,90 +582,6 @@
 %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>
 {