rev 17914 - in trunk/packages/kdebindings/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2010-05-11 09:15:55 +0000 (Tue, 11 May 2010)
New Revision: 17914

Added:
   trunk/packages/kdebindings/debian/patches/fix_segfault_in_generator_on_armel.diff
   trunk/packages/kdebindings/debian/patches/support_armel_in_generator.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/patches/series
Log:
* Make upstream create a patch to actually support armel. Steal the patch.
* Fix segfault when trying to parse/write the akonadi smoke part. Patch
  acknowledged by upstream.

Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2010-05-11 06:41:28 UTC (rev 17913)
+++ trunk/packages/kdebindings/debian/changelog	2010-05-11 09:15:55 UTC (rev 17914)
@@ -4,6 +4,11 @@
     dangle under the same name. (Closes: #580400, #580401)
   * Fixed typo in extended description. (Closes: #580117)
 
+  [ Sune Vuorela ]
+  * Make upstream create a patch to actually support armel. Steal the patch.
+  * Fix segfault when trying to parse/write the akonadi smoke part. Patch
+    acknowledged by upstream.
+
  -- Michael Meskes <meskes at debian.org>  Fri, 07 May 2010 21:55:09 +0200
 
 kdebindings (4:4.4.3-1) unstable; urgency=low

Added: trunk/packages/kdebindings/debian/patches/fix_segfault_in_generator_on_armel.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/fix_segfault_in_generator_on_armel.diff	                        (rev 0)
+++ trunk/packages/kdebindings/debian/patches/fix_segfault_in_generator_on_armel.diff	2010-05-11 09:15:55 UTC (rev 17914)
@@ -0,0 +1,26 @@
+Patch by Sune Vuorela
+Fixes segfault seen on arm, but theoretically could happen more places.
+token_text can return a null pointer.
+Index: b/generator/type_compiler.cpp
+===================================================================
+--- a/generator/type_compiler.cpp
++++ b/generator/type_compiler.cpp
+@@ -191,11 +191,13 @@
+ 
+ void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
+ {
+-    if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
+-        QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
+-        pointerDepth.append(cv.first);
+-    } else if (token_text(m_session->token_stream->kind(node->op))[0] == '&') {
+-        isRef = true;
++    if(token_text(m_session->token_stream->kind(node->op))) {
++        if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
++            QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
++            pointerDepth.append(cv.first);
++        } else if (token_text(m_session->token_stream->kind(node->op))[0] == '&') {
++            isRef = true;
++        }
+     }
+ }
+ 

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2010-05-11 06:41:28 UTC (rev 17913)
+++ trunk/packages/kdebindings/debian/patches/series	2010-05-11 09:15:55 UTC (rev 17914)
@@ -1,3 +1,5 @@
+support_armel_in_generator.diff
+fix_segfault_in_generator_on_armel.diff
 01_python_modules_dont_link_against_libpython.diff
 02_include_default_settings_in_python_cmakelist.diff
 # import changed from libqyotoshared to qyotoshared

Added: trunk/packages/kdebindings/debian/patches/support_armel_in_generator.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/support_armel_in_generator.diff	                        (rev 0)
+++ trunk/packages/kdebindings/debian/patches/support_armel_in_generator.diff	2010-05-11 09:15:55 UTC (rev 17914)
@@ -0,0 +1,23 @@
+Actually support eabi arm in the bindings generator.
+Patch by Arno Rehn. Stolen from upstream.
+svn diff -c 1124282 svn://anonsvn.kde.org/home/kde/
+
+Index: branches/KDE/4.4/kdebindings/generator/generatorpreprocessor.cpp
+===================================================================
+--- a/generator/generatorpreprocessor.cpp	(revision 1124281)
++++ b/generator/generatorpreprocessor.cpp	(revision 1124282)
+@@ -77,6 +77,14 @@
+     exportMacro->variadics = false;
+     m_topBlock->setMacro(exportMacro);
+ 
++#if (defined(QT_ARCH_ARM) || defined (QT_ARCH_ARMV6)) && !defined(QT_NO_ARM_EABI)
++    exportMacro = new rpp::pp_macro;
++    exportMacro->name = IndexedString("__ARM_EABI__");
++    exportMacro->function_like = false;
++    exportMacro->variadics = false;
++    m_topBlock->setMacro(exportMacro);
++#endif
++
+     // ansidecl.h will define macros for keywords if we don't define __STDC__
+     exportMacro = new rpp::pp_macro;
+     exportMacro->name = IndexedString("__STDC__");