akonadi-contacts: update to 20.04.1

[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:		Sat Feb 27 10:37:03 2021 +1300
Changeset:	15cfbeabf1d15eb6456c9f893453bf600e9bb0b0

Modified Files:
	akonadi-contacts/Makefile
	akonadi-contacts/PLIST
	akonadi-contacts/buildlink3.mk
	akonadi-contacts/distinfo

Log Message:
akonadi-contacts: update to 20.04.1

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

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

diffstat:
 akonadi-contacts/Makefile      |  8 ++++----
 akonadi-contacts/PLIST         | 12 ++++++++----
 akonadi-contacts/buildlink3.mk |  5 ++---
 akonadi-contacts/distinfo      |  8 ++++----
 4 files changed, 18 insertions(+), 15 deletions(-)

diffs:
diff --git a/akonadi-contacts/Makefile b/akonadi-contacts/Makefile
index 9e19e46d73..c11d38b54d 100644
--- a/akonadi-contacts/Makefile
+++ b/akonadi-contacts/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	akonadi-contacts-${KAPPSVER}
-PKGREVISION=	1
 CATEGORIES=	misc
 
 HOMEPAGE=	https://community.kde.org/KDE_PIM
@@ -17,9 +16,10 @@ USE_TOOLS+=	msgmerge
 SUBST_CLASSES+=		fix-moc
 SUBST_STAGE.fix-moc=	post-configure
 SUBST_MESSAGE.fix-moc=	Cleaning up MOC includes
-SUBST_FILES.fix-moc=	_KDE_build/*/*/*/CMakeFiles/*_autogen.dir/AutogenInfo.cmake
-SUBST_FILES.fix-moc+=	_KDE_build/*/CMakeFiles/*_autogen.dir/AutogenInfo.cmake
-SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
+SUBST_FILES.fix-moc=	_KDE_build/*/*/*/CMakeFiles/*_autogen.dir/AutogenInfo.json
+SUBST_FILES.fix-moc+=	_KDE_build/*/CMakeFiles/*_autogen.dir/AutogenInfo.json
+SUBST_NOOP_OK.fix-moc=	yes
+SUBST_SED.fix-moc=	-e 's;"${PREFIX}/include",;;g'
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../wip/akonadi-mime/buildlink3.mk"
diff --git a/akonadi-contacts/PLIST b/akonadi-contacts/PLIST
index dc19e509f8..cb8a3b5302 100644
--- a/akonadi-contacts/PLIST
+++ b/akonadi-contacts/PLIST
@@ -1,6 +1,7 @@
 @comment $NetBSD$
 include/KF5/Akonadi/Contact/AbstractContactFormatter
 include/KF5/Akonadi/Contact/AbstractContactGroupFormatter
+include/KF5/Akonadi/Contact/AbstractEmailAddressSelectionDialog
 include/KF5/Akonadi/Contact/ContactDefaultActions
 include/KF5/Akonadi/Contact/ContactEditor
 include/KF5/Akonadi/Contact/ContactEditorDialog
@@ -21,15 +22,17 @@ include/KF5/Akonadi/Contact/EmailAddressSelection
 include/KF5/Akonadi/Contact/EmailAddressSelectionDialog
 include/KF5/Akonadi/Contact/EmailAddressSelectionModel
 include/KF5/Akonadi/Contact/EmailAddressSelectionWidget
+include/KF5/Akonadi/Contact/RecipientsEditorManager
+include/KF5/Akonadi/Contact/RecipientsPickerWidget
 include/KF5/Akonadi/Contact/SelectAddressBookDialog
 include/KF5/Akonadi/Contact/StandardContactActionManager
 include/KF5/Akonadi/Contact/StandardContactFormatter
 include/KF5/Akonadi/Contact/StandardContactGroupFormatter
-include/KF5/ContactEditor/AbstractAddressLocationWidget
 include/KF5/ContactEditor/CategoriesEditAbstractWidget
 include/KF5/ContactEditor/ContactEditorPagePlugin
 include/KF5/akonadi/contact/abstractcontactformatter.h
 include/KF5/akonadi/contact/abstractcontactgroupformatter.h
+include/KF5/akonadi/contact/abstractemailaddressselectiondialog.h
 include/KF5/akonadi/contact/akonadi-contact_export.h
 include/KF5/akonadi/contact/contactdefaultactions.h
 include/KF5/akonadi/contact/contacteditor.h
@@ -51,11 +54,12 @@ include/KF5/akonadi/contact/emailaddressselection.h
 include/KF5/akonadi/contact/emailaddressselectiondialog.h
 include/KF5/akonadi/contact/emailaddressselectionmodel.h
 include/KF5/akonadi/contact/emailaddressselectionwidget.h
+include/KF5/akonadi/contact/recipientseditormanager.h
+include/KF5/akonadi/contact/recipientspickerwidget.h
 include/KF5/akonadi/contact/selectaddressbookdialog.h
 include/KF5/akonadi/contact/standardcontactactionmanager.h
 include/KF5/akonadi/contact/standardcontactformatter.h
 include/KF5/akonadi/contact/standardcontactgroupformatter.h
-include/KF5/contacteditor/abstractaddresslocationwidget.h
 include/KF5/contacteditor/categorieseditabstractwidget.h
 include/KF5/contacteditor/contacteditor_export.h
 include/KF5/contacteditor/contacteditorpageplugin.h
@@ -69,10 +73,10 @@ lib/cmake/KF5ContactEditor/KF5ContactEditorTargets-noconfig.cmake
 lib/cmake/KF5ContactEditor/KF5ContactEditorTargets.cmake
 lib/libKF5AkonadiContact.so
 lib/libKF5AkonadiContact.so.5
-lib/libKF5AkonadiContact.so.5.12.0
+lib/libKF5AkonadiContact.so.5.14.1
 lib/libKF5ContactEditor.so
 lib/libKF5ContactEditor.so.5
-lib/libKF5ContactEditor.so.5.12.0
+lib/libKF5ContactEditor.so.5.14.1
 qt5/mkspecs/modules/qt_AkonadiContact.pri
 qt5/mkspecs/modules/qt_ContactEditor.pri
 qt5/plugins/akonadi/contacts/plugins/categorieseditwidgetplugin.so
diff --git a/akonadi-contacts/buildlink3.mk b/akonadi-contacts/buildlink3.mk
index a7c2c30124..84310bf034 100644
--- a/akonadi-contacts/buildlink3.mk
+++ b/akonadi-contacts/buildlink3.mk
@@ -6,12 +6,11 @@ BUILDLINK_TREE+=	akonadi-contacts
 AKONADI_CONTACTS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi-contacts+=	akonadi-contacts>=17.12.1
-BUILDLINK_ABI_DEPENDS.akonadi-contacts?=		akonadi-contacts>=20.04.1nb1
 BUILDLINK_PKGSRCDIR.akonadi-contacts?=		../../wip/akonadi-contacts
 
 .include "../../wip/akonadi-mime/buildlink3.mk"
-.include "../../misc/kcontacts/buildlink3.mk"
-.include "../../mail/kmime/buildlink3.mk"
+.include "../../wip/kcontacts/buildlink3.mk"
+.include "../../wip/kmime/buildlink3.mk"
 .include "../../graphics/prison/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# AKONADI_CONTACTS_BUILDLINK3_MK
diff --git a/akonadi-contacts/distinfo b/akonadi-contacts/distinfo
index 9671136487..06d46f4b05 100644
--- a/akonadi-contacts/distinfo
+++ b/akonadi-contacts/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (akonadi-contacts-19.08.0.tar.xz) = a12d529dd544a75d555bd7e2412aec55e7a35f12
-RMD160 (akonadi-contacts-19.08.0.tar.xz) = dec2ff04f7ba8489cbd2f6eb2a055deae8c83b75
-SHA512 (akonadi-contacts-19.08.0.tar.xz) = ba243ff53cc67e7aea6d16e4cf83a7559cd87eaaacf228a481eb2aee5bbe86c1139a23633aa78a04e89e6ab8da5e403badc9a5265c6b8f930990bc09d283c27a
-Size (akonadi-contacts-19.08.0.tar.xz) = 385500 bytes
+SHA1 (akonadi-contacts-20.04.1.tar.xz) = e81dd1dc944f6ec3c070c7021df5c724b88a2ed8
+RMD160 (akonadi-contacts-20.04.1.tar.xz) = ae8b6abe4bb13c25b6f5639d0f75bdb64e58f5f1
+SHA512 (akonadi-contacts-20.04.1.tar.xz) = b27cc4f4a2381836f5e3d3f738590f4a77fe4f783e97bfb115f284f6ef0270ec40efcb667fb31b5a4e0d27e3c15c8be595675df65173c117003f784e10e2fc39
+Size (akonadi-contacts-20.04.1.tar.xz) = 393640 bytes