Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=494374834dd81cc7b1e43a843f72fb75fc61c59c

commit 494374834dd81cc7b1e43a843f72fb75fc61c59c
Author: Devil505 <devil505li...@gmail.com>
Date:   Tue Dec 28 22:33:05 2010 +0100

kdebindings-4.5.4-1-i686
* version bump
* added 2 patches for sip

diff --git a/source/kde/kdebindings/FrugalBuild 
b/source/kde/kdebindings/FrugalBuild
index 8bf99b2..96126b0 100644
--- a/source/kde/kdebindings/FrugalBuild
+++ b/source/kde/kdebindings/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: DeX77 <d...@dragonslave.de>

pkgname=kdebindings
-pkgrel=2
+pkgrel=1
pkgdesc="KDE Bindings."
groups=('kde')
archs=('i686' 'x86_64' 'ppc')
@@ -13,9 +13,11 @@ depends=("kdepimlibs>=$_F_kde_ver" 'pyqt4>=4.7-3' 
'libboost-mt')
replaces=('pykde' 'pykdeextensions')
makedepends=("${makedepends[@]}"  'sip' "qimageblitz>=0.0.4-2" 
"kdewebdev>=$_F_kde_ver" 'mono' "libqtgui>=$_F_kde_qt_ver" \
"kdesdk>=$_F_kde_ver" 'boost' "kdegraphics>=$_F_kde_ver" 'gcc-gcj'  \
-       "kdebase-workspace>=${_F_kde_ver}" 
"kdebase-workspace-compiletime>=${_F_kde_ver}" 'libqtmultimedia')
-#source=("${source[@]}" kill-broken-example.patch)
-sha1sums=('2f041c5b050da879e8f5d09f668b56881f9f1bb2')
+       "kdebase-workspace>=${_F_kde_ver}" 
"kdebase-workspace-compiletime>=${_F_kde_ver}" 'libqtmultimedia' 'docbook-xsl')
+source=("${source[@]}" sip4.11.2.patch sip4.12.patch)
+sha1sums=('1562ca0e58450ed72bc18ed9a1c4c6ec62fd4a8f' \
+          '36b52d147fee24a65c756baaad00e3d1ac081d3d' \
+          '59b3992de8def0e415a055246d2d3d0a2934d8d9')
if [ "$CARCH" != "ppc" ]; then
makedepends=(${makedepends[@]} "ruby>=1.9.1-3")
fi
@@ -26,3 +28,4 @@ build() {
Fmonocleanup
}
# optimization OK
+
diff --git a/source/kde/kdebindings/sip4.11.2.patch 
b/source/kde/kdebindings/sip4.11.2.patch
new file mode 100644
index 0000000..249ccb8
--- /dev/null
+++ b/source/kde/kdebindings/sip4.11.2.patch
@@ -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*>
+ {
diff --git a/source/kde/kdebindings/sip4.12.patch 
b/source/kde/kdebindings/sip4.12.patch
new file mode 100644
index 0000000..4a5c16e
--- /dev/null
+++ b/source/kde/kdebindings/sip4.12.patch
@@ -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>
+ {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to