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 1RusJY-0007Oh-39 for garchives@archives.gentoo.org; Tue, 07 Feb 2012 21:11:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE1BBE07E1; Tue, 7 Feb 2012 21:10:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AD994E07D5 for ; Tue, 7 Feb 2012 21:10:52 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E22EF1B400C for ; Tue, 7 Feb 2012 21:10:51 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2276) id B81A82004C; Tue, 7 Feb 2012 21:10:50 +0000 (UTC) From: "Andreas HAttel (dilfridge)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dilfridge@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/koffice-libs/files: koffice-libs-2.3.3-qt48.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: koffice-libs-2.3.3-qt48.patch X-VCS-Directories: app-office/koffice-libs/files X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas HAttel Content-Type: text/plain; charset=utf8 Message-Id: <20120207211050.B81A82004C@flycatcher.gentoo.org> Date: Tue, 7 Feb 2012 21:10:50 +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: c0f09987-2d91-4ab1-a17e-e5b16f8cdd42 X-Archives-Hash: c703dbb22f13f778a2f67af6724577d4 dilfridge 12/02/07 21:10:50 Added: koffice-libs-2.3.3-qt48.patch Log: Add patch to fix build with Qt 4.8, bug 399291. Backport from Calligra. =20 (Portage version: 2.1.10.44/cvs/Linux x86_64) Revision Changes Path 1.1 app-office/koffice-libs/files/koffice-libs-2.3.3-qt4= 8.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/koffice= -libs/files/koffice-libs-2.3.3-qt48.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/koffice= -libs/files/koffice-libs-2.3.3-qt48.patch?rev=3D1.1&content-type=3Dtext/p= lain Index: koffice-libs-2.3.3-qt48.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From accabfeac22e869e5a248a764a64096d107e4c7c Mon Sep 17 00:00:00 2001 From: Michael Jansen Date: Mon, 11 Jul 2011 00:27:38 +0200 Subject: [PATCH] Fix build with QT 4.8. KDChartBackgroundAttributes.cpp:153:26: error: ambiguous overload for 'op= erator<<' in '((QDebug*)((QDebug*)operator<<(QDebug, const QBrush&)(((con= st QBrush&)((const QBrush*)(& KDChart::BackgroundAttributes::brush() cons= t())))).QDebug::operator<<(((const char*)"pixmapmode=3D")))->QDebug::oper= ator<<(((int)((const KDChart::BackgroundAttributes*)ba)->KDChart::Backgro= undAttributes::pixmapMode())))->QDebug::operator<<(((const char*)"pixmap=3D= ")) << KDChart::BackgroundAttributes::pixmap() const()' It does not know if it should convert QPixmap to QVariant or QBrush befor= e dumping it into qDebug(). It happens because with qt4.8 qvariant is included implictely w= ith klocale.h over qlocale.h. Which was not the case before qt4.8. Related: QTBUG-19764: Please add QDebug operator for QPixmap --- .../kdchart/src/KDChartBackgroundAttributes.cpp | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.c= pp b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp index 2dc4974..9f2990a 100644 --- a/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp +++ b/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp @@ -22,6 +22,9 @@ =20 #include "KDChartBackgroundAttributes.h" #include +#if !defined(QT_NO_DEBUG_STREAM) +#include +#endif =20 #include =20 @@ -150,7 +153,7 @@ QDebug operator<<(QDebug dbg, const KDChart::Backgrou= ndAttributes& ba) << "visible=3D"<