[arch-commits] Commit in kdebindings-python/trunk (PKGBUILD pyqt495.patch)

[Andrea Scarpino]

    Date: Tuesday, November 6, 2012 @ 07:57:43
  Author: andrea
Revision: 170258

KDE 4.9.3

Modified:
  kdebindings-python/trunk/PKGBUILD
Deleted:
  kdebindings-python/trunk/pyqt495.patch

---------------+
 PKGBUILD      |   14 ++------
 pyqt495.patch |   95 --------------------------------------------------------
 2 files changed, 4 insertions(+), 105 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-06 12:56:18 UTC (rev 170257)
+++ PKGBUILD	2012-11-06 12:57:43 UTC (rev 170258)
@@ -4,26 +4,20 @@
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 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"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('4a72a307d5780f013e12607b9cddb425f81ffeef')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
 
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \

Deleted: pyqt495.patch
===================================================================
--- pyqt495.patch	2012-11-06 12:56:18 UTC (rev 170257)
+++ pyqt495.patch	2012-11-06 12:57:43 UTC (rev 170258)
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame at 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&a=commitdiff&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 at 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
--};
--
-+
-