Update kdepimlibs4 to 4.14.10

minor updates.

8 files changed, 265 insertions, 39 deletions

diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 069ba3f9513..28f7a5e309d 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.71 2015/04/25 14:23:34 tnn Exp $
+# $NetBSD: Makefile,v 1.72 2016/01/10 19:33:04 markd Exp $
 
-DISTNAME=	kdepimlibs-${_KDE_VERSION}
+DISTNAME=	kdepimlibs-4.14.10
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	3
 CATEGORIES=	misc
 COMMENT=	Support libraries for PIM for the KDE integrated X11 desktop
+MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.04.3/src/}
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
diff --git a/misc/kdepimlibs4/PLIST b/misc/kdepimlibs4/PLIST
index fcc44024c0e..f286ada00f5 100644
--- a/misc/kdepimlibs4/PLIST
+++ b/misc/kdepimlibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/11/13 19:19:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/01/10 19:33:04 markd Exp $
 bin/akonadi2xml
 bin/akonaditest
 include/KDE/Akonadi/AgentBase
@@ -163,11 +163,13 @@ include/KDE/KABC/ContactGroup
 include/KDE/KABC/ContactGroupTool
 include/KDE/KABC/DistributionList
 include/KDE/KABC/DistributionListDialog
+include/KDE/KABC/Email
 include/KDE/KABC/EmailSelectDialog
 include/KDE/KABC/ErrorHandler
 include/KDE/KABC/Field
 include/KDE/KABC/Format
 include/KDE/KABC/FormatFactory
+include/KDE/KABC/Gender
 include/KDE/KABC/Geo
 include/KDE/KABC/Key
 include/KDE/KABC/LDIFConverter
@@ -633,12 +635,14 @@ include/akonadi/tag.h
 include/akonadi/tagattribute.h
 include/akonadi/tagcreatejob.h
 include/akonadi/tagdeletejob.h
+include/akonadi/tageditwidget.h
 include/akonadi/tagfetchjob.h
 include/akonadi/tagfetchscope.h
 include/akonadi/tagmanagementdialog.h
 include/akonadi/tagmodel.h
 include/akonadi/tagmodifyjob.h
 include/akonadi/tagselectiondialog.h
+include/akonadi/tagselectwidget.h
 include/akonadi/tagwidget.h
 include/akonadi/transactionjobs.h
 include/akonadi/transactionsequence.h
@@ -694,18 +698,23 @@ include/kabc/addressee.h
 include/kabc/addresseedialog.h
 include/kabc/addresseelist.h
 include/kabc/addresslineedit.h
+include/kabc/calendarurl.h
 include/kabc/contactgroup.h
 include/kabc/contactgrouptool.h
 include/kabc/distributionlist.h
 include/kabc/distributionlistdialog.h
+include/kabc/email.h
 include/kabc/emailselectdialog.h
 include/kabc/errorhandler.h
 include/kabc/field.h
 include/kabc/format.h
 include/kabc/formatfactory.h
+include/kabc/gender.h
 include/kabc/geo.h
+include/kabc/impp.h
 include/kabc/kabc_export.h
 include/kabc/key.h
+include/kabc/lang.h
 include/kabc/ldifconverter.h
 include/kabc/lock.h
 include/kabc/locknull.h
@@ -1107,31 +1116,31 @@ lib/kde4/plugins/designer/akonadiwidgets.so
 lib/kde4/plugins/designer/kholidayswidgets.so
 lib/libakonadi-calendar.so
 lib/libakonadi-calendar.so.4
-lib/libakonadi-calendar.so.${PKGVERSION}
+lib/libakonadi-calendar.so.${KDELIBSVER}
 lib/libakonadi-contact.so
 lib/libakonadi-contact.so.4
-lib/libakonadi-contact.so.${PKGVERSION}
+lib/libakonadi-contact.so.${KDELIBSVER}
 lib/libakonadi-kabc.so
 lib/libakonadi-kabc.so.4
-lib/libakonadi-kabc.so.${PKGVERSION}
+lib/libakonadi-kabc.so.${KDELIBSVER}
 lib/libakonadi-kcal.so
 lib/libakonadi-kcal.so.4
-lib/libakonadi-kcal.so.${PKGVERSION}
+lib/libakonadi-kcal.so.${KDELIBSVER}
 lib/libakonadi-kde.so
 lib/libakonadi-kde.so.4
-lib/libakonadi-kde.so.${PKGVERSION}
+lib/libakonadi-kde.so.${KDELIBSVER}
 lib/libakonadi-kmime.so
 lib/libakonadi-kmime.so.4
