diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-25 21:23:22 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-25 21:23:22 +0000 |
| commit | ce80e4092aea2ad5b0fcce2513f9b4971e208c94 (patch) | |
| tree | 2e49c8cc4d12ce2e30efed76ad1f1b1141dcd217 /kde-base | |
| parent | Introduce kmod module tools wrt bug #395863 and as a dep of udev. (diff) | |
| download | gentoo-2-ce80e4092aea2ad5b0fcce2513f9b4971e208c94.tar.gz gentoo-2-ce80e4092aea2ad5b0fcce2513f9b4971e208c94.tar.bz2 gentoo-2-ce80e4092aea2ad5b0fcce2513f9b4971e208c94.zip | |
Backport compilation fix for gcc-4.4, see bug 394531.
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
3 files changed, 33 insertions, 2 deletions
diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog index 6598d6200b44..3cfeff971e15 100644 --- a/kde-base/kdepim-common-libs/ChangeLog +++ b/kde-base/kdepim-common-libs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdepim-common-libs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.17 2011/12/11 18:52:19 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.18 2011/12/25 21:23:22 dilfridge Exp $ + + 25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kdepim-common-libs-4.7.4.ebuild, + +files/kdepim-common-libs-4.7.4-namespace.patch: + Backport compilation fix for gcc-4.4, see bug 394531. *kdepim-common-libs-4.7.4 (11 Dec 2011) diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.7.4-namespace.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.7.4-namespace.patch new file mode 100644 index 000000000000..c983c0689c0f --- /dev/null +++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.7.4-namespace.patch @@ -0,0 +1,24 @@ +From 02544849c1ba657cca59908960a75e0f65b87aea Mon Sep 17 00:00:00 2001 +From: Volker Krause <vkrause@kde.org> +Date: Sat, 5 Nov 2011 13:04:33 +0100 +Subject: [PATCH] Attempt to fix name clash between KMime::Message and namespace Message. + +--- + messagecomposer/akonadisender.cpp | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/messagecomposer/akonadisender.cpp b/messagecomposer/akonadisender.cpp +index c7b5e03..e9a4b7c 100644 +--- a/messagecomposer/akonadisender.cpp ++++ b/messagecomposer/akonadisender.cpp +@@ -38,7 +38,6 @@ + #include <messagecore/stringutil.h> + #include <messagecore/messagehelpers.h> + +-using namespace KMime; + using namespace KMime::Types; + using namespace KPIM; + using namespace MailTransport; +-- +1.7.3.4 + diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild index d69eba93c056..96dd8a7d50d4 100644 --- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild +++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild,v 1.1 2011/12/11 18:52:19 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild,v 1.2 2011/12/25 21:23:22 dilfridge Exp $ EAPI=4 @@ -36,6 +36,8 @@ add_blocker korganizer '<4.5.67' RESTRICT="test" # bug 393131 +PATCHES=( "${FILESDIR}/${PN}-4.7.4-namespace.patch" ) + KMEXTRA=" akonadi_next/ calendarsupport/ |