From 41cd5da108aee3f427ef0896215d6c4c4389a041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Sat, 11 Apr 2020 02:05:05 +0200
Subject: [PATCH] Adapt to move of some Akonadi attributes to AkonadiMime

The Pop3ResourceAttribute and NewMailNotifierAttribute has been moved
from Akonadi to AkonadiMime, since they are all email-specific.
---
 CMakeLists.txt                             | 2 +-
 agents/mailfilteragent/mailfilteragent.cpp | 2 +-
 src/kmsystemtray.cpp                       | 2 +-
 src/unityservicemanager.cpp                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 943e768b3..63924ffe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ endif()
 set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
 
 
-set(AKONADI_MIMELIB_VERSION "5.14.41")
+set(AKONADI_MIMELIB_VERSION "5.14.43")
 set(AKONADI_CONTACT_VERSION "5.14.40")
 set(CALENDARUTILS_LIB_VERSION "5.14.40")
 set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.40")
diff --git a/agents/mailfilteragent/mailfilteragent.cpp b/agents/mailfilteragent/mailfilteragent.cpp
index 2e15c06de..137c327d7 100644
--- a/agents/mailfilteragent/mailfilteragent.cpp
+++ b/agents/mailfilteragent/mailfilteragent.cpp
@@ -24,7 +24,6 @@
 #include "filterlogdialog.h"
 #include "filtermanager.h"
 #include "mailfilteragentadaptor.h"
-#include <AkonadiCore/Pop3ResourceAttribute>
 
 #include <AkonadiCore/ServerManager>
 #include <AkonadiCore/changerecorder.h>
@@ -34,6 +33,7 @@
 #include <AkonadiCore/itemfetchscope.h>
 #include <Akonadi/KMime/MessageParts>
 #include <Akonadi/KMime/MessageStatus>
+#include <Akonadi/KMime/Pop3ResourceAttribute>
 #include <AkonadiCore/session.h>
 #include <MailCommon/MailKernel>
 #include <KLocalizedString>
diff --git a/src/kmsystemtray.cpp b/src/kmsystemtray.cpp
index 3cf182739..f29871d42 100644
--- a/src/kmsystemtray.cpp
+++ b/src/kmsystemtray.cpp
@@ -25,7 +25,7 @@
 #include <MailCommon/MailUtil>
 #include <MailCommon/MailKernel>
 #include <MailCommon/FolderTreeView>
-#include <AkonadiCore/NewMailNotifierAttribute>
+#include <Akonadi/KMime/NewMailNotifierAttribute>
 
 #include <KWindowSystem>
 #include "kmail_debug.h"
diff --git a/src/unityservicemanager.cpp b/src/unityservicemanager.cpp
index 8cede84e1..a5c8051a7 100644
--- a/src/unityservicemanager.cpp
+++ b/src/unityservicemanager.cpp
@@ -38,7 +38,7 @@
 #include <AkonadiCore/EntityTreeModel>
 #include <AkonadiCore/EntityMimeTypeFilterModel>
 #include <AkonadiCore/CollectionStatistics>
-#include <AkonadiCore/NewMailNotifierAttribute>
+#include <Akonadi/KMime/NewMailNotifierAttribute>
 
 using namespace KMail;