diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-07-09 17:14:35 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-07-09 17:14:35 +0000 |
| commit | d5a6fecc13992f1d9f3a46affdd668b76454967f (patch) | |
| tree | ec2c45ea5590aca06c842d088888e29e7c477d6b /app-office/kmymoney | |
| parent | keyword amd64-linux and x86-linux (diff) | |
| download | gentoo-2-d5a6fecc13992f1d9f3a46affdd668b76454967f.tar.gz gentoo-2-d5a6fecc13992f1d9f3a46affdd668b76454967f.tar.bz2 gentoo-2-d5a6fecc13992f1d9f3a46affdd668b76454967f.zip | |
Backport fix from upstream to fix build with GCC 4.7, wrt bug #425366.
(Portage version: 2.1.11.5/cvs/Linux x86_64)
Diffstat (limited to 'app-office/kmymoney')
| -rw-r--r-- | app-office/kmymoney/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/kmymoney/files/kmymoney-4.6.2-gcc-4.7.patch | 18 | ||||
| -rw-r--r-- | app-office/kmymoney/kmymoney-4.6.2-r2.ebuild | 3 |
3 files changed, 25 insertions, 3 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/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" ) |