[SCM] KDE Bindings module packaging branch, master, updated. debian/4.4.5-3-4-gc32a98f
Pino Toscano
pino-guest at alioth.debian.org
Sun Mar 6 23:20:40 UTC 2011
The following commit has been merged in the master branch:
commit 570ded56d66e892420b138598346193a7b6975bb
Author: Pino Toscano <pino at kde.org>
Date: Mon Mar 7 00:08:12 2011 +0100
Backport some upstream revisions to fix compilation. (#616139)
- r1150375 for SIP > 4.10.
- r1170602, r1209688, and r1211266 for PyQt4 4.8.x.
- r1184022 to fix a smokegen segfault when parsing QtOpenGL headers.
---
debian/changelog | 5 ++
debian/patches/backport_r1150375.diff | 23 +++++++
debian/patches/backport_r1170602.diff | 76 ++++++++++++++++++++++++
debian/patches/backport_r1184022.diff | 49 ++++++++++++++++
debian/patches/backport_r1209688.diff | 43 ++++++++++++++
debian/patches/backport_r1211266.diff | 103 +++++++++++++++++++++++++++++++++
debian/patches/series | 5 ++
7 files changed, 304 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index baaf110..1e0e171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
kdebindings (4:4.4.5-4) UNRELEASED; urgency=low
+ [ Pino Toscano ]
+ * Backport some upstream revisions to fix compilation: (Closes: #616139)
+ - r1150375 for SIP > 4.10.
+ - r1170602, r1209688, and r1211266 for PyQt4 4.8.x.
+ - r1184022 to fix a smokegen segfault when parsing QtOpenGL headers.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 06 Mar 2011 23:58:09 +0100
diff --git a/debian/patches/backport_r1150375.diff b/debian/patches/backport_r1150375.diff
new file mode 100644
index 0000000..39f4658
--- /dev/null
+++ b/debian/patches/backport_r1150375.diff
@@ -0,0 +1,23 @@
+r1150375 | sedwards | 2010-07-15 22:17:52 +0200 (Thu, 15 Jul 2010) | 2 lines
+Changed paths:
+ M /trunk/KDE/kdebindings/python/pykde4/sip/akonadi/addressattribute.sip
+
+Small compatibility fix for the latest (minor) version of SIP which came out a couple days ago.
+
+Applied-Upstream: 4.6.0
+
+Index: kdebindings/python/pykde4/sip/akonadi/addressattribute.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/akonadi/addressattribute.sip (revision 1150374)
++++ kdebindings/python/pykde4/sip/akonadi/addressattribute.sip (revision 1150375)
+@@ -59,6 +59,10 @@
+ else if (dynamic_cast<Akonadi::PersistentSearchAttribute*>(sipCpp))
+ sipType = sipType_Akonadi_PersistentSearchAttribute;
+ %End
++private:
++//force
++Akonadi::AddressAttribute& operator = (const Akonadi::AddressAttribute&);
++//end
+ };
+ };
+ %ModuleHeaderCode
diff --git a/debian/patches/backport_r1170602.diff b/debian/patches/backport_r1170602.diff
new file mode 100644
index 0000000..2ef5825
--- /dev/null
+++ b/debian/patches/backport_r1170602.diff
@@ -0,0 +1,76 @@
+r1170602 | mueller | 2010-09-01 17:31:50 +0200 (Wed, 01 Sep 2010) | 4 lines
+Changed paths:
+ M /trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip
+
+I get the error "This MappedType is already defined" here,
+and indeed it compes from PyQt. removing here. Blame me
+if this is wrong.
+
+Applied-Upstream: 4.6.0
+
+Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601)
++++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170602)
+@@ -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/debian/patches/backport_r1184022.diff b/debian/patches/backport_r1184022.diff
new file mode 100644
index 0000000..632f0a2
--- /dev/null
+++ b/debian/patches/backport_r1184022.diff
@@ -0,0 +1,49 @@
+r1184022 | rdale | 2010-10-09 08:51:34 +0200 (Sat, 09 Oct 2010) | 5 lines
+Changed paths:
+ M /trunk/KDE/kdebindings/generator/parser/rpp/pp-macro-expander.cpp
+ M /trunk/KDE/kdebindings/generator/type_compiler.cpp
+
+* Apply patch from Rex Dieter for fixing issues with parsing the
+QtOpenGL module. Thanks for the patch.
+
+Applied-Upstream: 4.6.0
+
+Index: kdebindings/generator/type_compiler.cpp
+===================================================================
+--- kdebindings/generator/type_compiler.cpp (revision 1184021)
++++ kdebindings/generator/type_compiler.cpp (revision 1184022)
+@@ -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);
+Index: kdebindings/generator/parser/rpp/pp-macro-expander.cpp
+===================================================================
+--- kdebindings/generator/parser/rpp/pp-macro-expander.cpp (revision 1184021)
++++ kdebindings/generator/parser/rpp/pp-macro-expander.cpp (revision 1184022)
+@@ -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/debian/patches/backport_r1209688.diff b/debian/patches/backport_r1209688.diff
new file mode 100644
index 0000000..c273aea
--- /dev/null
+++ b/debian/patches/backport_r1209688.diff
@@ -0,0 +1,43 @@
+r1209688 | lbeltrame | 2010-12-28 00:06:31 +0100 (Tue, 28 Dec 2010) | 6 lines
+Changed paths:
+ M /trunk/KDE/kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py
+
+Make pykdeuic4 work again with PyQt 4.8:
+
+- qtproxies.escape -> qtproxies.as_string
+- change the call to compileUi to account the new from_imports parameter
+
+
+Applied-Upstream: 4.6.0
+
+Index: kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py
+===================================================================
+--- kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py (revision 1209687)
++++ kdebindings/python/pykde4/tools/pykdeuic4/pykdeuic4.py (revision 1209688)
+@@ -39,7 +39,7 @@
+ def __init__(self,string):
+ original_i18n_string.__init__(self,string)
+ def __str__(self):
+- return "kdecore.i18n(\"%s\")" % (qtproxies.escape(self.string),)
++ return "kdecore.i18n(%s)" % (qtproxies.as_string(self.string),)
+ qtproxies.i18n_string = kde_i18n_string
+
+ def kdeFilter():
+@@ -71,7 +71,7 @@
+ indenter.indentwidth = indent
+ comp = compiler.UICompiler()
+ comp.factory._cwFilters.append(kdeFilter())
+- winfo = comp.compileUi(uifile, output)
++ winfo = comp.compileUi(uifile, output, None)
+
+ if exe:
+ output.write("""
+@@ -104,7 +104,7 @@
+ app = kdeui.KApplication()
+ mainWindow = MainWin(None, "main window")
+ mainWindow.show()
+- app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit)
++ app.lastWindowClosed.connect(app.quit)
+ app.exec_ ()
+ """)
+
diff --git a/debian/patches/backport_r1211266.diff b/debian/patches/backport_r1211266.diff
new file mode 100644
index 0000000..f853eb5
--- /dev/null
+++ b/debian/patches/backport_r1211266.diff
@@ -0,0 +1,103 @@
+r1211266 | lbeltrame | 2011-01-03 14:41:10 +0100 (Mon, 03 Jan 2011) | 2 lines
+Changed paths:
+ M /trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip
+
+Fix building against PyQt 4.8.2 (forwardport of r1208598 by sedwards)
+
+Applied-Upstream: 4.6.0
+
+Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1211265)
++++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1211266)
+@@ -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>
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 01f83c7..0d3b299 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,8 @@ fix_segfault_in_generator_on_armel.diff
12_pythonpluginfactory_use_versioned_python_lib.diff
version_cppparser_library.diff
optional_install_sip_files.diff
+backport_r1150375.diff
+backport_r1170602.diff
+backport_r1184022.diff
+backport_r1209688.diff
+backport_r1211266.diff
--
KDE Bindings module packaging
More information about the pkg-kde-commits
mailing list