From e2493e04d93095a5704d55435232c8cc10e100dc Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Thu, 30 Apr 2020 07:11:35 +0200
Subject: [PATCH 1/3] GIT_SILENT: Prepare 5.14.1

---
 CMakeLists.txt | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0cd03d49..9723d2d7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,17 +43,17 @@ endif()
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
 
 
-set(AKONADI_MIMELIB_VERSION "5.14.0")
-set(AKONADI_CONTACT_VERSION "5.14.0")
-set(CALENDARUTILS_LIB_VERSION "5.14.0")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.0")
-set(KLDAP_LIB_VERSION "5.14.0")
-set(KMAILTRANSPORT_LIB_VERSION "5.14.0")
-set(KONTACTINTERFACE_LIB_VERSION "5.14.0")
-set(KMIME_LIB_VERSION "5.14.0")
-set(KPIMTEXTEDIT_LIB_VERSION "5.14.0")
-set(AKONADI_VERSION "5.14.0")
-set(KTNEF_LIB_VERSION "5.14.0")
+set(AKONADI_MIMELIB_VERSION "5.14.1")
+set(AKONADI_CONTACT_VERSION "5.14.1")
+set(CALENDARUTILS_LIB_VERSION "5.14.1")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.1")
+set(KLDAP_LIB_VERSION "5.14.1")
+set(KMAILTRANSPORT_LIB_VERSION "5.14.1")
+set(KONTACTINTERFACE_LIB_VERSION "5.14.1")
+set(KMIME_LIB_VERSION "5.14.1")
+set(KPIMTEXTEDIT_LIB_VERSION "5.14.1")
+set(AKONADI_VERSION "5.14.1")
+set(KTNEF_LIB_VERSION "5.14.1")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
@@ -64,18 +64,18 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc
 option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
-set(LIBGRAVATAR_VERSION_LIB "5.14.0")
-set(MAILCOMMON_LIB_VERSION_LIB "5.14.0")
-set(KDEPIM_APPS_LIB_VERSION_LIB "5.14.0")
-set(MESSAGELIB_LIB_VERSION_LIB "5.14.0")
-set(LIBKLEO_LIB_VERSION_LIB "5.14.0")
-set(PIMCOMMON_LIB_VERSION_LIB "5.14.0")
+set(LIBGRAVATAR_VERSION_LIB "5.14.1")
+set(MAILCOMMON_LIB_VERSION_LIB "5.14.1")
+set(KDEPIM_APPS_LIB_VERSION_LIB "5.14.1")
+set(MESSAGELIB_LIB_VERSION_LIB "5.14.1")
+set(LIBKLEO_LIB_VERSION_LIB "5.14.1")
+set(PIMCOMMON_LIB_VERSION_LIB "5.14.1")
 set(LIBKDEPIM_LIB_VERSION_LIB "5.14.1")
-set(LIBKSIEVE_LIB_VERSION_LIB "5.14.0")
+set(LIBKSIEVE_LIB_VERSION_LIB "5.14.1")
 
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
 
-find_package(KF5AkonadiSearch "5.14.0" CONFIG REQUIRED)
+find_package(KF5AkonadiSearch "5.14.1" CONFIG REQUIRED)
 set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
 
 set(GPGMEPP_LIB_VERSION "1.11.1")

From 51f19c8996c3db2e1b5105893cb78fdba8542e23 Mon Sep 17 00:00:00 2001
From: Christoph Feck <cfeck@kde.org>
Date: Mon, 11 May 2020 23:34:49 +0200
Subject: [PATCH 2/3] GIT_SILENT Update Appstream for new release

---
 src/data/org.kde.kmail2.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/org.kde.kmail2.appdata.xml b/src/data/org.kde.kmail2.appdata.xml
index 0e1083958..87126223a 100644
--- a/src/data/org.kde.kmail2.appdata.xml
+++ b/src/data/org.kde.kmail2.appdata.xml
@@ -245,9 +245,9 @@
     <binary>kmail</binary>
   </provides>
   <releases>
+    <release version="5.14.1" date="2020-05-14"/>
     <release version="5.14.0" date="2020-04-23"/>
     <release version="5.13.3" date="2020-03-05"/>
     <release version="5.13.2" date="2020-02-06"/>
-    <release version="5.13.1" date="2020-01-09"/>
   </releases>
 </component>

From 2e0971c20ee0a0a74b486dd2b24407a496f5bf71 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 13 May 2020 00:55:09 +0200
Subject: [PATCH 3/3] Add obviously missing assignment (of mimeype name)

(cherry picked from commit f5b05b00ff39bcc4fa9afbb82b47e026d73240b7)
---
 ktnef/src/ktnefmain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktnef/src/ktnefmain.cpp b/ktnef/src/ktnefmain.cpp
index 346401d1f..7977a704f 100644
--- a/ktnef/src/ktnefmain.cpp
+++ b/ktnef/src/ktnefmain.cpp
@@ -245,7 +245,7 @@ void KTNEFMain::viewFile()
         if (mimename.isEmpty() || mimename == QLatin1String("application/octet-stream")) {
             qCDebug(KTNEFAPPS_LOG) << "No mime type found in attachment object, trying to guess...";
             QMimeDatabase db;
-            db.mimeTypeForFile(url.path(), QMimeDatabase::MatchExtension).name();
+            mimename = db.mimeTypeForFile(url.path(), QMimeDatabase::MatchExtension).name();
             qCDebug(KTNEFAPPS_LOG) << "Detected mime type: " << mimename;
         } else {
             qCDebug(KTNEFAPPS_LOG) << "Mime type from attachment object: " << mimename;