akonadi: update to 18.04.0

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Wed Apr 25 13:53:14 2018 +1200
Changeset:	18b57e7be31dc7b94badd8120aac776f112712d6

Modified Files:
	akonadi/Makefile
	akonadi/PLIST
	akonadi/distinfo
	akonadi/options.mk

Log Message:
akonadi: update to 18.04.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=18b57e7be31dc7b94badd8120aac776f112712d6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 akonadi/Makefile   |  4 ++--
 akonadi/PLIST      | 13 +++++++------
 akonadi/distinfo   |  8 ++++----
 akonadi/options.mk |  2 ++
 4 files changed, 15 insertions(+), 12 deletions(-)

diffs:
diff --git a/akonadi/Makefile b/akonadi/Makefile
index b0294e14ab..fa7596b1f6 100644
--- a/akonadi/Makefile
+++ b/akonadi/Makefile
@@ -7,7 +7,7 @@ HOMEPAGE=	https://community.kde.org/KDE_PIM/Akonadi
 COMMENT=	PIM layer, which provides an asynchronous API to access all kind of PIM data
 LICENSE=	gnu-lgpl-v2
 
-.include "../../wip/kde5/applications.mk"
+.include "../../meta-pkgs/kde/applications.mk"
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 DEPENDS+=	kdesignerplugin-[0-9]*:../../x11/kdesignerplugin
@@ -19,7 +19,7 @@ USE_TOOLS+=	pkg-config msgmerge
 .include "options.mk"
 
 SUBST_CLASSES+=		xdg
-SUBST_STAGE.xdg=	post-patch
+SUBST_STAGE.xdg=	pre-configure
 SUBST_MESSAGE.xdg=	Install via examples dir.
 SUBST_FILES.xdg=	CMakeLists.txt
 SUBST_FILES.xdg+=	src/server/CMakeLists.txt
diff --git a/akonadi/PLIST b/akonadi/PLIST
index eb97f76966..d428fb5975 100644
--- a/akonadi/PLIST
+++ b/akonadi/PLIST
@@ -65,6 +65,7 @@ include/KF5/AkonadiCore/EntityOrderProxyModel
 include/KF5/AkonadiCore/EntityRightsFilterModel
 include/KF5/AkonadiCore/EntityTreeModel
 include/KF5/AkonadiCore/ExceptionBase
+include/KF5/AkonadiCore/FavoriteCollectionAttribute
 include/KF5/AkonadiCore/FavoriteCollectionsModel
 include/KF5/AkonadiCore/GidExtractorInterface
 include/KF5/AkonadiCore/IndexPolicyAttribute
@@ -167,6 +168,7 @@ include/KF5/AkonadiCore/entityorderproxymodel.h
 include/KF5/AkonadiCore/entityrightsfiltermodel.h
 include/KF5/AkonadiCore/entitytreemodel.h
 include/KF5/AkonadiCore/exceptionbase.h
+include/KF5/AkonadiCore/favoritecollectionattribute.h
 include/KF5/AkonadiCore/favoritecollectionsmodel.h
 include/KF5/AkonadiCore/gidextractorinterface.h
 include/KF5/AkonadiCore/indexpolicyattribute.h
@@ -305,7 +307,6 @@ include/KF5/akonadi/private/protocol_p.h
 include/KF5/akonadi/private/scope_p.h
 include/KF5/akonadi/private/standarddirs_p.h
 include/KF5/akonadi/private/tristate_p.h
-include/KF5/akonadi/private/xdgbasedirs_p.h
 include/KF5/akonadi_version.h
 lib/cmake/KF5Akonadi/KF5AkonadiConfig.cmake
 lib/cmake/KF5Akonadi/KF5AkonadiConfigVersion.cmake
@@ -314,19 +315,19 @@ lib/cmake/KF5Akonadi/KF5AkonadiTargets-noconfig.cmake
 lib/cmake/KF5Akonadi/KF5AkonadiTargets.cmake
 lib/libKF5AkonadiAgentBase.so
 lib/libKF5AkonadiAgentBase.so.5
