[kdepim-runtime] backport upstream patch to fix build (with gcc-4.4)

Rex Dieter rdieter at fedoraproject.org
Tue Apr 2 23:34:15 UTC 2013


commit 11f1e112a22c772dc85522fee7fa4ec42f860ab8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Apr 2 18:33:44 2013 -0500

    backport upstream patch to fix build (with gcc-4.4)

 0001-Make-it-compile-with-gcc-4.4.patch |   27 +++++++++++++++++++++++++++
 kdepim-runtime.spec                     |    2 ++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/0001-Make-it-compile-with-gcc-4.4.patch b/0001-Make-it-compile-with-gcc-4.4.patch
new file mode 100644
index 0000000..a02fef0
--- /dev/null
+++ b/0001-Make-it-compile-with-gcc-4.4.patch
@@ -0,0 +1,27 @@
+From 3481748772adce09dd57c7ca5f006d7c7f37006d Mon Sep 17 00:00:00 2001
+From: David Jarvie <djarvie at kde.org>
+Date: Fri, 8 Mar 2013 18:00:04 +0000
+Subject: [PATCH 01/33] Make it compile with gcc 4.4
+
+The compilation fails with an error complaining about using 'typename'
+outside a template.
+---
+ 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 7004d08..dd065a0 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.1.4
+
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 00206b9..5eeb6c8 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -23,6 +23,7 @@ Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
 ## upstreamable patches
 
 ## upstream patches
+Patch100: 0001-Make-it-compile-with-gcc-4.4.patch
 
 # nuke ill-advised -devel pkg
 Obsoletes: kdepim-runtime-devel < 1:4.7.90-3
@@ -74,6 +75,7 @@ Requires: akonadi%{?_isa} >= %{akonadi_version}
 %setup -q -n kdepim-runtime-%{version}%{?pre}
 
 %patch0 -p1 -b .show_akonadi_kcm
+%patch100 -p1 -b .0001
 
 
 %build


More information about the scm-commits mailing list