Fix crash when building akonadi bindings, bug 392925

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 50 insertions, 19 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/Manifest b/kde-base/smokegen/Manifest
index 84d1e6205408..a623baf6e805 100644
--- a/kde-base/smokegen/Manifest
+++ b/kde-base/smokegen/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX smokegen-4.7.4-akonadicrash.patch 784 RMD160 8675f4ae131676e555662bc5d84bcb54f761a11f SHA1 6ac84a8923b5a9f8b2d23384ebe9ad0ccad914d3 SHA256 afc15501d7d7706cfc716ed6eabd4e03c7e44a4e43ef5e080565b012d976886a
 DIST smokegen-4.7.3.tar.bz2 149081 RMD160 cb6b1a3a654c242da74e5d4a02f60b26a5b13cd7 SHA1 ede4095fdb190b3bef13b246111e7d79903ad77e SHA256 2562497763b913d8d03c7dbad02bf0bc8b6ecd140e7954230984ac2d3b6a4853
 DIST smokegen-4.7.4.tar.bz2 149125 RMD160 c6b5c5627e684c65c78eb2966972164473f49f33 SHA1 068d37e2404311b9caa23d78ee7fa262188a8622 SHA256 281e5022026d4f59eb5060425b6e14d61e40c37d369cfbeb03888e10b4eeaa65
 EBUILD smokegen-4.7.3.ebuild 468 RMD160 526c071b3be4242de26c559dea5e6965e1801c87 SHA1 dc516cc74c3b272f272c5c4130e5577cdc81d02a SHA256 da50bfa6c4738b648a809252581a2d89c04674b133c390becd5aa18a2793ebca
-EBUILD smokegen-4.7.4.ebuild 468 RMD160 82d9488b30fcce9186570e4bf32a4b3fc3015702 SHA1 77f8e09d453ed7533e99a0ac32d649c27e3d14d8 SHA256 5edfac73942900cf14d26cafda2e389167cd779b315ac8b8e8387864bea90041
-MISC ChangeLog 1439 RMD160 cc55d03726441e8bd88df97630ff2a58c92fa38d SHA1 a7f4251c0a7b0f330032580da32b26043a65f81a SHA256 a83b96424ac4cdf7cc8323b8d70dc2eccc25f759a3d2c8d5dabb0b417651d205
+EBUILD smokegen-4.7.4-r1.ebuild 525 RMD160 808bab2053932b5bf5292c0a3aaae041a0fcb3f7 SHA1 08abeacb3624f79e28f300dbc3b35d552e418a4f SHA256 1178687f0c656049a5494e10c1f0229744a6f8b357101905443ffd3e968657a9
+MISC ChangeLog 1686 RMD160 fadabacd4452f95f70fad99a454b22754e4b69f0 SHA1 f1fc74ac00ada4e13cd9fd7dc115dc4cf9adf6e6 SHA256 06cbad2ce0ebd5f64c39cc46ac6c5abb01483e0c7b3d22855a11389f798e5e92
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO5PzyAAoJEOf+E+/4L5Lm3XwP/2+gJUygNJ2Gm8Ri5t3d1yyy
-N68rF1o+tV8T3P22XJJMkCbVVWH+hgRskX+NBrBIgpB7dCxteCtIX1q7NjjLHFAT
-6QqrcDEnbY2HYzXEWxJrAkRNSlScH2qbZYQdOkhTy0zTShMNJxZR2CnQIu4DGVLT
-tqy/USteesU1+DGdbXARcrkDyEqyDtR3/4GVZWjqnDzA9/Y7YssK7qcDaDWmj8Tr
-cYd4cJ9uN6zIAibrdMTtgkadCIfHWq0jYbp2GZ1zYcQW1Stlun1WPhDo31lKd/mb
-ZHchMVgDY2C1dAwXuFNlIffcYIcBhkSq67uqht6EdeuzBgdBAAY1E0xpgVXj270L
-Lw7w2VDhJShg36Ddyy79qU32oVJ1oANtQkGekNlKR0xgSvkBiJERzNGeKcPBYjCb
-2SWZfcNnASVpCHg06ufWz45QrIZEmi+Ql9FoYiepWJMOjiEKloy0bY/oWV99pH4l
-WKs5HhWpIEGTncUbu23oULQViJVm16xALaEkTF8wiA6CErD5cdPOuVly8kRuhCWg
-I19pMa5mHSyBgER/CdtgaoCfQ3rwx3SjFc0adZlkEbSKsEjeiG2VEPvNKSbK22wV
-gYdUOvT141S2dxSHzlNbpctbhWRACY/e1DjeBF3nts9+Ub2d6EyydVbep6iysZi/
-aUAeZoenGdL5nkjBiSMY
-=8bgJ
+iQIcBAEBCgAGBQJO5pTkAAoJENwGBM22xffeGsoQAJlLf5wX8XnCyiL8IsltShkk
+G+OvG57QU3DfWVFa1qTNEXnUZNO8YHZm+ngJciyZLlQK4j+dJyG4YrtwSDrigRe9
+crFdfm4/8Pu4Trei0SLlbhhzfcktZI++LiaQgIu3JPsia+e/qE/c4uHLAkoivpOo
+fV35iIR0XB+pajMAeBpo6hKleTE7XzYE6qTv7qYUY6D1UOwK2rg+n55E2syEIlmJ
+gldfBwc4lAZF+TRnHu0E8bZuNIU85oouIIK/69acUnxJkqy1WY6pCnCZ0runhccq
+ChJ3cioue5F69Q4JfIJwDc4EYbVdtqeTeARQQg/yJoxM696Rg6YN1w6VVQi0d4HH
+B+rgWi9trPGVwnH93N8eHEYjp/wXpyqGXsR1SPWQ6qZfavPgvVVoOVtuFCGspMxN
+WDgEAHB8fBvEWVU1bSG7uFwsyeIoVD1yLkE1U5NX7rXtFJS48z6P5puYsU85h2MN
+E2g3xfGMpdWBBCrfR4DT3stBIsyx9RsPTGw/6J2U+/MrC5ZjtQvVFNHbTiVIswp8
+EM4FcUeZ2dPd+93PlbYKar49Ir27bHEnDgdqA+hFUjzV8jR8b0SzFD/fQbgS/bE0
+Z9JVP/2mCcTWuWgehAHNdaAdP8Lpq8ic0gUuEj3H2GDQdB3Q1aLNGG44cKV1I4Nv
+z9r2Z4x/JEeh5VrJJ8do
+=i24/
 -----END PGP SIGNATURE-----
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" )