-lib/libakonadi-kmime.so.${PKGVERSION}
+lib/libakonadi-kmime.so.${KDELIBSVER}
 lib/libakonadi-notes.so
 lib/libakonadi-notes.so.4
-lib/libakonadi-notes.so.${PKGVERSION}
+lib/libakonadi-notes.so.${KDELIBSVER}
 lib/libakonadi-socialutils.so
 lib/libakonadi-socialutils.so.4
-lib/libakonadi-socialutils.so.${PKGVERSION}
+lib/libakonadi-socialutils.so.${KDELIBSVER}
 lib/libakonadi-xml.so
 lib/libakonadi-xml.so.4
-lib/libakonadi-xml.so.${PKGVERSION}
+lib/libakonadi-xml.so.${KDELIBSVER}
 lib/libgpgme++-pthread.so
 lib/libgpgme++-pthread.so.2
 lib/libgpgme++-pthread.so.2.8.0
@@ -1140,73 +1149,73 @@ lib/libgpgme++.so.2
 lib/libgpgme++.so.2.8.0
 lib/libkabc.so
 lib/libkabc.so.4
-lib/libkabc.so.${PKGVERSION}
+lib/libkabc.so.${KDELIBSVER}
 lib/libkabc_file_core.so
 lib/libkabc_file_core.so.4
-lib/libkabc_file_core.so.${PKGVERSION}
+lib/libkabc_file_core.so.${KDELIBSVER}
 lib/libkalarmcal.so
 lib/libkalarmcal.so.2
 lib/libkalarmcal.so.2.7.0
 lib/libkblog.so
 lib/libkblog.so.4
-lib/libkblog.so.${PKGVERSION}
+lib/libkblog.so.${KDELIBSVER}
 lib/libkcal.so
 lib/libkcal.so.4
-lib/libkcal.so.${PKGVERSION}
+lib/libkcal.so.${KDELIBSVER}
 lib/libkcalcore.so
 lib/libkcalcore.so.4
-lib/libkcalcore.so.${PKGVERSION}
+lib/libkcalcore.so.${KDELIBSVER}
 lib/libkcalutils.so
 lib/libkcalutils.so.4
-lib/libkcalutils.so.${PKGVERSION}
+lib/libkcalutils.so.${KDELIBSVER}
 lib/libkholidays.so
 lib/libkholidays.so.4
-lib/libkholidays.so.${PKGVERSION}
+lib/libkholidays.so.${KDELIBSVER}
 lib/libkimap.so
 lib/libkimap.so.4
-lib/libkimap.so.${PKGVERSION}
+lib/libkimap.so.${KDELIBSVER}
 lib/libkldap.so
 lib/libkldap.so.4
-lib/libkldap.so.${PKGVERSION}
+lib/libkldap.so.${KDELIBSVER}
 lib/libkmbox.so
 lib/libkmbox.so.4
-lib/libkmbox.so.${PKGVERSION}
+lib/libkmbox.so.${KDELIBSVER}
 lib/libkmime.so
 lib/libkmime.so.4
-lib/libkmime.so.${PKGVERSION}
+lib/libkmime.so.${KDELIBSVER}
 lib/libkontactinterface.so
 lib/libkontactinterface.so.4
-lib/libkontactinterface.so.${PKGVERSION}
+lib/libkontactinterface.so.${KDELIBSVER}
 lib/libkpimidentities.so
 lib/libkpimidentities.so.4
-lib/libkpimidentities.so.${PKGVERSION}
+lib/libkpimidentities.so.${KDELIBSVER}
 lib/libkpimtextedit.so
 lib/libkpimtextedit.so.4
-lib/libkpimtextedit.so.${PKGVERSION}
+lib/libkpimtextedit.so.${KDELIBSVER}
 lib/libkpimutils.so
 lib/libkpimutils.so.4
-lib/libkpimutils.so.${PKGVERSION}
+lib/libkpimutils.so.${KDELIBSVER}
 lib/libkresources.so
 lib/libkresources.so.4
-lib/libkresources.so.${PKGVERSION}
+lib/libkresources.so.${KDELIBSVER}
 lib/libktnef.so
 lib/libktnef.so.4
-lib/libktnef.so.${PKGVERSION}
+lib/libktnef.so.${KDELIBSVER}
 lib/libkxmlrpcclient.so
 lib/libkxmlrpcclient.so.4
-lib/libkxmlrpcclient.so.${PKGVERSION}
+lib/libkxmlrpcclient.so.${KDELIBSVER}
 lib/libmailtransport.so
 lib/libmailtransport.so.4
