head	1.2;
access;
symbols
	pkgsrc-2023Q2:1.1.0.60
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.58
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.56
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.54
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.52
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.50
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.48
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.46
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.44
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.42
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.40
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.38
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.34
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.14
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.36
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.32
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.30
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.28
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.26
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.24
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.22
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.20
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.18
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.16
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.12
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.10
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.8
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.6
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.4
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.2
	pkgsrc-2016Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2023.08.16.22.35.08;	author markd;	state dead;
branches;
next	1.1;
commitid	KjUaInjyGKKNX3BE;

1.1
date	2016.01.10.19.33.04;	author markd;	state Exp;
branches;
next	;
commitid	Mfc3tZLmgBIv9qQy;


desc
@@


1.2
log
@kdepimlibs4: remove

old kde4 version.  nothing now uses it.
@
text
@$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"
@


1.1
log
@Update kdepimlibs4 to 4.14.10

minor updates.
@
text
@d1 1
a1 1
$NetBSD$
@