-lib/libKF5AkonadiAgentBase.so.5.7.1
+lib/libKF5AkonadiAgentBase.so.5.8.0
 lib/libKF5AkonadiCore.so
 lib/libKF5AkonadiCore.so.5
-lib/libKF5AkonadiCore.so.5.7.1
+lib/libKF5AkonadiCore.so.5.8.0
 lib/libKF5AkonadiPrivate.so
 lib/libKF5AkonadiPrivate.so.5
-lib/libKF5AkonadiPrivate.so.5.7.1
+lib/libKF5AkonadiPrivate.so.5.8.0
 lib/libKF5AkonadiWidgets.so
 lib/libKF5AkonadiWidgets.so.5
-lib/libKF5AkonadiWidgets.so.5.7.1
+lib/libKF5AkonadiWidgets.so.5.8.0
 lib/libKF5AkonadiXml.so
 lib/libKF5AkonadiXml.so.5
-lib/libKF5AkonadiXml.so.5.7.1
+lib/libKF5AkonadiXml.so.5.8.0
 qt5/mkspecs/modules/qt_AkonadiAgentBase.pri
 qt5/mkspecs/modules/qt_AkonadiCore.pri
 qt5/mkspecs/modules/qt_AkonadiWidgets.pri
diff --git a/akonadi/distinfo b/akonadi/distinfo
index 3683d6a628..f694c97095 100644
--- a/akonadi/distinfo
+++ b/akonadi/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (akonadi-17.12.1.tar.xz) = 72008d0653f6d0eed5f8b93bc8b5ee99396a8cac
-RMD160 (akonadi-17.12.1.tar.xz) = 15778f4eefaa79b071a15b190ee0f1f150a3d583
-SHA512 (akonadi-17.12.1.tar.xz) = 5e6ea993b98ee72a5c65156e13734da3b8b34438a1a6b791f616e50eb6274328d9f6331bf2b4b9cd2216ce7977a875174757fbd7c7d1d366759303ce89be8ea5
-Size (akonadi-17.12.1.tar.xz) = 1521928 bytes
+SHA1 (akonadi-18.04.0.tar.xz) = b8acae2f4f8de523f772d1c242d552b36af40f82
+RMD160 (akonadi-18.04.0.tar.xz) = 4dd12ed4cf558c0c7af410dc70b5b8fa6575dd54
+SHA512 (akonadi-18.04.0.tar.xz) = 311d278ebf58b94f8d7704cdddb2fb3253216790f79ea287f56dfd026500428d73f9af3d77a12dd9a45721ac1e2ab350e612e6b76205ca2cd347d9b8ac061151
+Size (akonadi-18.04.0.tar.xz) = 1524812 bytes
 SHA1 (patch-CMakeLists.txt) = 34816f6eb8e3afe441030beb09343542ff726e06
 SHA1 (patch-src_server_CMakeLists.txt) = ee772c1b3ba8c0e1b5bb7a209a5958681073a5cf
diff --git a/akonadi/options.mk b/akonadi/options.mk
index 47bbc7affa..762fe958b7 100644
--- a/akonadi/options.mk
+++ b/akonadi/options.mk
@@ -17,5 +17,7 @@ PLIST_VARS+=	sqlite
 .	include "../../databases/sqlite3/buildlink3.mk"
 CMAKE_ARGS+=	-DAKONADI_BUILD_QSQLITE:BOOL=ON
 CMAKE_ARGS+=	-DDATABASE_BACKEND=SQLITE
+CMAKE_ARGS+=	-DSQLITE_INCLUDE_DIR=${BUILDLINK_PREFIX.sqlite3}/include
+CMAKE_ARGS+=	-DSQLITE_LIBRARIES=${BUILDLINK_PREFIX.sqlite3}/lib/libsqlite3.so
 PLIST.sqlite=	yes
 .endif