Add upstream patch to build with Qt 4.8 wrt bug #402949.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux i686

4 files changed, 53 insertions, 20 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/Manifest b/app-office/kmymoney/Manifest
index fb703cb0c6e8..82cdd83ed275 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -3,28 +3,23 @@ Hash: SHA512
 
 AUX kmymoney-4.5.3-underlinking.patch 960 RMD160 fc4f54a5d5094668e6c37553661a12523f9ec79d SHA1 385fb9bd22625ddeb7b2545fe4e92d29b8ba42e5 SHA256 33d04cd3fc549871264ee02e9532e0afe07e2e9223008feac6c57e87d4bf6849
 AUX kmymoney-4.6.0-gnucash.patch 916 RMD160 0ea0f923930c90727369730c76c8474a3e415b83 SHA1 25a854e8b1c9da7164364d81dbaec009ce2cebd7 SHA256 2882c9eacae40031022e8488a410a39be739240d0351e0b5aa768577ba9ba045
+AUX kmymoney-4.6.1-qt48.patch 961 RMD160 8a44caa45c864687339a9f1d008e52d39bbc6a65 SHA1 b29a7cfbf4398e91bd4401a71a678d7ceb1f0cba SHA256 5fde218c7d0b62702e4d5bcac299472d3e6bff155e04680ef4923a4f42ec539d
 DIST kmymoney-4.5.3.tar.bz2 14937401 RMD160 896e2efcfe7ec400327f74d40b9393eaf38cbce5 SHA1 3333d19d2c84eae45b1be3aeb3d90780f2beb9e1 SHA256 a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb
 DIST kmymoney-4.6.0.tar.bz2 20914001 RMD160 e71d10a768ed19c4a4f264d70600f683f997565e SHA1 b3f250e82e67166bd7425a4343e744f1f2a6f743 SHA256 8f034a92682cc61dfa76c2593893524d00658c49360b17ddc67671e32ec7edf8
 DIST kmymoney-4.6.1.tar.bz2 22758086 RMD160 d49885bf04849b8a4db901a1c099b39006ee2b95 SHA1 dc1e80b256795df819c6167c22dc90ffcad741db SHA256 5fcab9c4f1b5868aabb816a87c61cb025e69a191f6cb218cce3f29f0c1c1b77a
 EBUILD kmymoney-4.5.3.ebuild 1789 RMD160 c031816a32d50e03694c8ea57f2e2df4020450b5 SHA1 48fdc7e30572f47d41652fa31027723fb0278a87 SHA256 3a2a194601332f3af474305d9694f0546b9a4dfe771e9bc918d0078d388f4a67
 EBUILD kmymoney-4.6.0-r1.ebuild 1926 RMD160 a762148984097bed5caa924f1d297492f7fdeb8d SHA1 fdd2191929c70008c0437fe117f2413fea3dd3d3 SHA256 0752ffa0ff41d34b7f7494e99dc2080245b4cd8d78c0945d281b6a8406dc5682
-EBUILD kmymoney-4.6.1.ebuild 1827 RMD160 eceb3ae816066d47ced0e071d6013f7ed2bbdf5c SHA1 781fed7c5fd6efb037aa0c2ccb8cf16f82804c05 SHA256 3539492fbe543583f5e8e73550d1f2a07b54aa15af8729bffdd30af3c64a6195
-MISC ChangeLog 3521 RMD160 7fbdf9e541c99f71514aba2d98796ed3f52b2081 SHA1 c54d68b7c06d397013570f736fb94ffae1494f51 SHA256 cd576ec6306435d8eabf0605798b0f262f8c029271de8ab78eeebe950db2a78a
+EBUILD kmymoney-4.6.1.ebuild 1873 RMD160 1c758d931f3027ca9c55060cf60928fc41f7473b SHA1 819f0725e311141621fcfa55a066b78a6bfe41b8 SHA256 a061461c4eaba37c5160cc45f750ca2dd7f1653d605590ca49f782e24974968d
+MISC ChangeLog 3683 RMD160 7c5dec6281130f04874feb87b35a1a266334b8c9 SHA1 851fefc47b2dd028af78d23d9412044ec31f0e03 SHA256 d452ca6af313c17a223fb61dc296e3ee240a71d2723d10ff7c2254c13f5ff34a
 MISC metadata.xml 327 RMD160 337c462e38007a529ca6c979b341426898a9af04 SHA1 62bfe203a842760f95655a42acdd1da8f4436637 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOuYMJAAoJEEb+UGWnxTyHI00P/25JclvgqDD/KENRrh+2O7Ah
-SoOGm5RnDAbmpzueOnr60k/xS2OoSq/2WEvbu0YiLw7udJIIYI6uBWJfO7eSTm+/
-GSpGSPUcziRB6WCs/AlAMI9PgXLulKolUOSWHViJnm9bKG/mLOqVWTXj4oXzX1g5
-Gvstk/WnoenRGRZrq+PHvI7aTn8S5pi3nPT/WU4sGF/YTnymDl4Iw+r2XtvhS43p
-qb1CMPdHfzZGJgfygnJ73VVKqxCWWz6Azor6d9y15dhOm+0UR6HPU1mLz/xeow7X
-NvY8iG1vFfo9xPJs5jNBrcRaarsUggoEunMoQ5INrdxPh4oxKdidtWEvOzln2bcE
-RklLYscci211Kg/wsF7QdHGHYKcxzDSkn45zL5jmqK0mS2FYBQdIaPbrBIqf47mr
-OBt/r7nsFgYQGNPBNffnoE5XbftFd3RXBDpbIzmROWFbIIwDgknQNR9D0uKw47HH
-xjOyCoBGD08xp06SwqoXYc+8m38J81u64IZuRF/xx4PSUq641hWhdV5kd3MEwTUp
-XGm+slAbzkSmx/9qsJVwqSZmA/wYE/SJ3baKp5VP14mK1urNkiLuVHdpzSQ5dOlQ
-d0/PbnLwKiGQnXVz131Syqv/kDVNwmNL+ns+yLkB4rnq2CZ+fyREiITCWaNPL6ey
-b9NuYX4wBlP+am328YA6
-=eXAp
+iQEcBAEBCgAGBQJPOVuCAAoJEO+t9ga+3I3aMTEIAKg1FnDyfgKnsOAqtcuqk3iP
+Jh9NqIrM8c8vZzkiou1N9ErBummhb22BGNhlQGlm7TVSIx+IksUU6J4CCKcv+sc2
+fV9N5bfZBae6ZWT1lXZ0gczdxno/gtSS1gNhmdNiPCqeW/ghRcySHLY6ShkvkMES
+amX8sPpjJVCBNIqoUU1mBLh69qe0QbDpMgM6ffOR5bUkVZO0tRSJVrHc2cl3x/j/
+vsM7M70LmMwz4KPaGzh9tjFDx/tVC37FQg5D1DZG4dg+k5DtD8duoAAbciGzr5/B
+LjqF2qKYFj7shs2d7ZziVi1b1K1FKC0Ojh48QlqqDob/YT6wrkgeGlbXSQkZF5c=
+=Aee3
 -----END PGP SIGNATURE-----
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