-lib/libmailtransport.so.${PKGVERSION}
+lib/libmailtransport.so.${KDELIBSVER}
 lib/libmicroblog.so
 lib/libmicroblog.so.4
-lib/libmicroblog.so.${PKGVERSION}
+lib/libmicroblog.so.${KDELIBSVER}
 lib/libqgpgme.so
 lib/libqgpgme.so.1
 lib/libqgpgme.so.1.0.1
 lib/libsyndication.so
 lib/libsyndication.so.4
-lib/libsyndication.so.${PKGVERSION}
+lib/libsyndication.so.${KDELIBSVER}
 share/akonadi/agents/knutresource.desktop
 share/dbus-1/interfaces/org.kde.KResourcesManager.xml
 share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index a9ac0780ce3..ef828ac36da 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.32 2015/11/03 23:49:39 agc Exp $
+$NetBSD: distinfo,v 1.33 2016/01/10 19:33:04 markd Exp $
 
-SHA1 (kdepimlibs-4.14.3.tar.xz) = bbfff3ea5775bfb0f1692828c679e549deaf4fb3
-RMD160 (kdepimlibs-4.14.3.tar.xz) = 95af39ad4848fe48efbd4e3be8b4b0767530ec60
-SHA512 (kdepimlibs-4.14.3.tar.xz) = 0106f3b03cb7541f54fe568276ca3e5c5d14da244b8b1e73a9a34ca1b1f3b6d2ce3922cb499d79fca53f27429c84f1fcb1472fa3b9df80531cd1542825aa27d7
-Size (kdepimlibs-4.14.3.tar.xz) = 2790888 bytes
+SHA1 (kdepimlibs-4.14.10.tar.xz) = 8db2f59b8a33f4d1bbebfdff8b772d30669c9932
+RMD160 (kdepimlibs-4.14.10.tar.xz) = 4df52569c41b3af12aaf6f457e213f31feb78343
+SHA512 (kdepimlibs-4.14.10.tar.xz) = 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a
+Size (kdepimlibs-4.14.10.tar.xz) = 2831160 bytes
+SHA1 (patch-akonadi_itemsync.cpp) = c033adc348bd9c881bfcbc4c7344d028d4678472
+SHA1 (patch-akonadi_itemsync.h) = 9e5a300958754f69be5310c822ecf5da180a4bf5
+SHA1 (patch-akonadi_resourcebase.cpp) = b0195b6f6ec2a56d7fdcd2bf79a87236d601da32
+SHA1 (patch-akonadi_resourcebase.h) = e0a6910c198ace215631dffb380cb67e15061927
+SHA1 (patch-akonadi_tests_itemsynctest.cpp) = 309873e79d59ae81021a88db725ce63769ec0160
 SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
 SHA1 (patch-kblog_CMakeLists.txt) = b03068672c39492ef4883125c65f7951c7cc8f01
 SHA1 (patch-kimap_loginjob.cpp) = 8a0fe3c1779b981d9c9ca6cb34121219f2f97c9f
