[gentoo-commits] proj/kde:master commit in: kde-base/smokegen/files/, kde-base/smokegen/

[Andreas Hüttel]

commit:     41308e6bd1fcdf2643cb676c108c2f9e5e543112
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Jun 10 20:49:35 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 20:49:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=41308e6b

[kde-base/smokegen] Fix bug leading to smokekde build failure

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 .../smokegen/files/smokegen-4.8.90-qflags.patch    |   29 ++++++++++++++++++++
 kde-base/smokegen/smokegen-4.8.90.ebuild           |    2 +
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/kde-base/smokegen/files/smokegen-4.8.90-qflags.patch b/kde-base/smokegen/files/smokegen-4.8.90-qflags.patch
new file mode 100644
index 0000000..889de6a
--- /dev/null
+++ b/kde-base/smokegen/files/smokegen-4.8.90-qflags.patch
@@ -0,0 +1,29 @@
+From 7b67ac626f27e1d405ab92a2d2a8bb91ffa98c2d Mon Sep 17 00:00:00 2001
+From: Arno Rehn <arno@××××××××.de>
+Date: Sun, 10 Jun 2012 22:27:42 +0200
+Subject: [PATCH] QFlags references are valid unless they are return types of
+ field accessors.
+
+Fixes compilation of smokekde.
+
+CCMAIL: kde-bindings@×××.org
+---
+ generators/smoke/helpers.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/smoke/helpers.cpp b/generators/smoke/helpers.cpp
+index b15791d..4fb2c98 100644
+--- a/generators/smoke/helpers.cpp
++++ b/generators/smoke/helpers.cpp
+@@ -609,7 +609,7 @@ void Util::addAccessorMethods(const Field& field, QSet<Type*> *usedTypes)
+ {
+     Class* klass = field.getClass();
+     Type* type = field.type();
+-    if (type->getClass() && type->pointerDepth() == 0) {
++    if (type->getClass() && type->pointerDepth() == 0 && !(ParserOptions::qtMode && type->getClass()->name() == "QFlags")) {
+         Type newType = *type;
+         newType.setIsRef(true);
+         type = Type::registerType(newType);
+-- 
+1.7.9.2
+

diff --git a/kde-base/smokegen/smokegen-4.8.90.ebuild b/kde-base/smokegen/smokegen-4.8.90.ebuild
index 5e619f9..baa18ca 100644
--- a/kde-base/smokegen/smokegen-4.8.90.ebuild
+++ b/kde-base/smokegen/smokegen-4.8.90.ebuild
@@ -18,3 +18,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 add_blocker smoke
+
+PATCHES=( "${FILESDIR}/${P}-qflags.patch" )