Update akonadi to 1.13.0 1.13.0 10-August-2014 ---------------------------------------------- - Fixed virtual collections statistics - Fixed tag RID fetch - Fixed HRID-based fetches - Fixed race condition in StorageDebugger - Use FindBacktrace.cmake from CMake 3.0 instead of our own detection 1.12.90 07-July-2014 ---------------------------------------------- - MERGE command for faster synchronization - Optimizations in various commands handlers - SELECT command is obsolete now - Performance and concurrency improvements in QSQLITE3 driver - Introduced Collection sync preferences as an improvement over the IMAP-based subscription model - Disable filesystem copy-on-write for DB files when running on Btrfs - Introduced direct streaming of external parts - Fixed SearchManager DBus interface not being registered to DBus - Fixed handling of tags in AK-APPEND and MERGE commands - Various fixes in virtual collections handling 1.12.1 07-April-2014 ---------------------------------------------- - Fixed deadlock in SearchManager - Fixed notification emission when appending items - Fixed ItemRetriever ignoring changeSince argument - Fixed X-AKAPPEND command response - Fixed RID-based FETCH - Fixed data loss in case of long-lasting copy or move operations 1.12.0 25-March-2014 ---------------------------------------------- - Improved 'akonadictl status' command output - Fixed indexing of items in collections with short cache expiration - Fixed building Akonadi in subdirectory - Fixed deadlock in SearchManager - Fixed runtime warnings 1.11.90 19-March-2014 ---------------------------------------------- - Fixed collection scheduling - Fixed indexing of expired items from local resources - Fixed database schema update with PostgreSQL - Fixes in searching and search updates 1.11.80 28-February-2014 ---------------------------------------------- - Server-search support - Search plugins support - Tags support - Fixes and improvements in search - Fixes in protocol parser - Fixed inter-resource moves - Fixed .desktop files parsing - Optimized collections tasks scheduling - Optimized flags handling - Optimized appending new items via AK-APPEND - Handle database transactions deadlocks and timeouts - Improved PostgreSQL support - Soprano is now an optional dependency - Removed MySQL Embedded support 1.11.0 28-November-2013 ---------------------------------------------- - fix joined UPDATE queries failing with SQLite 1.10.80 05-November-2013 ---------------------------------------------- - Servser-side notification filtering - GID support - Export custom agent properties to clients - Faster Akonadi shutdown - Improved and faster database schema check on start - Enabled C++11 support - Optimize some SQL queries - Store only relative paths to external payload files in database 1.10.3 04-October-2013 ---------------------------------------------- - Fix support for latest PostgreSQL - Check MySQL version at runtime, require at least 5.1 - Fix crash when destroying DataStore with backends other than MySQL - Fix problem with too long socket paths - Send dummy queries to MySQL to keep the connection alive - Fix crash when no flags are changeddiff -r1.65 -r1.66 pkgsrc/mail/akonadi/Makefile
(markd)
@@ -1,42 +1,45 @@ | @@ -1,42 +1,45 @@ | |||
1 | # $NetBSD: Makefile,v 1.65 2014/11/07 19:39:36 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.66 2014/11/13 09:44:02 markd Exp $ | |
2 | 2 | |||
3 | DISTNAME= akonadi-1.10.2 | 3 | DISTNAME= akonadi-1.13.0 | |
4 | PKGREVISION= 8 | |||
5 | CATEGORIES= mail | 4 | CATEGORIES= mail | |
6 | MASTER_SITES= ftp://kde.mirror.anlx.net/stable/akonadi/src/ | 5 | MASTER_SITES= ftp://kde.mirror.anlx.net/stable/akonadi/src/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
8 | 7 | |||
9 | MAINTAINER= markd@NetBSD.org | 8 | MAINTAINER= markd@NetBSD.org | |
10 | HOMEPAGE= http://pim.kde.org/akonadi/ | 9 | HOMEPAGE= http://pim.kde.org/akonadi/ | |
11 | COMMENT= The KDE PIM Storage Service | 10 | COMMENT= The KDE PIM Storage Service | |
12 | LICENSE= gnu-lgpl-v2.1 | 11 | LICENSE= gnu-lgpl-v2.1 | |
13 | 12 | |||
14 | # BUILD_MAKE_FLAGS+= VERBOSE=1 | 13 | # BUILD_MAKE_FLAGS+= VERBOSE=1 | |
15 | 14 | |||
16 | BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 | 15 | BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 | |
17 | BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt | 16 | BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt | |
18 | 17 | |||
19 | .include "options.mk" | 18 | .include "options.mk" | |
20 | 19 | |||
21 | USE_TOOLS+= pkg-config | 20 | USE_TOOLS+= pkg-config | |
22 | USE_LANGUAGES= c c++ | 21 | USE_LANGUAGES= c c++ | |
23 | USE_CMAKE= yes | 22 | USE_CMAKE= yes | |
24 | CMAKE_ARG_PATH= .. | 23 | CMAKE_ARG_PATH= .. | |
25 | CONFIGURE_DIRS= _build | 24 | CONFIGURE_DIRS= _build | |
26 | 25 | |||
26 | # https://bugs.gentoo.org/show_bug.cgi?id=520102 | |||
27 | GCC_REQD+= 4.7 | |||
28 | ||||
27 | pre-configure: | 29 | pre-configure: | |
28 | ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ | 30 | ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ | |
29 | ${MKDIR} ${WRKSRC}/_build | 31 | ${MKDIR} ${WRKSRC}/_build | |
30 | 32 | |||
31 | PKGCONFIG_OVERRIDE+= akonadi.pc.cmake | 33 | PKGCONFIG_OVERRIDE+= akonadi.pc.cmake | |
32 | 34 | |||
33 | LDFLAGS.SunOS+= -lsocket | 35 | LDFLAGS.SunOS+= -lsocket | |
34 | 36 | |||
35 | .include "../../databases/shared-mime-info/buildlink3.mk" | 37 | .include "../../databases/shared-mime-info/buildlink3.mk" | |
36 | .include "../../devel/boost-libs/buildlink3.mk" | 38 | .include "../../devel/boost-libs/buildlink3.mk" | |
37 | .include "../../textproc/soprano/buildlink3.mk" | 39 | .include "../../devel/libexecinfo/buildlink3.mk" | |
40 | #.include "../../textproc/soprano/buildlink3.mk" | |||
38 | .include "../../x11/qt4-libs/buildlink3.mk" | 41 | .include "../../x11/qt4-libs/buildlink3.mk" | |
39 | .include "../../x11/qt4-tools/buildlink3.mk" | 42 | .include "../../x11/qt4-tools/buildlink3.mk" | |
40 | .include "../../x11/qt4-qdbus/buildlink3.mk" | 43 | .include "../../x11/qt4-qdbus/buildlink3.mk" | |
41 | 44 | |||
42 | .include "../../mk/bsd.pkg.mk" | 45 | .include "../../mk/bsd.pkg.mk" |
@@ -1,41 +1,45 @@ | @@ -1,41 +1,45 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.8 2013/07/20 15:56:18 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.9 2014/11/13 09:44:02 markd Exp $ | |
2 | bin/akonadi_agent_launcher | 2 | bin/akonadi_agent_launcher | |
3 | bin/akonadi_agent_server | 3 | bin/akonadi_agent_server | |
4 | bin/akonadi_control | 4 | bin/akonadi_control | |
5 | bin/akonadi_rds | 5 | bin/akonadi_rds | |
6 | bin/akonadictl | 6 | bin/akonadictl | |
7 | bin/akonadiserver | 7 | bin/akonadiserver | |
8 | bin/asapcat | 8 | bin/asapcat | |
9 | include/akonadi/abstractsearchplugin.h | |||
9 | include/akonadi/private/akonadiprotocolinternals_export.h | 10 | include/akonadi/private/akonadiprotocolinternals_export.h | |
10 | include/akonadi/private/capabilities_p.h | 11 | include/akonadi/private/capabilities_p.h | |
11 | include/akonadi/private/imapparser_p.h | 12 | include/akonadi/private/imapparser_p.h | |
12 | include/akonadi/private/imapset_p.h | 13 | include/akonadi/private/imapset_p.h | |
13 | include/akonadi/private/notificationmessage_p.h | 14 | include/akonadi/private/notificationmessage_p.h | |
14 | include/akonadi/private/notificationmessagev2_p.h | 15 | include/akonadi/private/notificationmessagev2_p.h | |
16 | include/akonadi/private/notificationmessagev3_p.h | |||
15 | include/akonadi/private/protocol_p.h | 17 | include/akonadi/private/protocol_p.h | |
16 | include/akonadi/private/xdgbasedirs_p.h | 18 | include/akonadi/private/xdgbasedirs_p.h | |
17 | lib/cmake/Akonadi/AkonadiConfig.cmake | 19 | lib/cmake/Akonadi/AkonadiConfig.cmake | |
18 | lib/cmake/Akonadi/AkonadiConfigVersion.cmake | 20 | lib/cmake/Akonadi/AkonadiConfigVersion.cmake | |
19 | lib/cmake/Akonadi/AkonadiTargetsWithPrefix-noconfig.cmake | 21 | lib/cmake/Akonadi/AkonadiTargetsWithPrefix-noconfig.cmake | |
20 | lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake | 22 | lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake | |
21 | lib/libakonadiprotocolinternals.so | 23 | lib/libakonadiprotocolinternals.so | |
22 | lib/libakonadiprotocolinternals.so.1 | 24 | lib/libakonadiprotocolinternals.so.1 | |
23 | lib/libakonadiprotocolinternals.so.${PKGVERSION} | 25 | lib/libakonadiprotocolinternals.so.${PKGVERSION} | |
24 | lib/pkgconfig/akonadi.pc | 26 | lib/pkgconfig/akonadi.pc | |
25 | ${PLIST.sqlite}qt4/plugins/sqldrivers/libqsqlite3.so | 27 | ${PLIST.sqlite}qt4/plugins/sqldrivers/libqsqlite3.so | |
26 | share/config/akonadi/mysql-global-mobile.conf | 28 | share/config/akonadi/mysql-global-mobile.conf | |
27 | share/config/akonadi/mysql-global.conf | 29 | share/config/akonadi/mysql-global.conf | |
28 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml | 30 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml | |
31 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Search.xml | |||
29 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml | 32 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml | |
30 | share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml | 33 | share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml | |
31 | share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml | 34 | share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml | |
32 | share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml | 35 | share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml | |
33 | share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml | 36 | share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml | |
34 | share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml | 37 | share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml | |
35 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml | 38 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml | |
36 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml | 39 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml | |
37 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml | 40 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml | |
41 | share/dbus-1/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml | |||
38 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml | 42 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml | |
39 | share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml | 43 | share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml | |
40 | share/dbus-1/services/org.freedesktop.Akonadi.Control.service | 44 | share/dbus-1/services/org.freedesktop.Akonadi.Control.service | |
41 | share/mime/packages/akonadi-mime.xml | 45 | share/mime/packages/akonadi-mime.xml |
@@ -1,9 +1,7 @@ | @@ -1,9 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2013/10/26 22:04:57 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.20 2014/11/13 09:44:02 markd Exp $ | |
2 | 2 | |||
3 | SHA1 (akonadi-1.10.2.tar.bz2) = 97660e2a4fc8797ae86ac2981490d3868c6085ff | 3 | SHA1 (akonadi-1.13.0.tar.bz2) = 9d594b5840e2e5d90057a7e5d8545004a3476bc0 | |
4 | RMD160 (akonadi-1.10.2.tar.bz2) = c9137ad702a13a2588a60ca91a73abad409adf8c | 4 | RMD160 (akonadi-1.13.0.tar.bz2) = 411e4e3b203cd9681b10d21af75806f723a687ec | |
5 | Size (akonadi-1.10.2.tar.bz2) = 227993 bytes | 5 | Size (akonadi-1.13.0.tar.bz2) = 294198 bytes | |
6 | SHA1 (patch-CMakeLists.txt) = 37ddde42e89e90c8626e8803ac2d2ed1e4805d24 | 6 | SHA1 (patch-cmake_modules_FindSqlite.cmake) = 3deefae90ec3485affeda4de283d4166d85c41fc | |
7 | SHA1 (patch-cmake_modules_FindSqlite.cmake) = 863e5324c07dff18306c1a3e358122d700debd9e | 7 | SHA1 (patch-git_21465191) = 735e05bfa08c113ec196049dcea035f889cd7b6d | |
8 | SHA1 (patch-server_src_nepomuk_queryserviceclient.cpp) = ac47da466a84b67fe001e6b80b5c6d93ad20b107 | |||
9 | SHA1 (patch-server_src_nepomuk_queryserviceclient.h) = 78b869b315a0365ccd0b309821296b48e126d363 |
@@ -1,66 +1,21 @@ | @@ -1,66 +1,21 @@ | |||
1 | $NetBSD: patch-cmake_modules_FindSqlite.cmake,v 1.1 2012/03/19 11:39:16 markd Exp $ | 1 | $NetBSD: patch-cmake_modules_FindSqlite.cmake,v 1.2 2014/11/13 09:44:02 markd Exp $ | |
2 | ||||
3 | If pkg-config provides a sqlite version, use it in preference | |||
4 | 2 | |||
5 | PC_SQLITE_{INCLUDE,LIB}DIR may be null if in default path so need to | 3 | PC_SQLITE_{INCLUDE,LIB}DIR may be null if in default path so need to | |
6 | include default path in search. | 4 | include default path in search. | |
7 | 5 | |||
8 | --- cmake/modules/FindSqlite.cmake.orig 2011-05-07 09:22:49.000000000 +0000 | 6 | --- cmake/modules/FindSqlite.cmake.orig 2011-05-07 09:22:49.000000000 +0000 | |
9 | +++ cmake/modules/FindSqlite.cmake | 7 | +++ cmake/modules/FindSqlite.cmake | |
10 | @@ -38,13 +38,11 @@ if(PC_SQLITE_FOUND) | 8 | @@ -38,13 +38,11 @@ if(PC_SQLITE_FOUND) | |
11 | find_path(SQLITE_INCLUDE_DIR | 9 | find_path(SQLITE_INCLUDE_DIR | |
12 | NAMES sqlite3.h | 10 | NAMES sqlite3.h | |
13 | PATHS ${PC_SQLITE_INCLUDEDIR} | 11 | PATHS ${PC_SQLITE_INCLUDEDIR} | |
14 | - NO_DEFAULT_PATH | 12 | - NO_DEFAULT_PATH | |
15 | ) | 13 | ) | |
16 | 14 | |||
17 | find_library(SQLITE_LIBRARIES | 15 | find_library(SQLITE_LIBRARIES | |
18 | NAMES sqlite3 | 16 | NAMES sqlite3 | |
19 | PATHS ${PC_SQLITE_LIBDIR} | 17 | PATHS ${PC_SQLITE_LIBDIR} | |
20 | - NO_DEFAULT_PATH | 18 | - NO_DEFAULT_PATH | |
21 | ) | 19 | ) | |
22 | else(PC_SQLITE_FOUND) | 20 | else(PC_SQLITE_FOUND) | |
23 | find_path(SQLITE_INCLUDE_DIR | 21 | find_path(SQLITE_INCLUDE_DIR | |
24 | @@ -67,22 +65,26 @@ else( UNIX ) | |||
25 | set( SQLITE_STATIC_LIBRARIES ${SQLITE_LIBRARIES} ) | |||
26 | endif( UNIX ) | |||
27 | ||||
28 | -if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h) | |||
29 | - file(READ ${SQLITE_INCLUDE_DIR}/sqlite3.h SQLITE3_H_CONTENT) | |||
30 | - string(REGEX MATCH "SQLITE_VERSION[ ]*\"[0-9.]*\"\n" SQLITE_VERSION_MATCH "${SQLITE3_H_CONTENT}") | |||
31 | - | |||
32 | - if(SQLITE_VERSION_MATCH) | |||
33 | - string(REGEX REPLACE ".*SQLITE_VERSION[ ]*\"(.*)\"\n" "\\1" SQLITE_VERSION ${SQLITE_VERSION_MATCH}) | |||
34 | - | |||
35 | - if(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}") | |||
36 | - message(STATUS "Sqlite ${SQLITE_VERSION} was found, but at least version ${SQLITE_MIN_VERSION} is required") | |||
37 | - set(SQLITE_VERSION_OK FALSE) | |||
38 | - else(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}") | |||
39 | - set(SQLITE_VERSION_OK TRUE) | |||
40 | - endif(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}") | |||
41 | - | |||
42 | - endif(SQLITE_VERSION_MATCH) | |||
43 | - | |||
44 | +if( PC_SQLITE_VERSION ) | |||
45 | + set( SQLITE_VERSION ${PC_SQLITE_VERSION}) | |||
46 | +else( PC_SQLITE_VERSION ) | |||
47 | + if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h) | |||
48 | + file(READ ${SQLITE_INCLUDE_DIR}/sqlite3.h SQLITE3_H_CONTENT) | |||
49 | + string(REGEX MATCH "SQLITE_VERSION[ ]*\"[0-9.]*\"\n" SQLITE_VERSION_MATCH "${SQLITE3_H_CONTENT}") | |||
50 | + | |||
51 | + if(SQLITE_VERSION_MATCH) | |||
52 | + string(REGEX REPLACE ".*SQLITE_VERSION[ ]*\"(.*)\"\n" "\\1" SQLITE_VERSION ${SQLITE_VERSION_MATCH}) | |||
53 | + endif(SQLITE_VERSION_MATCH) | |||
54 | + endif() | |||
55 | +endif( PC_SQLITE_VERSION ) | |||
56 | + | |||
57 | +if (SQLITE_VERSION) | |||
58 | + if(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}") | |||
59 | + message(STATUS "Sqlite ${SQLITE_VERSION} was found, but at least version ${SQLITE_MIN_VERSION} is required") | |||
60 | + set(SQLITE_VERSION_OK FALSE) | |||
61 | + else(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}") | |||
62 | + set(SQLITE_VERSION_OK TRUE) | |||
63 | + endif(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}") | |||
64 | endif() | |||
65 | ||||
66 | include(FindPackageHandleStandardArgs) |
$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)