diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-12 23:57:13 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-12 23:57:13 +0000 |
| commit | 9f390f01f259cd22c67e50948113a0d26957c786 (patch) | |
| tree | f59c1c9dfb070617b3007200536c16ebf00f34f3 /kde-base | |
| parent | Fix SRC_URI, remove not-yet-existing si, fix manifest; bug 394495 and others (diff) | |
| download | gentoo-2-9f390f01f259cd22c67e50948113a0d26957c786.tar.gz gentoo-2-9f390f01f259cd22c67e50948113a0d26957c786.tar.bz2 gentoo-2-9f390f01f259cd22c67e50948113a0d26957c786.zip | |
Fix crash when building akonadi bindings, bug 392925
(Portage version: 2.1.10.39/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/smokegen/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/smokegen/files/smokegen-4.7.4-akonadicrash.patch | 21 | ||||
| -rw-r--r-- | kde-base/smokegen/smokegen-4.7.4-r1.ebuild (renamed from kde-base/smokegen/smokegen-4.7.4.ebuild) | 4 |
3 files changed, 32 insertions, 2 deletions
diff --git a/kde-base/smokegen/ChangeLog b/kde-base/smokegen/ChangeLog index e4949228d9fa..9303bd3ef013 100644 --- a/kde-base/smokegen/ChangeLog +++ b/kde-base/smokegen/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/smokegen # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.10 2011/12/11 18:52:13 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/ChangeLog,v 1.11 2011/12/12 23:57:13 dilfridge Exp $ + +*smokegen-4.7.4-r1 (12 Dec 2011) + + 12 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -smokegen-4.7.4.ebuild, +smokegen-4.7.4-r1.ebuild, + +files/smokegen-4.7.4-akonadicrash.patch: + Fix crash when building akonadi bindings, bug 392925 *smokegen-4.7.4 (11 Dec 2011) diff --git a/kde-base/smokegen/files/smokegen-4.7.4-akonadicrash.patch b/kde-base/smokegen/files/smokegen-4.7.4-akonadicrash.patch new file mode 100644 index 000000000000..8d4300b00dee --- /dev/null +++ b/kde-base/smokegen/files/smokegen-4.7.4-akonadicrash.patch @@ -0,0 +1,21 @@ +commit 50f01c2d6b28110f8517a77960e456c1125bdb6e +Author: Arno Rehn <arno@arnorehn.de> +Date: Sat Dec 3 17:57:43 2011 +0100 + + fix a crash when generating the akonadi bindings + + BUG: 283677 + +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); diff --git a/kde-base/smokegen/smokegen-4.7.4.ebuild b/kde-base/smokegen/smokegen-4.7.4-r1.ebuild index 4e7a89ff6a2b..9ca527352714 100644 --- a/kde-base/smokegen/smokegen-4.7.4.ebuild +++ b/kde-base/smokegen/smokegen-4.7.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/smokegen-4.7.4.ebuild,v 1.1 2011/12/11 18:52:13 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/smokegen/smokegen-4.7.4-r1.ebuild,v 1.1 2011/12/12 23:57:13 dilfridge Exp $ EAPI=4 @@ -18,3 +18,5 @@ DEPEND=" RDEPEND="${DEPEND}" add_blocker smoke + +PATCHES=( "${FILESDIR}/${P}-akonadicrash.patch" ) |