diff options
| -rwxr-xr-x | kde/kdebindings/Pkgfile | 4 | ||||
| -rw-r--r-- | kde/kdebindings/fix-generator-segfaults.patch | 63 | ||||
| -rw-r--r-- | kde/kdebindings/fix-pyqt4-build.patch | 64 |
3 files changed, 2 insertions, 129 deletions
diff --git a/kde/kdebindings/Pkgfile b/kde/kdebindings/Pkgfile index 432d9bce1..379a96e5f 100755 --- a/kde/kdebindings/Pkgfile +++ b/kde/kdebindings/Pkgfile @@ -8,8 +8,8 @@ name=kdebindings version=4.5.2 release=2 source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 - fix-pyqt4-build.patch - fix-generator-segfaults.patch) + http://nutyx.meticul.eu/files/patchs/$name/fix-pyqt4-build.patch + http://nutyx.meticul.eu/files/patchs/$name/fix-generator-segfaults.patch) build() { unset MAKEFLAGS diff --git a/kde/kdebindings/fix-generator-segfaults.patch b/kde/kdebindings/fix-generator-segfaults.patch deleted file mode 100644 index 5b69b5961..000000000 --- a/kde/kdebindings/fix-generator-segfaults.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- branches/KDE/4.5/kdebindings/generator/generators/smoke/helpers.cpp 2010/10/09 06:54:13 1184023 -+++ branches/KDE/4.5/kdebindings/generator/generators/smoke/helpers.cpp 2010/10/09 06:57:13 1184024 -@@ -131,10 +131,10 @@ - // map this method to the function, so we can later retrieve the header it was defined in - globalFunctionMap[&parent->methods().last()] = &fn; - -- int methIndex = parent->methods().length() - 1; -+ int methIndex = parent->methods().size() - 1; - addOverloads(meth); - // handle the methods appended by addOverloads() -- for (int i = parent->methods().length() - 1; i > methIndex; --i) -+ for (int i = parent->methods().size() - 1; i > methIndex; --i) - globalFunctionMap[&parent->methods()[i]] = &fn; - - (*usedTypes) << meth.type(); -@@ -458,7 +458,11 @@ - return munge(&resolved); - } - -- if (type->pointerDepth() > 1 || (type->getClass() && type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode && type->getClass()->name() != "QFlags"))) || -+ if (type->name().contains("long long") || type->name() == "size_t") { -+ // Special case 'long long' types as '$'. -+ // Hack: 'size_t' isn't being fully resolved for some reason. -+ return '$'; -+ } else if (type->pointerDepth() > 1 || (type->getClass() && type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode && type->getClass()->name() != "QFlags"))) || - (Options::voidpTypes.contains(type->name()) && !Options::scalarTypes.contains(type->name())) ) - { - // QString and QStringList are both mapped to Smoke::t_voidp, but QString is a scalar as well ---- branches/KDE/4.5/kdebindings/generator/type_compiler.cpp 2010/10/09 06:54:13 1184023 -+++ branches/KDE/4.5/kdebindings/generator/type_compiler.cpp 2010/10/09 06:57:13 1184024 -@@ -182,7 +182,7 @@ - TypeCompiler tc(m_session, m_visitor); - tc.run(node->type_specifier, node->declarator); - NameCompiler name_cc(m_session, m_visitor); -- if (tc.type().isFunctionPointer()) -+ if (tc.type().isFunctionPointer() && node->declarator && node->declarator->sub_declarator) - name_cc.run(node->declarator->sub_declarator->id); - else if (node->declarator) - name_cc.run(node->declarator->id); ---- branches/KDE/4.5/kdebindings/generator/parser/rpp/pp-macro-expander.cpp 2010/10/09 06:54:13 1184023 -+++ branches/KDE/4.5/kdebindings/generator/parser/rpp/pp-macro-expander.cpp 2010/10/09 06:57:13 1184024 -@@ -268,10 +268,10 @@ - output << '\"'; - - while (!is.atEnd()) { -- if (input == '"') { -+ if (is == '"') { - output << '\\' << is; - -- } else if (input == '\n') { -+ } else if (is == '\n') { - output << '"' << is << '"'; - - } else { -@@ -338,7 +338,7 @@ - - skip_blanks(input, devnull()); - //Omit paste tokens behind empty used actuals, else we will merge with the previous text -- if(input == '#' && (++input) == '#') { -+ if(!input.atEnd() && input == '#' && !(++input).atEnd() && input == '#') { - ++input; - //We have skipped a paste token - }else{ diff --git a/kde/kdebindings/fix-pyqt4-build.patch b/kde/kdebindings/fix-pyqt4-build.patch deleted file mode 100644 index 249ccb850..000000000 --- a/kde/kdebindings/fix-pyqt4-build.patch +++ /dev/null @@ -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*> - { |