diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-02-13 18:46:07 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-02-13 18:46:07 +0000 |
| commit | 83e0b1c47db0c242f6f2596549070aa4e1b8d0ee (patch) | |
| tree | a877671716ab41ecddd7791df9ffec6cb9d8af4d /app-office | |
| parent | ppc64 stable wrt #392629 (diff) | |
| download | gentoo-2-83e0b1c47db0c242f6f2596549070aa4e1b8d0ee.tar.gz gentoo-2-83e0b1c47db0c242f6f2596549070aa4e1b8d0ee.tar.bz2 gentoo-2-83e0b1c47db0c242f6f2596549070aa4e1b8d0ee.zip | |
Add upstream patch to build with Qt 4.8 wrt bug #402949.
(Portage version: 2.2.0_alpha86/cvs/Linux i686)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/kmymoney/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch | 30 | ||||
| -rw-r--r-- | app-office/kmymoney/kmymoney-4.6.1.ebuild | 8 |
3 files changed, 42 insertions, 4 deletions
diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog index 0281189774d1..6414ae31e476 100644 --- a/app-office/kmymoney/ChangeLog +++ b/app-office/kmymoney/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/kmymoney -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.23 2011/11/08 19:27:40 dilfridge Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.24 2012/02/13 18:46:07 johu Exp $ + + 13 Feb 2012; Johannes Huber <johu@gentoo.org> + +files/kmymoney-4.6.1-qt48.patch, kmymoney-4.6.1.ebuild: + Add upstream patch to build with Qt 4.8 wrt bug #402949. *kmymoney-4.6.1 (08 Nov 2011) diff --git a/app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch b/app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch new file mode 100644 index 000000000000..eb4b83552135 --- /dev/null +++ b/app-office/kmymoney/files/kmymoney-4.6.1-qt48.patch @@ -0,0 +1,30 @@ +commit 8324cfb9657d8c03f83691402386e8c5bfb29981 +Author: Christoph Feck <christoph@maxiom.de> +Date: Thu Nov 10 12:34:20 2011 +0100 + + Fix compile with Qt 4.8 + + Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and + fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer + +diff --git a/libkdchart/src/KDChartBackgroundAttributes.cpp b/libkdchart/src/KDChartBackgroundAttributes.cpp +index f9f1520..3b86000 100644 +--- a/libkdchart/src/KDChartBackgroundAttributes.cpp ++++ b/libkdchart/src/KDChartBackgroundAttributes.cpp +@@ -22,6 +22,7 @@ + + #include "KDChartBackgroundAttributes.h" + #include <QPixmap> ++#include <QVariant> + + #include <KDABLibFakes> + +@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDChart::BackgroundAttributes& ba) + << "visible="<<ba.isVisible() + << "brush="<<ba.brush() + << "pixmapmode="<<ba.pixmapMode() +- << "pixmap="<<ba.pixmap() ++ << "pixmap="<<QVariant(ba.pixmap()) + << ")"; + return dbg; + } diff --git a/app-office/kmymoney/kmymoney-4.6.1.ebuild b/app-office/kmymoney/kmymoney-4.6.1.ebuild index bf318383c884..fcbc44cd46e7 100644 --- a/app-office/kmymoney/kmymoney-4.6.1.ebuild +++ b/app-office/kmymoney/kmymoney-4.6.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.1.ebuild,v 1.1 2011/11/08 19:27:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.1.ebuild,v 1.2 2012/02/13 18:46:07 johu Exp $ EAPI=4 @@ -53,6 +53,10 @@ DEPEND="${COMMON_DEPEND} test? ( dev-util/cppunit ) " +PATCHES=( + "${FILESDIR}/${PN}-4.6.1-qt48.patch" +) + src_configure() { mycmakeargs=( -DUSE_QT_DESIGNER=OFF |