Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=f4e6a830c9dd0899d4c639292c2eba5761f622e2
commit f4e6a830c9dd0899d4c639292c2eba5761f622e2 Author: Melko <[email protected]> Date: Thu Dec 8 11:15:53 2011 +0100 smokegen-4.7.4-2-i686 * backport patch to fix segfault with akonadi diff --git a/source/kde-extra/smokegen/0001-fix-a-crash-when-generating-the-akonadi-bindings.patch b/source/kde-extra/smokegen/0001-fix-a-crash-when-generating-the-akonadi-bindings.patch new file mode 100644 index 0000000..964c59f --- /dev/null +++ b/source/kde-extra/smokegen/0001-fix-a-crash-when-generating-the-akonadi-bindings.patch @@ -0,0 +1,26 @@ +From 50f01c2d6b28110f8517a77960e456c1125bdb6e Mon Sep 17 00:00:00 2001 +From: Arno Rehn <[email protected]> +Date: Sat, 3 Dec 2011 17:57:43 +0100 +Subject: [PATCH] fix a crash when generating the akonadi bindings + +BUG: 283677 +--- + type_compiler.cpp | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/type_compiler.cpp b/type_compiler.cpp +index 6ebf602..6e4ab70 100644 +--- a/type_compiler.cpp ++++ b/type_compiler.cpp +@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclaration(ParameterDeclarationAST* node) + + 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); +-- +1.7.8 + diff --git a/source/kde-extra/smokegen/FrugalBuild b/source/kde-extra/smokegen/FrugalBuild index 87fc0e6..94785d6 100644 --- a/source/kde-extra/smokegen/FrugalBuild +++ b/source/kde-extra/smokegen/FrugalBuild @@ -2,12 +2,14 @@ # Maintainer: centuri0 <achevaux at gmail dot com> pkgname=smokegen -pkgrel=1 +pkgrel=2 pkgdesc="A general purpose C++ parser with a plugin infrastructure." groups=('kde-extra') archs=('i686' 'x86_64') Finclude kde depends=("libqtxml>=$_F_kde_qtver") +source=(${source[@]} 0001-fix-a-crash-when-generating-the-akonadi-bindings.patch) +sha1sums=("${sha1sums}" '19ab485375202c09034247f9bcb28b46468d4040') build() { unset MAKEFLAGS _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
