Backport fix from upstream to fix build with GCC 4.7, wrt bug #425366.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 42 insertions, 5 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 7464aa203785..fd869ad39954 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kmymoney
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.34 2012/05/15 22:34:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.35 2012/07/09 17:14:35 kensington Exp $
+
+  09 Jul 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kmymoney-4.6.2-gcc-4.7.patch, kmymoney-4.6.2-r2.ebuild:
+  Backport fix from upstream to fix build with GCC 4.7, wrt bug #425366.
 
 *kmymoney-4.6.2-r2 (15 May 2012)
 
@@ -160,4 +164,3 @@
   08 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   +kmymoney-3.95.0.ebuild:
   Initial commit wrt #294010, thanks to Elias Probst, Soren Harward, Matija Suklje and others.
-
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 2d9d217cf761..0524a5423835 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kmymoney-4.6.1-qt48.patch 961 SHA256 5fde218c7d0b62702e4d5bcac299472d3e6bff155e04680ef4923a4f42ec539d SHA512 92dcda1b87311d9db4a4f3e30593af70779fa84f59ca15a11eecd2e24f8a8554c0b30c562da78d77c273781c0a7bdfd9aaaa3389716728bb1df8ec521dcd178a WHIRLPOOL a42227cd328cdfc3d632fc2bce5c10d3fd171f045868fa8c2ad469f4a70c1764b05c4d3299e486627dc187b558d60fe55ae9a8e12c2ea71649c7eff84efa0dbd
 AUX kmymoney-4.6.2-fix-parallel-build.patch 887 SHA256 49e56dc703ac314b83883ca09694858fc36030bf92d729a1189ea73adad25264 SHA512 28fa7453c99f1ad213c28774ba16a78c2e03cc5bd7682161b201f8c59e29f6905a327db6ff5e4c211cbdb37da8b25d2b86cee491c37a4aa2af6d91b90bd59519 WHIRLPOOL b52b5fe7de897eba3f4bf3b0a4e2c8fe78e14ce87b75ec38cbe416af6e6a8d017be157f8fcc68d3463e79c71bc3b9c9d7f8507e90b40bb2f40692c7adcb31d5c
+AUX kmymoney-4.6.2-gcc-4.7.patch 561 SHA256 652cd8ada83f9fdbce1809a27ac2b8bcfc4cd3807bcdf2137662b09527b9f780 SHA512 efdde69168abbb42adf041b5c9afa7ee217bdc73692532e57004e4ca4e427f59ab7dcdc9051515fb99c861e672b3b1e4ff7c6d1e707ce64d837b5dcff511f261 WHIRLPOOL b28ef04d51a2cac0086efc203bb1c056b297a695b51ba7d1128c26e70baf88fbf283b3bf0ceff71b920db52202e53f9b6ba9519ad43da80e7fe382c353e54b0f
 AUX kmymoney-4.6.2-sqlite-crash.patch 764 SHA256 0ddd5a7f49f63f0835f8a721a271044ecf78899c88a6fbb39a314d56ee740d35 SHA512 e4ef8e8c3121146b87f37cd2b1b2699c9141af315a2474734c28d11fdebbdadc135315f2bdcb703a1a53d1bc9e57ef4fa038593d34c81a827d497a3448c9b7a0 WHIRLPOOL c60e52614472e8bfc3cff58e8bd7fd8d58465657dcc6de81bec52e57ffba02ef36384e2ecea4bbb0c464c47a4a81e168e540563f5ef41081fcf1d35d59ad5230
 DIST kmymoney-4.6.2.tar.bz2 22762330 SHA256 add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75 SHA512 004d3f09c18a860e1ee24f5c9074587ebf2f4bedcb8fd4bf990c43d3bf3c6664ba2b6d00f465793256576009a39df42ae98a048d1996d4ac350fc48fd67dbce3 WHIRLPOOL eed36c3855c42fe17b5b0ed9ccbb48541aba1f42eac97d9beb7f3074ebcc61b32a9d3197db905d6f7f7ab373a8da81a939ac09391e1a91de23c11b6e52757682
 EBUILD kmymoney-4.6.2-r1.ebuild 1949 SHA256 98f6aa0792eeba0eb5b5392956b6c861e26078ec67c2c2f5e9a524b8c88c1d06 SHA512 d1d089f2889c07d826fefc6603246b711198cf485cfc39e9394e87e9b50357ae61c85f9f415ff1aedeb12a1017a48787fa896a13d72580ef1083ea886308e9de WHIRLPOOL fcbbd197e0991e0ed36e45eb4a47f04bb3badf41affeae18181d3ff464f734162b868faac9b3df701c3a1e609169ee7ac2799cd44382634da31cbaad8093d7c3
