From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Sdp4i-0004rx-D9 for garchives@archives.gentoo.org; Sun, 10 Jun 2012 20:49:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1539E0102; Sun, 10 Jun 2012 20:49:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 84049E0102 for ; Sun, 10 Jun 2012 20:49:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E24281B4043 for ; Sun, 10 Jun 2012 20:48:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A744CE542E for ; Sun, 10 Jun 2012 20:48:58 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1339361375.41308e6bd1fcdf2643cb676c108c2f9e5e543112.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/smokegen/files/, kde-base/smokegen/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/smokegen/files/smokegen-4.8.90-qflags.patch kde-base/smokegen/smokegen-4.8.90.ebuild X-VCS-Directories: kde-base/smokegen/files/ kde-base/smokegen/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 41308e6bd1fcdf2643cb676c108c2f9e5e543112 X-VCS-Branch: master Date: Sun, 10 Jun 2012 20:48:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c1190675-4c74-479a-97ce-987a8679b3e9 X-Archives-Hash: ae2268b709c5d0daa1ba8e268d29f5d0 commit: 41308e6bd1fcdf2643cb676c108c2f9e5e543112 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Jun 10 20:49:35 2012 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Jun 10 20:49:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D41308e6b [kde-base/smokegen] Fix bug leading to smokekde build failure (Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest comm= it) --- .../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-b= ase/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 +Date: Sun, 10 Jun 2012 22:27:42 +0200 +Subject: [PATCH] QFlags references are valid unless they are return type= s of + field accessors. + +Fixes compilation of smokekde. + +CCMAIL: kde-bindings@kde.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, QS= et *usedTypes) + { + Class* klass =3D field.getClass(); + Type* type =3D field.type(); +- if (type->getClass() && type->pointerDepth() =3D=3D 0) { ++ if (type->getClass() && type->pointerDepth() =3D=3D 0 && !(ParserOp= tions::qtMode && type->getClass()->name() =3D=3D "QFlags")) { + Type newType =3D *type; + newType.setIsRef(true); + type =3D Type::registerType(newType); +--=20 +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=3D" RDEPEND=3D"${DEPEND}" =20 add_blocker smoke + +PATCHES=3D( "${FILESDIR}/${P}-qflags.patch" )