From c84b2cd310f86dc50c4f52a5907cb17652e8c87c Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 17 Oct 2012 01:15:52 -0700
Subject: Wed Oct 17 01:14:52 PDT 2012

---
 testing/kdebindings-python/PKGBUILD      | 19 ++++---
 testing/kdebindings-python/pyqt495.patch | 95 ++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 7 deletions(-)
 create mode 100644 testing/kdebindings-python/pyqt495.patch

(limited to 'testing/kdebindings-python')

diff --git a/testing/kdebindings-python/PKGBUILD b/testing/kdebindings-python/PKGBUILD
index 7767091d2..a14201e78 100644
--- a/testing/kdebindings-python/PKGBUILD
+++ b/testing/kdebindings-python/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 167573 2012-10-02 19:03:28Z andrea $
+# $Id: PKGBUILD 168840 2012-10-16 11:53:48Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
              'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
+        'pyqt495.patch')
+sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
+          '0935c32e55806873f2d088613594559285da7e9c')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
 
-  cd "${srcdir}"
+  cd pykde4-${pkgver}
+  patch -p1 -i "${srcdir}"/pyqt495.patch
+  cd ../ 
+
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
   make
   cd ..
 
diff --git a/testing/kdebindings-python/pyqt495.patch b/testing/kdebindings-python/pyqt495.patch
new file mode 100644
index 000000000..b8a9df258
--- /dev/null
+++ b/testing/kdebindings-python/pyqt495.patch
@@ -0,0 +1,95 @@
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Mon, 01 Oct 2012 18:47:56 +0000
+Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
+X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&amp;a=commitdiff&amp;h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
+---
+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
+---
+
+
+--- a/sip/kdecore/typedefs.sip
++++ b/sip/kdecore/typedefs.sip
+@@ -951,78 +951,4 @@
+ %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
+-};
+-
++
+
-- 
cgit v1.2.3-54-g00ecf