diff options
| -rw-r--r-- | mail/akonadi/Makefile | 5 | ||||
| -rw-r--r-- | mail/akonadi/distinfo | 12 | ||||
| -rw-r--r-- | mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp | 10 | ||||
| -rw-r--r-- | mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h | 22 |
4 files changed, 24 insertions, 25 deletions
diff --git a/mail/akonadi/Makefile b/mail/akonadi/Makefile index 2c869096cf9..33e2585a305 100644 --- a/mail/akonadi/Makefile +++ b/mail/akonadi/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2013/03/02 20:33:26 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2013/04/03 07:37:12 markd Exp $ -DISTNAME= akonadi-1.7.2 -PKGREVISION= 4 +DISTNAME= akonadi-1.9.1 CATEGORIES= mail MASTER_SITES= ftp://kde.mirror.anlx.net/stable/akonadi/src/ EXTRACT_SUFX= .tar.bz2 diff --git a/mail/akonadi/distinfo b/mail/akonadi/distinfo index 8a0bbcf6731..cbe9fd5fce7 100644 --- a/mail/akonadi/distinfo +++ b/mail/akonadi/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2013/02/17 09:14:44 markd Exp $ +$NetBSD: distinfo,v 1.15 2013/04/03 07:37:12 markd Exp $ -SHA1 (akonadi-1.7.2.tar.bz2) = 6aef88b46f8f7ce2dbdfb3641bce2d0bb733f181 -RMD160 (akonadi-1.7.2.tar.bz2) = f6c0b4173fd7ea4b60a9e311984e35ce638e8ec7 -Size (akonadi-1.7.2.tar.bz2) = 210944 bytes +SHA1 (akonadi-1.9.1.tar.bz2) = 955ea3ccca2c81db8b81deea9a45921c89687bda +RMD160 (akonadi-1.9.1.tar.bz2) = ece2ae75ce9bc395e6a5c49908869756e6d7408b +Size (akonadi-1.9.1.tar.bz2) = 220354 bytes SHA1 (patch-cmake_modules_FindSqlite.cmake) = 863e5324c07dff18306c1a3e358122d700debd9e -SHA1 (patch-server_src_nepomuk_queryserviceclient.cpp) = af79b76bbcba6c3dcdf97d4ec6151fb6ee6aa0a9 -SHA1 (patch-server_src_nepomuk_queryserviceclient.h) = 32b810cf9b0cc4e377a091794299e50980c27589 +SHA1 (patch-server_src_nepomuk_queryserviceclient.cpp) = ac47da466a84b67fe001e6b80b5c6d93ad20b107 +SHA1 (patch-server_src_nepomuk_queryserviceclient.h) = 78b869b315a0365ccd0b309821296b48e126d363 SHA1 (patch-shared_akapplication.h) = 4e774cef5b22b5e5e8071c111794c841cde96fe1 diff --git a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp index 13324920c80..09f2c3d6fed 100644 --- a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp +++ b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-server_src_nepomuk_queryserviceclient.cpp,v 1.1 2012/03/21 23:26:40 markd Exp $ +$NetBSD: patch-server_src_nepomuk_queryserviceclient.cpp,v 1.2 2013/04/03 07:37:12 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.orig 2013-03-02 11:51:18.000000000 +0000 +++ server/src/nepomuk/queryserviceclient.cpp -@@ -150,7 +150,7 @@ Nepomuk::Query::QueryServiceClient::~Que +@@ -159,7 +159,7 @@ Nepomuk::Query::QueryServiceClient::~Que } @@ -13,8 +13,8 @@ Workaround for gcc4.[12] https://bugs.kde.org/show_bug.cgi?id=295813 { close(); -@@ -164,7 +164,7 @@ bool Nepomuk::Query::QueryServiceClient: - } +@@ -181,7 +181,7 @@ bool Nepomuk::Query::QueryServiceClient: + -bool Nepomuk::Query::QueryServiceClient::blockingQuery( const QString& q, const QHash<QString, QString> &encodedRps ) diff --git a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h index fb7d60ba7a1..01c734f08d5 100644 --- a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h +++ b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h @@ -1,10 +1,10 @@ -$NetBSD: patch-server_src_nepomuk_queryserviceclient.h,v 1.1 2012/03/21 23:26:40 markd Exp $ +$NetBSD: patch-server_src_nepomuk_queryserviceclient.h,v 1.2 2013/04/03 07:37:12 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.orig 2013-03-02 11:51:18.000000000 +0000 +++ server/src/nepomuk/queryserviceclient.h -@@ -21,6 +21,7 @@ +@@ -23,6 +23,7 @@ #include <QtCore/QObject> #include <QtCore/QHash> @@ -12,21 +12,21 @@ Workaround for gcc4.[12] https://bugs.kde.org/show_bug.cgi?id=295813 class QUrl; -@@ -78,7 +79,7 @@ namespace Nepomuk { +@@ -82,7 +83,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() ); +- 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 { - * + * Start a query using the Nepomuk query service. +@@ -102,7 +103,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() ); +- 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 |