diff --git a/misc/kdepimlibs4/patches/patch-akonadi_itemsync.cpp b/misc/kdepimlibs4/patches/patch-akonadi_itemsync.cpp
new file mode 100644
index 00000000000..489ed1d44f2
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-akonadi_itemsync.cpp
@@ -0,0 +1,58 @@
+$NetBSD: patch-akonadi_itemsync.cpp,v 1.1 2016/01/10 19:33:04 markd Exp $
+
+kdepimlibs4-bug338658-[12].patch
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=4429619&o=plain
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=d8b5da7&o=plain
+
+--- akonadi/itemsync.cpp.orig	2016-01-08 23:32:29.000000000 +0000
++++ akonadi/itemsync.cpp
+@@ -61,6 +61,7 @@ public:
+         , mProcessingBatch(false)
+         , mDisableAutomaticDeliveryDone(false)
+         , mBatchSize(10)
++        , mMergeMode(Akonadi::ItemSync::RIDMerge)
+     {
+         // we want to fetch all data by default
+         mFetchScope.fetchFullPayload();
+@@ -116,6 +117,7 @@ public:
+     bool mDisableAutomaticDeliveryDone;
+ 
+     int mBatchSize;
++    Akonadi::ItemSync::MergeMode mMergeMode;
+ };
+ 
+ void ItemSyncPrivate::createOrMerge(const Item &item)
+@@ -127,11 +129,13 @@ void ItemSyncPrivate::createOrMerge(cons
+     }
+     mPendingJobs++;
+     ItemCreateJob *create = new ItemCreateJob(item, mSyncCollection, subjobParent());
+-    if (!item.gid().isEmpty()) {
+-        create->setMerge(ItemCreateJob::GID|ItemCreateJob::Silent);
++    ItemCreateJob::MergeOptions merge = ItemCreateJob::Silent;
++    if (mMergeMode == ItemSync::GIDMerge && !item.gid().isEmpty()) {
++        merge |= ItemCreateJob::GID;
+     } else {
+-        create->setMerge(ItemCreateJob::RID|ItemCreateJob::Silent);
++        merge |= ItemCreateJob::RID;
+     }
++    create->setMerge(merge);
+     q->connect(create, SIGNAL(result(KJob*)), q, SLOT(slotLocalChangeDone(KJob*)));
+ }
+ 
+@@ -534,5 +538,16 @@ void ItemSync::setBatchSize(int size)
+     d->mBatchSize = size;
+ }
+ 
++ItemSync::MergeMode ItemSync::mergeMode() const
++{
++    Q_D(const ItemSync);
++    return d->mMergeMode;
++}
++
++void ItemSync::setMergeMode(MergeMode mergeMode)
++{
++    Q_D(ItemSync);
++    d->mMergeMode = mergeMode;
++}
+ 
+ #include "moc_itemsync.cpp"
diff --git a/misc/kdepimlibs4/patches/patch-akonadi_itemsync.h b/misc/kdepimlibs4/patches/patch-akonadi_itemsync.h
new file mode 100644
index 00000000000..191917ac123
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-akonadi_itemsync.h
@@ -0,0 +1,49 @@
+$NetBSD: patch-akonadi_itemsync.h,v 1.1 2016/01/10 19:33:04 markd Exp $
+
+kdepimlibs4-bug338658-[12].patch
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=4429619&o=plain
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=d8b5da7&o=plain
+ 
+--- akonadi/itemsync.h.orig	2015-06-24 12:43:14.000000000 +0000
++++ akonadi/itemsync.h
+@@ -56,6 +56,12 @@ class AKONADI_EXPORT ItemSync : public J
+     Q_OBJECT
+ 
+ public:
++    enum MergeMode
++    {
++        RIDMerge,
++        GIDMerge
++    };
++
+     /**
+      * Creates a new item synchronizer.
+      *
+@@ -209,6 +215,27 @@ public:
+      */
+     void setDisableAutomaticDeliveryDone(bool disable);
+ 
++    /**
++     * Returns current merge mode
++     *
++     * @see setMergeMode()
++     * @since 5.1
++     */
++    MergeMode mergeMode() const;
++
++    /**
++     * Set what merge method should be used for next ItemSync run
++     *
++     * By default ItemSync uses RIDMerge method.
++     *
++     * See ItemCreateJob for details on Item merging.
++     *
++     * @note You must call this method before starting the sync, changes afterwards lead to undefined results.
++     * @see mergeMode
++     * @since 4.14.11
++     */
++    void setMergeMode(MergeMode mergeMode);
++
+ Q_SIGNALS:
+     /**
+      * Signals the resource that new items can be delivered.
diff --git a/misc/kdepimlibs4/patches/patch-akonadi_resourcebase.cpp b/misc/kdepimlibs4/patches/patch-akonadi_resourcebase.cpp
new file mode 100644
index 00000000000..6e6dc0f2d99
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-akonadi_resourcebase.cpp
@@ -0,0 +1,45 @@
+$NetBSD: patch-akonadi_resourcebase.cpp,v 1.1 2016/01/10 19:33:04 markd Exp $
+
+kdepimlibs4-bug338658-[12].patch
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=4429619&o=plain
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=d8b5da7&o=plain
+
+--- akonadi/resourcebase.cpp.orig	2015-06-24 12:43:14.000000000 +0000
++++ akonadi/resourcebase.cpp
+@@ -75,6 +75,7 @@ public:
+         , mItemSyncer(0)
+         , mItemSyncFetchScope(0)
+         , mItemTransactionMode(ItemSync::SingleTransaction)
++        , mItemMergeMode(ItemSync::RIDMerge)
+         , mCollectionSyncer(0)
+         , mHierarchicalRid(false)
+         , mUnemittedProgress(0)
+@@ -179,6 +180,7 @@ public:
+             mItemSyncer = new ItemSync(q->currentCollection());
+             mItemSyncer->setTransactionMode(mItemTransactionMode);
+             mItemSyncer->setBatchSize(mItemSyncBatchSize);
++            mItemSyncer->setMergeMode(mItemMergeMode);
+             if (mItemSyncFetchScope) {
+                 mItemSyncer->setFetchScope(*mItemSyncFetchScope);
+             }
+@@ -448,6 +450,7 @@ public:
+     ItemSync *mItemSyncer;
+     ItemFetchScope *mItemSyncFetchScope;
+     ItemSync::TransactionMode mItemTransactionMode;
++    ItemSync::MergeMode mItemMergeMode;
+     CollectionSync *mCollectionSyncer;
+     bool mHierarchicalRid;
+     QTimer mProgressEmissionCompressor;
+@@ -1314,6 +1317,12 @@ void ResourceBase::setItemSynchronizatio
+     *(d->mItemSyncFetchScope) = fetchScope;
+ }
+ 
++void ResourceBase::setItemMergingMode(ItemSync::MergeMode mode)
++{
++    Q_D(ResourceBase);
++    d->mItemMergeMode = mode;
++}
++
+ void ResourceBase::setAutomaticProgressReporting(bool enabled)
+ {
+     Q_D(ResourceBase);
diff --git a/misc/kdepimlibs4/patches/patch-akonadi_resourcebase.h b/misc/kdepimlibs4/patches/patch-akonadi_resourcebase.h
new file mode 100644
index 00000000000..d0eeadc8a5d
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-akonadi_resourcebase.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-akonadi_resourcebase.h,v 1.1 2016/01/10 19:33:04 markd Exp $
+
+kdepimlibs4-bug338658-[12].patch
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=4429619&o=plain
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=d8b5da7&o=plain
+ 
+--- akonadi/resourcebase.h.orig	2015-06-24 12:43:14.000000000 +0000
++++ akonadi/resourcebase.h
+@@ -530,6 +530,20 @@ protected:
+     void setItemTransactionMode(ItemSync::TransactionMode mode);
+ 
+     /**
++     * Set merge mode for item sync'ing.
++     *
++     * Default merge mode is RIDMerge.
++     *
++     * @note This method must be called before first call to itemRetrieved(),
++     * itemsRetrieved() or itemsRetrievedIncremental().
++     *
++     * @param mode Item merging mode (see ItemCreateJob for details on item merging)
++     * @see Akonadi::ItemSync::MergeMode
++     * @ince 4.14.11
++     */
++    void setItemMergingMode(ItemSync::MergeMode mode);
++
++    /**
+      * Set the fetch scope applied for item synchronization.
+      * By default, the one set on the changeRecorder() is used. However, it can make sense
+      * to specify a specialized fetch scope for synchronization to improve performance.
diff --git a/misc/kdepimlibs4/patches/patch-akonadi_tests_itemsynctest.cpp b/misc/kdepimlibs4/patches/patch-akonadi_tests_itemsynctest.cpp
new file mode 100644
index 00000000000..9521bc8cd2e
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-akonadi_tests_itemsynctest.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-akonadi_tests_itemsynctest.cpp,v 1.1 2016/01/10 19:33:04 markd Exp $
+
+kdepimlibs4-bug338658-[12].patch
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=4429619&o=plain
+https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=d8b5da7&o=plain
+
+--- akonadi/tests/itemsynctest.cpp.orig	2015-06-24 12:43:14.000000000 +0000
++++ akonadi/tests/itemsynctest.cpp
+@@ -438,14 +438,19 @@ class ItemsyncTest : public QObject
+        AKVERIFYEXEC(syncer);
+ 
+        Item::List resultItems = fetchItems(col);
+-       QCOMPARE(resultItems.count(), 2);
++       QCOMPARE(resultItems.count(), 3);
+ 
+-       ItemFetchJob *fetchJob = new ItemFetchJob(modifiedItem);
++       Item item;
++       item.setGid(QLatin1String("gid2"));
++       ItemFetchJob *fetchJob = new ItemFetchJob(item);
+        fetchJob->fetchScope().fetchFullPayload();
+        AKVERIFYEXEC(fetchJob);
+-       QCOMPARE(fetchJob->items().size(), 1);
++       QCOMPARE(fetchJob->items().size(), 2);
+        QCOMPARE(fetchJob->items().first().payload<QByteArray>(), QByteArray("payload2"));
+        QCOMPARE(fetchJob->items().first().remoteId(), QString::fromLatin1("rid3"));
++       QCOMPARE(fetchJob->items().first().remoteId(), QLatin1String("rid3"));
++       QCOMPARE(fetchJob->items().at(1).payload<QByteArray>(), QByteArray("payload1"));
++       QCOMPARE(fetchJob->items().at(1).remoteId(), QLatin1String("rid2"));
+     }
+ 
+     /*