Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-11 02:04:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

kdebindings-pykde4 rebuild for new pyqt

Browse Source
This commit is contained in:
abveritas 2012-10-02 00:48:45 +00:00
parent 120840c4ff
commit 2ee1b6e5ae
2 changed files with 98 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kdebindings-pykde4/PKGBUILD
View File

@ -13,15 +13,17 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=kdebindings-pykde4 pkgname=kdebindings-pykde4
_pkgname=pykde4 _pkgname=pykde4
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=2
pkgdesc="KDE bindings for python" pkgdesc="KDE bindings for python"
url="http://kde.org/" url="http://kde.org/"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
depends=('pyqt' 'qscintilla' 'boost-libs' "kdepim-runtime>=${_kdever}") depends=('pyqt' 'qscintilla' 'boost-libs' "kdepim-runtime>=${_kdever}")
makedepends=('cmake' 'automoc4' 'polkit-qt' 'boost') makedepends=('cmake' 'automoc4' 'polkit-qt' 'boost')
source=("$_mirror/${_pkgname}-$_kdever.tar.xz") source=("$_mirror/${_pkgname}-$_kdever.tar.xz"
md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) 'QVector.diff')
md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'78c55560512ff35631c6a140a2f20279')
groups=("kde" "kdebindings" "kde-uninstall") groups=("kde" "kdebindings" "kde-uninstall")
provides=('kdebindings-python' 'pykde4') provides=('kdebindings-python' 'pykde4')
@ -32,6 +34,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
build() { build() {
cd "${srcdir}" cd "${srcdir}"
patch -p1 -N -i ${srcdir}/QVector.diff
rm -rf build rm -rf build
mkdir build && cd build mkdir build && cd build

91
kdebindings-pykde4/QVector.diff Normal file
View File

@ -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
-};