[kde-base/pykde4] Add patch that fixes compilation with sip 4.12, bug 349668

Patch written by Alessandro Diaferia in bug 349707
Remove old patches

3 files changed, 93 insertions, 76 deletions

diff --git a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch b/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch
deleted file mode 100644
index 570eb15fc90..00000000000
--- a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip
---- pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip	2010-05-27 19:21:46.000000000 +0200
-+++ pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip	2010-07-15 06:36:27.000000000 +0200
-@@ -19,7 +19,7 @@
- 
- namespace Akonadi
- {
--class AddressAttribute : Akonadi::Attribute
-+class AddressAttribute : Akonadi::Attribute /NoDefaultCtors/
- {
- %TypeHeaderCode
- #include <akonadi/kmime/addressattribute.h>
diff --git a/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch b/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch
new file mode 100644
index 00000000000..4a5c16edbfc
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch
@@ -0,0 +1,93 @@
+--- pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip	2010-12-26 00:33:58.884995287 +0100
++++ pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip	2010-12-26 00:34:36.146000281 +0100
+@@ -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>
+ {
diff --git a/kde-base/pykde4/files/pykde4-mapped-type-fix.patch b/kde-base/pykde4/files/pykde4-mapped-type-fix.patch
deleted file mode 100644
index ebf1a54026f..00000000000
--- a/kde-base/pykde4/files/pykde4-mapped-type-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip	2010/01/16 10:06:39	1075490
-+++ trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip	2010/09/01 15:31:50	1170602
-@@ -733,61 +733,6 @@
- };
- 
- 
--%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*>
- {