summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/akonadi/Makefile11
-rw-r--r--mail/akonadi/PLIST6
-rw-r--r--mail/akonadi/distinfo14
-rw-r--r--mail/akonadi/patches/patch-CMakeLists.txt13
-rw-r--r--mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake47
-rw-r--r--mail/akonadi/patches/patch-git_2146519172
-rw-r--r--mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp24
-rw-r--r--mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h32
8 files changed, 91 insertions, 128 deletions
diff --git a/mail/akonadi/Makefile b/mail/akonadi/Makefile
index 84eaab4efd8..065c816d8fe 100644
--- a/mail/akonadi/Makefile
+++ b/mail/akonadi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2014/11/07 19:39:36 adam Exp $
+# $NetBSD: Makefile,v 1.66 2014/11/13 09:44:02 markd Exp $
-DISTNAME= akonadi-1.10.2
-PKGREVISION= 8
+DISTNAME= akonadi-1.13.0
CATEGORIES= mail
MASTER_SITES= ftp://kde.mirror.anlx.net/stable/akonadi/src/
EXTRACT_SUFX= .tar.bz2
@@ -24,6 +23,9 @@ USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _build
+# https://bugs.gentoo.org/show_bug.cgi?id=520102
+GCC_REQD+= 4.7
+
pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
${MKDIR} ${WRKSRC}/_build
@@ -34,7 +36,8 @@ LDFLAGS.SunOS+= -lsocket
.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../textproc/soprano/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+#.include "../../textproc/soprano/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../x11/qt4-qdbus/buildlink3.mk"
diff --git a/mail/akonadi/PLIST b/mail/akonadi/PLIST
index 90b1e66c8d6..0155d5f41f4 100644
--- a/mail/akonadi/PLIST
+++ b/mail/akonadi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/07/20 15:56:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/11/13 09:44:02 markd Exp $
bin/akonadi_agent_launcher
bin/akonadi_agent_server
bin/akonadi_control
@@ -6,12 +6,14 @@ bin/akonadi_rds
bin/akonadictl
bin/akonadiserver
bin/asapcat
+include/akonadi/abstractsearchplugin.h
include/akonadi/private/akonadiprotocolinternals_export.h
include/akonadi/private/capabilities_p.h
include/akonadi/private/imapparser_p.h
include/akonadi/private/imapset_p.h
include/akonadi/private/notificationmessage_p.h
include/akonadi/private/notificationmessagev2_p.h
+include/akonadi/private/notificationmessagev3_p.h
include/akonadi/private/protocol_p.h
include/akonadi/private/xdgbasedirs_p.h
lib/cmake/Akonadi/AkonadiConfig.cmake
@@ -26,6 +28,7 @@ ${PLIST.sqlite}qt4/plugins/sqldrivers/libqsqlite3.so
share/config/akonadi/mysql-global-mobile.conf
share/config/akonadi/mysql-global.conf
share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
+share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Search.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
@@ -35,6 +38,7 @@ share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
+share/dbus-1/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
share/dbus-1/services/org.freedesktop.Akonadi.Control.service
diff --git a/mail/akonadi/distinfo b/mail/akonadi/distinfo
index 43731ab6e94..561405af705 100644
--- a/mail/akonadi/distinfo
+++ b/mail/akonadi/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.19 2013/10/26 22:04:57 joerg Exp $
+$NetBSD: distinfo,v 1.20 2014/11/13 09:44:02 markd Exp $
-SHA1 (akonadi-1.10.2.tar.bz2) = 97660e2a4fc8797ae86ac2981490d3868c6085ff
-RMD160 (akonadi-1.10.2.tar.bz2) = c9137ad702a13a2588a60ca91a73abad409adf8c
-Size (akonadi-1.10.2.tar.bz2) = 227993 bytes
-SHA1 (patch-CMakeLists.txt) = 37ddde42e89e90c8626e8803ac2d2ed1e4805d24
-SHA1 (patch-cmake_modules_FindSqlite.cmake) = 863e5324c07dff18306c1a3e358122d700debd9e
-SHA1 (patch-server_src_nepomuk_queryserviceclient.cpp) = ac47da466a84b67fe001e6b80b5c6d93ad20b107
-SHA1 (patch-server_src_nepomuk_queryserviceclient.h) = 78b869b315a0365ccd0b309821296b48e126d363
+SHA1 (akonadi-1.13.0.tar.bz2) = 9d594b5840e2e5d90057a7e5d8545004a3476bc0
+RMD160 (akonadi-1.13.0.tar.bz2) = 411e4e3b203cd9681b10d21af75806f723a687ec
+Size (akonadi-1.13.0.tar.bz2) = 294198 bytes
+SHA1 (patch-cmake_modules_FindSqlite.cmake) = 3deefae90ec3485affeda4de283d4166d85c41fc
+SHA1 (patch-git_21465191) = 735e05bfa08c113ec196049dcea035f889cd7b6d
diff --git a/mail/akonadi/patches/patch-CMakeLists.txt b/mail/akonadi/patches/patch-CMakeLists.txt
deleted file mode 100644
index 9270ddd8343..00000000000
--- a/mail/akonadi/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2013/10/26 22:04:57 joerg Exp $
-
---- CMakeLists.txt.orig 2013-10-16 19:49:37.000000000 +0000
-+++ CMakeLists.txt
-@@ -257,7 +257,7 @@ option(CMAKE_COMPILE_GCOV "Build with co
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
- set(_ENABLE_EXCEPTIONS -fexceptions)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common" CACHE STRING "Flags used by the compiler during all build types" FORCE)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common" CACHE STRING "Flags used by the compiler during all build types" FORCE)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-common" CACHE STRING "Flags used by the compiler during all build types" FORCE)
- if(CMAKE_COMPILE_GCOV)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
diff --git a/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake b/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake
index 4adfbcd6a70..71332b24461 100644
--- a/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake
+++ b/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake
@@ -1,6 +1,4 @@
-$NetBSD: patch-cmake_modules_FindSqlite.cmake,v 1.1 2012/03/19 11:39:16 markd Exp $
-
-If pkg-config provides a sqlite version, use it in preference
+$NetBSD: patch-cmake_modules_FindSqlite.cmake,v 1.2 2014/11/13 09:44:02 markd Exp $
PC_SQLITE_{INCLUDE,LIB}DIR may be null if in default path so need to
include default path in search.
@@ -21,46 +19,3 @@ include default path in search.
)
else(PC_SQLITE_FOUND)
find_path(SQLITE_INCLUDE_DIR
-@@ -67,22 +65,26 @@ else( UNIX )
- set( SQLITE_STATIC_LIBRARIES ${SQLITE_LIBRARIES} )
- endif( UNIX )
-
--if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h)
-- file(READ ${SQLITE_INCLUDE_DIR}/sqlite3.h SQLITE3_H_CONTENT)
-- string(REGEX MATCH "SQLITE_VERSION[ ]*\"[0-9.]*\"\n" SQLITE_VERSION_MATCH "${SQLITE3_H_CONTENT}")
--
-- if(SQLITE_VERSION_MATCH)
-- string(REGEX REPLACE ".*SQLITE_VERSION[ ]*\"(.*)\"\n" "\\1" SQLITE_VERSION ${SQLITE_VERSION_MATCH})
--
-- if(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
-- message(STATUS "Sqlite ${SQLITE_VERSION} was found, but at least version ${SQLITE_MIN_VERSION} is required")
-- set(SQLITE_VERSION_OK FALSE)
-- else(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
-- set(SQLITE_VERSION_OK TRUE)
-- endif(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
--
-- endif(SQLITE_VERSION_MATCH)
--
-+if( PC_SQLITE_VERSION )
-+ set( SQLITE_VERSION ${PC_SQLITE_VERSION})
-+else( PC_SQLITE_VERSION )
-+ if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h)
-+ file(READ ${SQLITE_INCLUDE_DIR}/sqlite3.h SQLITE3_H_CONTENT)
-+ string(REGEX MATCH "SQLITE_VERSION[ ]*\"[0-9.]*\"\n" SQLITE_VERSION_MATCH "${SQLITE3_H_CONTENT}")
-+
-+ if(SQLITE_VERSION_MATCH)
-+ string(REGEX REPLACE ".*SQLITE_VERSION[ ]*\"(.*)\"\n" "\\1" SQLITE_VERSION ${SQLITE_VERSION_MATCH})
-+ endif(SQLITE_VERSION_MATCH)
-+ endif()
-+endif( PC_SQLITE_VERSION )
-+
-+if (SQLITE_VERSION)
-+ if(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
-+ message(STATUS "Sqlite ${SQLITE_VERSION} was found, but at least version ${SQLITE_MIN_VERSION} is required")
-+ set(SQLITE_VERSION_OK FALSE)
-+ else(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
-+ set(SQLITE_VERSION_OK TRUE)
-+ endif(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
- endif()
-
- include(FindPackageHandleStandardArgs)
diff --git a/mail/akonadi/patches/patch-git_21465191 b/mail/akonadi/patches/patch-git_21465191
new file mode 100644
index 00000000000..7a5cc1b01f7
--- /dev/null
+++ b/mail/akonadi/patches/patch-git_21465191
@@ -0,0 +1,72 @@
+$NetBSD: patch-git_21465191,v 1.1 2014/11/13 09:44:02 markd Exp $
+
+commit 2146519108ec66300328b7b3979477c7789795d3
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Wed Aug 13 23:22:11 2014 +0300
+
+ Do not enter the test/ directories if AKONADI_BUILD_TESTS is off.
+
+ enable_testing() only determines whether a "test" target and the related
+ CTest files will be created. And in Akonadi's case it is actually
+ invoked regardless of the value of the AKONADI_BUILD_TESTS option
+ because Akonadi includes the CTest module, which calls enable_testing()
+ based on the value of another variable, BUILD_TESTING.
+
+ In any case, whether the executables and libraries that compose
+ Akonadi's unit tests will be built has nothing to do with
+ enable_testing(). To make AKONADI_BUILD_TESTS really disable the build
+ of the unit tests we now avoid entering the tests/ directories at all
+ when it is off, so that neither tests nor targets they depend on get
+ built.
+
+ REVIEW: 119776
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -14,7 +14,7 @@ include(FeatureSummary)
+
+ ############### Build Options ###############
+
+-include(CTest)
++include(CTest) # Calls enable_testing().
+ include(CTestConfig.cmake)
+ option(AKONADI_BUILD_TESTS "Build the Akonadi unit tests." TRUE)
+ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
+@@ -27,10 +27,6 @@ if(NOT DEFINED DATABASE_BACKEND)
+ set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
+ endif()
+
+-if(AKONADI_BUILD_TESTS)
+- enable_testing()
+-endif()
+-
+ ############### CMake Macros ###############
+
+ include(InstallSettings)
+--- libs/CMakeLists.txt
++++ libs/CMakeLists.txt
+@@ -36,5 +36,7 @@ install(FILES
+ DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/private
+ )
+
+-add_subdirectory(tests)
++if(AKONADI_BUILD_TESTS)
++ add_subdirectory(tests)
++endif()
+
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index e4829f3..275938d 100644
+--- server/CMakeLists.txt
++++ server/CMakeLists.txt
+@@ -64,7 +64,10 @@ endmacro()
+ add_subdirectory(akonadictl)
+ add_subdirectory(control)
+ add_subdirectory(src)
+-add_subdirectory(tests)
++
++if(AKONADI_BUILD_TESTS)
++ add_subdirectory(tests)
++endif()
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}")
+ if(MYSQLD_EXECUTABLE)
diff --git a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp b/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp
deleted file mode 100644
index 09f2c3d6fed..00000000000
--- a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$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 2013-03-02 11:51:18.000000000 +0000
-+++ server/src/nepomuk/queryserviceclient.cpp
-@@ -159,7 +159,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();
-
-@@ -181,7 +181,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
deleted file mode 100644
index 01c734f08d5..00000000000
--- a/mail/akonadi/patches/patch-server_src_nepomuk_queryserviceclient.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$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 2013-03-02 11:51:18.000000000 +0000
-+++ server/src/nepomuk/queryserviceclient.h
-@@ -23,6 +23,7 @@
-
- #include <QtCore/QObject>
- #include <QtCore/QHash>
-+typedef QHash<QString, QString> hss;
-
- class QUrl;
-
-@@ -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() ) );
-
- /**
- * 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() ) );
-
- /**
- * Close the client, thus stop to monitor the query
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 21:56:19 +0000