[arch-commits] Commit in kdebindings/trunk (4 files)
Andrea Scarpino
andrea at archlinux.org
Mon Dec 27 12:13:55 UTC 2010
Date: Monday, December 27, 2010 @ 07:13:55
Author: andrea
Revision: 104043
upgpkg: kdebindings 4.5.4-2
pyqt/sip rebuild
Added:
kdebindings/trunk/sip4.11.2.patch
kdebindings/trunk/sip4.12.patch
Modified:
kdebindings/trunk/PKGBUILD
Deleted:
kdebindings/trunk/fix-pyqt4-build.patch
-----------------------+
PKGBUILD | 11 +++--
fix-pyqt4-build.patch | 64 ---------------------------------
sip4.11.2.patch | 64 +++++++++++++++++++++++++++++++++
sip4.12.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 164 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-27 11:29:38 UTC (rev 104042)
+++ PKGBUILD 2010-12-27 12:13:55 UTC (rev 104043)
@@ -8,21 +8,24 @@
'kdebindings-ruby'
'kdebindings-smoke')
pkgver=4.5.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'pyqt' 'kdepim-runtime' 'mono'
'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'fix-pyqt4-build.patch')
+ 'sip4.11.2.patch'
+ 'sip4.12.patch')
sha1sums=('1562ca0e58450ed72bc18ed9a1c4c6ec62fd4a8f'
- '36b52d147fee24a65c756baaad00e3d1ac081d3d')
+ '36b52d147fee24a65c756baaad00e3d1ac081d3d'
+ '59b3992de8def0e415a055246d2d3d0a2934d8d9')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np0 -i ${srcdir}/fix-pyqt4-build.patch
+ patch -Np0 -i ${srcdir}/sip4.11.2.patch
+ patch -Np1 -i ${srcdir}/sip4.12.patch
# fix ruby
for f in `find ruby -name CMakeLists.txt`; do
Deleted: fix-pyqt4-build.patch
===================================================================
--- fix-pyqt4-build.patch 2010-12-27 11:29:38 UTC (rev 104042)
+++ fix-pyqt4-build.patch 2010-12-27 12:13:55 UTC (rev 104043)
@@ -1,64 +0,0 @@
---- python/pykde4/sip/kdecore/typedefs.sip
-+++ python/pykde4/sip/kdecore/typedefs.sip
-@@ -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*>
- {
Added: sip4.11.2.patch
===================================================================
--- sip4.11.2.patch (rev 0)
+++ sip4.11.2.patch 2010-12-27 12:13:55 UTC (rev 104043)
@@ -0,0 +1,64 @@
+--- python/pykde4/sip/kdecore/typedefs.sip
++++ python/pykde4/sip/kdecore/typedefs.sip
+@@ -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*>
+ {
Added: sip4.12.patch
===================================================================
--- sip4.12.patch (rev 0)
+++ sip4.12.patch 2010-12-27 12:13:55 UTC (rev 104043)
@@ -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>
+ {
More information about the arch-commits
mailing list