diff options
| author | Jonathan Callen <abcd@gentoo.org> | 2011-06-12 04:27:14 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2011-06-12 04:27:14 -0400 |
| commit | f74f8cc88ce7f82f1c6c562895520b7e1c6f78a3 (patch) | |
| tree | f4062daf5b8e25a485607f2efb3ad9ea59f20f55 /kde-base/pykde4/files | |
| parent | 3109387f673309be77417d21d07f33160ef74020 (diff) | |
| download | kde-f74f8cc88ce7f82f1c6c562895520b7e1c6f78a3.tar.gz kde-f74f8cc88ce7f82f1c6c562895520b7e1c6f78a3.tar.bz2 kde-f74f8cc88ce7f82f1c6c562895520b7e1c6f78a3.zip | |
Remove unused patches, add a few missing ones (from gx86)
Diffstat (limited to 'kde-base/pykde4/files')
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch | 155 | ||||
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch | 93 |
2 files changed, 0 insertions, 248 deletions
diff --git a/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch b/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch deleted file mode 100644 index 6fb5714ad05..00000000000 --- a/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch +++ /dev/null @@ -1,155 +0,0 @@ ---- pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip~ 2010-11-02 12:51:10.000000000 +0000 -+++ pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip 2011-01-08 22:34:29.006096324 +0000 -@@ -582,90 +582,6 @@ - %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> - { -@@ -730,61 +646,6 @@ - - return sipGetState(sipTransferObj); - %End --}; -- -- --%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 - }; - - diff --git a/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch b/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch deleted file mode 100644 index 4a5c16edbfc..00000000000 --- a/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- 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> - { |
