akonadi: update to 20.04.1

diff --git a/akonadi/Makefile b/akonadi/Makefile
index bf65b415fcd0832837bdd86e4cca5af1f0077490..2b942353129b9718871b9d5d2467756f232ff01d 100644 (file)
--- a/akonadi/Makefile
+++ b/akonadi/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=      akonadi-${KAPPSVER}
-PKGREVISION=   1
 CATEGORIES=    mail
 
 HOMEPAGE=      https://community.kde.org/KDE_PIM/Akonadi
@@ -15,6 +14,8 @@ DEPENDS+=     kdesignerplugin-[0-9]*:../../x11/kdesignerplugin
 
 CMAKE_ARGS+=   -DMYSQLD_EXECUTABLE="${PREFIX}/sbin/mysqld"
 CMAKE_ARGS+=   -DPOSTGRES_PATH="${PREFIX}/bin"
+CMAKE_ARGS+=   -DINSTALL_APPARMOR=FALSE
+
 USE_TOOLS+=    pkg-config msgmerge
 
 .include "options.mk"
@@ -22,10 +23,8 @@ USE_TOOLS+=  pkg-config msgmerge
 SUBST_CLASSES+=                xdg
 SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
-SUBST_FILES.xdg=       CMakeLists.txt
-SUBST_FILES.xdg+=      src/server/CMakeLists.txt
-SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
-SUBST_SED.xdg+=                -e 's:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+SUBST_FILES.xdg=       src/server/CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
 
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/akonadi
 CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/akonadi/mysql-global.conf \

diff --git a/akonadi/PLIST b/akonadi/PLIST
index d55a82a106eaa0d5114424f13d76aaaa69e13fff..8e1eccc49271b565b689fece4101421dff41a03e 100644 (file)
--- a/akonadi/PLIST
+++ b/akonadi/PLIST
@@ -10,12 +10,14 @@ bin/akonadiselftest
 bin/akonadiserver
 bin/akonaditest
 bin/asapcat
+include/KF5/AkonadiAgentBase/AccountsIntegration
 include/KF5/AkonadiAgentBase/AgentBase
 include/KF5/AkonadiAgentBase/AgentSearchInterface
 include/KF5/AkonadiAgentBase/PreprocessorBase
 include/KF5/AkonadiAgentBase/ResourceBase
 include/KF5/AkonadiAgentBase/ResourceSettings
 include/KF5/AkonadiAgentBase/TransportResourceBase
+include/KF5/AkonadiAgentBase/accountsintegration.h
 include/KF5/AkonadiAgentBase/agentbase.h
 include/KF5/AkonadiAgentBase/agentsearchinterface.h
 include/KF5/AkonadiAgentBase/akonadiagentbase_export.h
@@ -34,6 +36,7 @@ include/KF5/AkonadiCore/AgentInstanceModel
 include/KF5/AkonadiCore/AgentManager
 include/KF5/AkonadiCore/AgentType
 include/KF5/AkonadiCore/AgentTypeModel
+include/KF5/AkonadiCore/AkOptional
 include/KF5/AkonadiCore/Attribute
 include/KF5/AkonadiCore/AttributeFactory
 include/KF5/AkonadiCore/CachePolicy
@@ -138,6 +141,7 @@ include/KF5/AkonadiCore/agentmanager.h
 include/KF5/AkonadiCore/agenttype.h
 include/KF5/AkonadiCore/agenttypemodel.h
 include/KF5/AkonadiCore/akonadicore_export.h
+include/KF5/AkonadiCore/akoptional.h
 include/KF5/AkonadiCore/attribute.h
 include/KF5/AkonadiCore/attributefactory.h
 include/KF5/AkonadiCore/cachepolicy.h
@@ -160,6 +164,7 @@ include/KF5/AkonadiCore/collectionquotaattribute.h
 include/KF5/AkonadiCore/collectionstatistics.h
 include/KF5/AkonadiCore/collectionstatisticsjob.h
 include/KF5/AkonadiCore/collectionutils.h
+include/KF5/AkonadiCore/config-akonadi.h
 include/KF5/AkonadiCore/control.h
 include/KF5/AkonadiCore/differencesalgorithminterface.h
 include/KF5/AkonadiCore/entityannotationsattribute.h
@@ -195,6 +200,7 @@ include/KF5/AkonadiCore/mimetypechecker.h
 include/KF5/AkonadiCore/monitor.h
 include/KF5/AkonadiCore/newmailnotifierattribute.h
 include/KF5/AkonadiCore/notificationsubscriber.h