-EBUILD kmymoney-4.6.2-r2.ebuild 1988 SHA256 02200e96860101a217d663591bf9a701356682aa6f543b73369ca5bc3ca67909 SHA512 b591f828708ede19c91166b7624f3ba7fbbbf63f39db27d97f6df896c2777fe8c244504db0aef05c558b5c1df493ee533b9255ec1edb4950e048e2f0db847eca WHIRLPOOL 5c21fa0b84b001b72ef95ef89b4d29fef558a41698b61afa27410c565ada50d25fe605b7d2b8756afe21972c43f70c7aebf47019409afe17cf958b8b6370f519
+EBUILD kmymoney-4.6.2-r2.ebuild 2028 SHA256 8c40974a8b03c1989618a691972e0ca9dabd74ef37eaaa2d6f9b394d1cb7da79 SHA512 2ff8c88cfeb5696e688fcf8aaaafeb7aaec1af64d9d7c3a173bc566686da785ba6b70c9dee8b4304aeaabcd9174598f985d9aad0480e97e8ebdf6fff41c3cc02 WHIRLPOOL 037232d7b49134ff181b47ceb30223189fc185d4404217f29d0213063fb8b462920e89f300ac20865d5a331bf42db794a7042d10e02740b7d7fabedade176282
 EBUILD kmymoney-4.6.2.ebuild 1945 SHA256 a0b0d705df2d6d17844c794056bf1bed0d087327c983622b7ad446dd1280b1dc SHA512 dac40de16a738dcaadfcf57b9f4e5c703bcad8f06a4b6df2195c5f2d06621504e830a67768ca4252f048622fe275ceab088be488f1c7f50c5b3421e92a9339f2 WHIRLPOOL 53a5934df01e5dc68bb30f61a6b5c400e0c2f5719e3ef1548ac5580937485f0db4c36ac920a1b1fcc0790c19fadcf8160a7f3368ac954f468633a0b7daf99c5f
-MISC ChangeLog 5215 SHA256 ad286b1789931ed929120c31fe91ab57856a7a6475ab10553317c3fd87d1d3df SHA512 88a052b5a336a7f851aaafc6fa443e7311adfddc6f86791ae6a51423bf186f2e7b7d374807933a4d151af8db5efb2ae56e14e6159ea5aba65beeaafdc9efd989 WHIRLPOOL 13ea8205a6f4a95421caf64344488bc498b2c75ac20d0de0ebd0406587799cc7cbb4946e1563cd2d08fba8361cff3e7fb29de4662d66a839e5a2ee0dddeb6c6c
+MISC ChangeLog 5415 SHA256 acda3d574c5ad95d4500f5b64c92296324bd742360e10cece95b6bf7d443fb9a SHA512 36f70cd1c72359765b046b6fafa5a13c86f882cc1fe5745ede78740d9d36c108d68a94ebf811ebdf05021408c6ed31a572716cc4d92b943e40c898142a5ffdc7 WHIRLPOOL 70ca8d7da40e9677a2746ef8e4554add651e62201f369e7b0579312f609b286577b2aa746756606728716a94abe02ac62eefe77922b6073be217d7b29f17ee38
 MISC metadata.xml 327 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f SHA512 351c6dfb599393ce68da6cf8cee124a2074389e2419db77206e92a4cb5e37168d5c71bacc06024cc621b06456a5550306df29c40381538962b08a2a2b3f2a3d0 WHIRLPOOL f9f7364383513c4fff4875967aeeef0fb67cd472b3b6f04d19e9f6ba528bf4838389e8f24fc93a320b984d5040a6e21f7b7cedc50559f9033cb7c714e643b342
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP+xF6AAoJEMbwO6tnXQ0smYoIAJZsu+Xp9aTcpNgBa4GhAG3T
+gnEyLGDrj9aBrWxS8dlmmvqjaEpmYIN7/cFLumqzt4JK+X1FBuvFVfobP3UpqrkD
+S63MCX3aznGbYz6IpVht1l/5SYuHAWRjeMLu3RjFzMNfD7cWeIGJuXma04Whl4rw
+NPIySe1VwI4mve30z5oBCQs6dsZwlwHJSxZ+ivqe9Ps9OX0Ywa15hV7dUz6mTcXP
+5EvMrAs8A+XOLMez3SAQv2djy4ltMdHZC3pMoLPj9+D5pH7SgYIT+ehNddqcdWBS
+27MHv+jfNzA9b3WALtb3S5Q5JvLcUZKmPbIM4f7YtRBmyJNEVcZO2WJRY/5TRE8=
+=r3CQ
+-----END PGP SIGNATURE-----
diff --git a/app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch b/app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch
new file mode 100644
index 000000000000..69f492468244
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch
@@ -0,0 +1,18 @@
+commit 9b6f96a38b8c84cb87bb07165b503acbe5ea81ff
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Fri Mar 23 23:05:19 2012 +0100
+
+    Fix includes
+
+diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
+index ff217e3..d31bb02 100644
+--- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
++++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "mymoneydatabasemgrtest.h"
+ #include <pwd.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ #include <QtTest/QtTest>
diff --git a/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild b/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild
index 56dfa327eaf6..77d06b56d71b 100644
--- a/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r2.ebuild,v 1.1 2012/05/15 22:34:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.2-r2.ebuild,v 1.2 2012/07/09 17:14:35 kensington Exp $
 
 EAPI=4
 
@@ -56,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-4.6.1-qt48.patch"
 	"${FILESDIR}/${P}-fix-parallel-build.patch"
+	"${FILESDIR}/${P}-gcc-4.7.patch"
 	"${FILESDIR}/${P}-sqlite-crash.patch"
 )