[kdebindings] - avoid/patch crash id'd by our good friend mr. valgrind - drop debugging stuff

[Rex Dieter]

commit f441d139817f669458050e9dfa0abcbbc9f9d794
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jan 8 20:40:10 2011 -0600

    - avoid/patch crash id'd by our good friend mr. valgrind
    - drop debugging stuff

 kdebindings-4.5.95-valgrind.patch |   12 ++++++++++++
 kdebindings.spec                  |   13 ++++---------
 smokegen.gdb                      |    4 ----
 3 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/kdebindings-4.5.95-valgrind.patch b/kdebindings-4.5.95-valgrind.patch
new file mode 100644
index 0000000..dc835e4
--- /dev/null
+++ b/kdebindings-4.5.95-valgrind.patch
@@ -0,0 +1,12 @@
+diff -up kdebindings-4.5.95/generator/type_compiler.cpp.valgrind kdebindings-4.5.95/generator/type_compiler.cpp
+--- kdebindings-4.5.95/generator/type_compiler.cpp.valgrind	2010-10-12 08:06:55.000000000 -0500
++++ kdebindings-4.5.95/generator/type_compiler.cpp	2011-01-08 20:02:55.623757621 -0600
+@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara
+ 
+ void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
+ {
++    if ( ! m_session->token_stream ) return;
++    if ( ! token_text(m_session->token_stream->kind(node->op)) ) return;
+     if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
+         QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
+         pointerDepth.append(cv.first);
diff --git a/kdebindings.spec b/kdebindings.spec
index 67d6848..9b0d30e 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -50,11 +50,8 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.
 #Source0: kdebindings-1130463.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## DEBUGGING
-BuildRequires: gdb valgrind
-Source10: smokegen.gdb
-
 ## upstreamable patches
+Patch50: kdebindings-4.5.95-valgrind.patch
 
 ## upstream patches
 
@@ -275,6 +272,8 @@ Falcon plugin for the Kross archtecture in KDE4.
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
 
+%patch50 -p1 -b .valgrind
+
 
 %build
 mkdir -p %{_target_platform}
@@ -318,11 +317,7 @@ pushd %{_target_platform}
   ..
 popd
 
-pushd %{_target_platform}
-make %{?_smp_mflags} || \
-  gdb -batch -x %{SOURCE10} ; \
-  valgrind ./generator/bin/smokegen -config ./smoke/kde/akonadi/config.xml -smokeconfig ../smoke/kde/akonadi/smokeconfig.xml -I /usr/include -- ../smoke/kde/akonadi/akonadi_includes.h
-popd
+make %{?_smp_mflags} -C pushd %{_target_platform} 
 
 
 %install