+include/KF5/AkonadiCore/optional.hpp
 include/KF5/AkonadiCore/partfetcher.h
 include/KF5/AkonadiCore/persistentsearchattribute.h
 include/KF5/AkonadiCore/pop3resourceattribute.h
@@ -319,25 +325,25 @@ lib/cmake/KF5Akonadi/KF5AkonadiTargets-noconfig.cmake
 lib/cmake/KF5Akonadi/KF5AkonadiTargets.cmake
 lib/libKF5AkonadiAgentBase.so
 lib/libKF5AkonadiAgentBase.so.5
-lib/libKF5AkonadiAgentBase.so.5.12.0
+lib/libKF5AkonadiAgentBase.so.5.14.1
 lib/libKF5AkonadiCore.so
 lib/libKF5AkonadiCore.so.5
-lib/libKF5AkonadiCore.so.5.12.0
+lib/libKF5AkonadiCore.so.5.14.1
 lib/libKF5AkonadiPrivate.so
 lib/libKF5AkonadiPrivate.so.5
-lib/libKF5AkonadiPrivate.so.5.12.0
+lib/libKF5AkonadiPrivate.so.5.14.1
 lib/libKF5AkonadiWidgets.so
 lib/libKF5AkonadiWidgets.so.5
-lib/libKF5AkonadiWidgets.so.5.12.0
+lib/libKF5AkonadiWidgets.so.5.14.1
 lib/libKF5AkonadiXml.so
 lib/libKF5AkonadiXml.so.5
-lib/libKF5AkonadiXml.so.5.12.0
+lib/libKF5AkonadiXml.so.5.14.1
 qt5/mkspecs/modules/qt_AkonadiAgentBase.pri
 qt5/mkspecs/modules/qt_AkonadiCore.pri
 qt5/mkspecs/modules/qt_AkonadiWidgets.pri
 qt5/mkspecs/modules/qt_AkonadiXml.pri
 qt5/plugins/akonadi/akonadi_test_searchplugin.so
-qt5/plugins/designer/akonadi5widgets.so
+qt5/plugins/designer/akonadiwidgets.so
 qt5/plugins/sqldrivers/libqsqlite3.so
 share/akonadi/agents/knutresource.desktop
 share/config.kcfg/resourcebase.kcfg

diff --git a/akonadi/buildlink3.mk b/akonadi/buildlink3.mk
index 0a2c468f520bc5e3dd09ad122cf13e5c2e995e6e..859cea33be370507b53f7d5f059090e4b735e604 100644 (file)
--- a/akonadi/buildlink3.mk
+++ b/akonadi/buildlink3.mk
@@ -6,7 +6,6 @@ BUILDLINK_TREE+=        akonadi
 AKONADI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi+=        akonadi>=17.12.1
-BUILDLINK_ABI_DEPENDS.akonadi?=        akonadi>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.akonadi?=  ../../wip/akonadi
 
 .include "../../devel/kio/buildlink3.mk"

diff --git a/akonadi/distinfo b/akonadi/distinfo
index bf1768650fc9a0763ef799e6c1616127bff4f302..8fdf20a8fc67f3d4577ccf6a53684c4bc4c03e7b 100644 (file)
--- a/akonadi/distinfo
+++ b/akonadi/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-19.08.0.tar.xz) = 593f26b212286deac789ca0b8edf78a862d07e88
-RMD160 (akonadi-19.08.0.tar.xz) = bbd9c0f7f84283c6d18bc180ae67fa4888299dd4
-SHA512 (akonadi-19.08.0.tar.xz) = f2fec7283e1b466f29f9bde7c568397c975427e94bbc9177ebf01a491692fa080d3b20377d841d7eeaa30b49c7300acdd438965ee39f838fb052e39f380225b1
-Size (akonadi-19.08.0.tar.xz) = 1576124 bytes
+SHA1 (akonadi-20.04.1.tar.xz) = e114c7b633b88c4f209f60702311779e3df27ed7
+RMD160 (akonadi-20.04.1.tar.xz) = 319ea5c8307047d7220d0713f92c5ee8208d7f8f
+SHA512 (akonadi-20.04.1.tar.xz) = 25dcc2446b7a6143a6f709b4c6becb3b316e5680d0011a44f4af617289935b21c5c35936a6ccb96e56181a7ad4d00353dc0b6bcb6abe5fd042104adcb9c3e1d2
+Size (akonadi-20.04.1.tar.xz) = 1584156 bytes