From 2ee1b6e5aee511ccf031d0c85a3196eff2d84348 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Tue, 2 Oct 2012 00:48:45 +0000
Subject: [PATCH] kdebindings-pykde4 rebuild for new pyqt

---
 kdebindings-pykde4/PKGBUILD     | 10 ++--
 kdebindings-pykde4/QVector.diff | 91 +++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 kdebindings-pykde4/QVector.diff

diff --git a/kdebindings-pykde4/PKGBUILD b/kdebindings-pykde4/PKGBUILD
index 80ad7c38c..1cfc9ff35 100644
--- a/kdebindings-pykde4/PKGBUILD
+++ b/kdebindings-pykde4/PKGBUILD
@@ -13,15 +13,17 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=kdebindings-pykde4
 _pkgname=pykde4
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE bindings for python"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 depends=('pyqt' 'qscintilla' 'boost-libs' "kdepim-runtime>=${_kdever}")
 makedepends=('cmake' 'automoc4' 'polkit-qt' 'boost')
-source=("$_mirror/${_pkgname}-$_kdever.tar.xz")
-md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
+source=("$_mirror/${_pkgname}-$_kdever.tar.xz"
+        'QVector.diff')
+md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
+         '78c55560512ff35631c6a140a2f20279')
   
 groups=("kde" "kdebindings" "kde-uninstall")
 provides=('kdebindings-python' 'pykde4')
@@ -32,6 +34,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
 build() {
 	cd "${srcdir}"
 	
+	patch -p1 -N -i ${srcdir}/QVector.diff 
+	
         rm -rf build 
 	mkdir build && cd build
 	
diff --git a/kdebindings-pykde4/QVector.diff b/kdebindings-pykde4/QVector.diff
new file mode 100644
index 000000000..696e633d2
--- /dev/null
+++ b/kdebindings-pykde4/QVector.diff
@@ -0,0 +1,91 @@
+commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
+Author: Luca Beltrame <lbeltrame@kde.org>
+Date:   Mon Oct 1 20:47:56 2012 +0200
+
+    Remove duplicated QVector<int> definition, since it's in PyQt now.
+    Simon, if you have time, please review if everything is OK.
+    
+    CCMAIL: simon@simonzone.com
+
+diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
+index 5a0a080..73dad01 100644
+--- a/pykde4-4.9.2/sip/kdecore/typedefs.sip
++++ b/pykde4-4.9.2/sip/kdecore/typedefs.sip
+@@ -951,77 +951,3 @@ template <TYPE1>
+ %End
+ };
+ 
+-%MappedType QVector<int>
+-{
+-%TypeHeaderCode
+-#include <qvector.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)
+-    {
+-        int t = (sipCpp->at(i));
+-
+-#if PY_MAJOR_VERSION >= 3        
+-        PyObject *tobj = PyLong_FromLong(t);
+-#else
+-        PyObject *tobj = PyInt_FromLong(t);
+-#endif
+-
+-        PyList_SET_ITEM(l, i, tobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // 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) {
+-            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+-#if PY_MAJOR_VERSION >= 3
+-            if (!PyNumber_Check(tobj))
+-#else
+-            if (!PyInt_Check(tobj))
+-#endif
+-                return 0;
+-        }
+-        return 1;
+-    }
+-
+-    QVector<int> *qv = new QVector<int>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+- #if PY_MAJOR_VERSION >= 3
+-        int t = PyLong_AsLong (tobj);
+-#else
+-        int t = PyInt_AS_LONG (tobj);
+-#endif
+-
+-        if (*sipIsErr)
+-        {
+-            delete qv;
+-            return 0;
+-        }
+-
+-        qv->append(t);
+-    }
+- 
+-    *sipCppPtr = qv;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};