diff options
| author | Bor Kraljič | 2010-10-07 09:22:16 +0200 |
|---|---|---|
| committer | Bor Kraljič | 2010-10-07 09:22:18 +0200 |
| commit | d996bd81654a5d910fa7646e2af2763dff90ec47 (patch) | |
| tree | 619f8654830ac72dc2f82036aaeaeeb12bd94f2d | |
| parent | 0bf56484156a57556936feab7a0045bffb8ff8c8 (diff) | |
kdebindings4: added patch that fixes build with pyqt4 4.7.7
Patch was taken from arch:
http://repos.archlinux.org/wsvn/packages/kdebindings/repos/extra-i686/fix-pyqt4-build.patch
| -rw-r--r-- | kde4/kdebindings4/HISTORY | 3 | ||||
| -rwxr-xr-x | kde4/kdebindings4/PRE_BUILD | 3 | ||||
| -rw-r--r-- | kde4/kdebindings4/fix-pyqt4-build.patch | 64 |
3 files changed, 70 insertions, 0 deletions
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY index 88d7c679d2..acea838f2b 100644 --- a/kde4/kdebindings4/HISTORY +++ b/kde4/kdebindings4/HISTORY @@ -1,3 +1,6 @@ +2010-10-07 Bor Kraljič <pyrobor@ver.si> + * fix-pyqt4-build.patch: fixes build with pyqt4 4.7.7 + 2010-10-06 Bor Kraljič <pyrobor@ver.si> * DETAILS: updated spell to 4.5.2 diff --git a/kde4/kdebindings4/PRE_BUILD b/kde4/kdebindings4/PRE_BUILD new file mode 100755 index 0000000000..7b45833e3c --- /dev/null +++ b/kde4/kdebindings4/PRE_BUILD @@ -0,0 +1,3 @@ +mk_source_dir $SOURCE_DIRECTORY && + unpack_file && +patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-pyqt4-build.patch diff --git a/kde4/kdebindings4/fix-pyqt4-build.patch b/kde4/kdebindings4/fix-pyqt4-build.patch new file mode 100644 index 0000000000..249ccb8500 --- /dev/null +++ b/kde4/kdebindings4/fix-pyqt4-build.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*> + { |