Add actually add the patches for the previous.

2 files changed, 56 insertions, 0 deletions

diff --git a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp
new file mode 100644
index 00000000000..13324920c80
--- /dev/null
+++ b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-server_src_nepomuk_queryserviceclient.cpp,v 1.1 2012/03/21 23:26:40 markd Exp $
+
+Workaround for gcc4.[12]  https://bugs.kde.org/show_bug.cgi?id=295813
+
+--- server/src/nepomuk/queryserviceclient.cpp.orig	2012-01-23 16:33:32.000000000 +0000
++++ server/src/nepomuk/queryserviceclient.cpp
+@@ -150,7 +150,7 @@ Nepomuk::Query::QueryServiceClient::~Que
+ }
+ 
+ 
+-bool Nepomuk::Query::QueryServiceClient::query( const QString& query, const QHash<QString, QString> &encodedRps )
++bool Nepomuk::Query::QueryServiceClient::query( const QString& query, const hss &encodedRps )
+ {
+     close();
+ 
+@@ -164,7 +164,7 @@ bool Nepomuk::Query::QueryServiceClient:
+ }
+ 
+ 
+-bool Nepomuk::Query::QueryServiceClient::blockingQuery( const QString& q, const QHash<QString, QString> &encodedRps )
++bool Nepomuk::Query::QueryServiceClient::blockingQuery( const QString& q, const hss &encodedRps )
+ {
+     if( query( q, encodedRps ) ) {
+         QEventLoop loop;
diff --git a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h
new file mode 100644
index 00000000000..fb7d60ba7a1
--- /dev/null
+++ b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h
@@ -0,0 +1,32 @@
+$NetBSD: patch-server_src_nepomuk_queryserviceclient.h,v 1.1 2012/03/21 23:26:40 markd Exp $
+
+Workaround for gcc4.[12]  https://bugs.kde.org/show_bug.cgi?id=295813
+
+--- server/src/nepomuk/queryserviceclient.h.orig	2012-01-23 16:33:32.000000000 +0000
++++ server/src/nepomuk/queryserviceclient.h
+@@ -21,6 +21,7 @@
+ 
+ #include <QtCore/QObject>
+ #include <QtCore/QHash>
++typedef QHash<QString, QString> hss;
+ 
+ class QUrl;
+ 
+@@ -78,7 +79,7 @@ namespace Nepomuk {
+              *
+              * \sa QueryParser
+              */
+-            bool query( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() );
++            bool query( const QString& query, const hss &encodedRps = hss() );
+ 
+             /**
+              * Start a query using the Nepomuk user query language.
+@@ -96,7 +97,7 @@ namespace Nepomuk {
+              * 
+              * \sa query(const QString&), close()
+              */
+-            bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() );
++            bool blockingQuery( const QString& query, const hss &encodedRps = hss() );
+ 
+             /**
+              * Close the client, thus stop to monitor the query