Backport patch from upstream to fix build with GCC 4.4, wrt bug #464510.

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 37 insertions, 2 deletions

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 5a1f059e38f0..90abd6b8eff6 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.123 2013/04/06 00:04:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.124 2013/04/25 10:30:11 kensington Exp $
+
+  25 Apr 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kdepim-runtime-4.10.2-gcc-4.4.patch, kdepim-runtime-4.10.2.ebuild:
+  Backport patch from upstream to fix build with GCC 4.4, wrt bug #464510.
 
 *kdepim-runtime-4.10.2 (05 Apr 2013)
 
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.2-gcc-4.4.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.2-gcc-4.4.patch
new file mode 100644
index 000000000000..45df91c8152c
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.2-gcc-4.4.patch
@@ -0,0 +1,29 @@
+From 69493d6d210e0b1569fb5af1e05ef120a03bba0c Mon Sep 17 00:00:00 2001
+From: David Jarvie <djarvie@kde.org>
+Date: Fri, 8 Mar 2013 18:00:04 +0000
+Subject: [PATCH] Make it compile with gcc 4.4
+
+The compilation fails with an error complaining about using 'typename'
+outside a template.
+
+REVIEW: 110131
+---
+ agents/nepomukfeeder/nepomukfeederagent.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/agents/nepomukfeeder/nepomukfeederagent.cpp b/agents/nepomukfeeder/nepomukfeederagent.cpp
+index 6b02f99..b390fd9 100644
+--- a/agents/nepomukfeeder/nepomukfeederagent.cpp
++++ b/agents/nepomukfeeder/nepomukfeederagent.cpp
+@@ -60,7 +60,7 @@
+ #include "nepomukfeeder-config.h"
+ #include "nepomukfeederadaptor.h"
+ 
+-typedef QSharedPointer< QMultiHash< typename Akonadi::Collection::Id,  typename Akonadi::Item::Id> > MultiHashPointer;
++typedef QSharedPointer< QMultiHash< Akonadi::Collection::Id,  Akonadi::Item::Id> > MultiHashPointer;
+ Q_DECLARE_METATYPE(MultiHashPointer)
+ 
+ namespace Akonadi {
+-- 
+1.8.2.1
+
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.10.2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.10.2.ebuild
index f9674c950fad..df68f4d72e2f 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.10.2.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.10.2.ebuild,v 1.1 2013/04/06 00:04:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.10.2.ebuild,v 1.2 2013/04/25 10:30:11 kensington Exp $
 
 EAPI=5
 
@@ -34,6 +34,8 @@ RDEPEND="${DEPEND}
 # nepomuk_email_feeder moved here in 4.8
 add_blocker kdepim-common-libs 4.7.50
 
+PATCHES=( "${FILESDIR}/${P}-gcc-4.4.patch" )
+
 src_prepare() {
 	sed -e "s:find_package(LibKGAPI QUIET NO_MODULE):macro_optional_find_package(LibKGAPI):g" \
 	    -i "${S}/CMakeLists.txt" || die "fixing automagic dependencies failed"