From 3915a240b4b0436a636c6134c1436e0854156402 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 9 Oct 2020 07:25:51 +0200 Subject: [PATCH 1/4] GIT_SILENT: prepare 5.15.3 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 296278e02..3958e7bef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.15.2") +set(PIM_VERSION "5.15.3") project(kmail VERSION ${PIM_VERSION}) @@ -33,7 +33,7 @@ include(ECMQtDeclareLoggingCategory) # Do NOT add quote set(KDEPIM_DEV_VERSION) -set(RELEASE_SERVICE_VERSION "20.08.2") +set(RELEASE_SERVICE_VERSION "20.08.3") # add an extra space if(DEFINED KDEPIM_DEV_VERSION) From 0994bf09bf4a3f087dcf055a34cc727919e659c9 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 10 Oct 2020 21:59:07 +0200 Subject: [PATCH 2/4] GIT_SILENT: prepare 5.15.3 --- CMakeLists.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3958e7bef..6cb0c8a46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,17 +43,17 @@ endif() set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") -set(AKONADI_MIMELIB_VERSION "5.15.2") -set(AKONADI_CONTACT_VERSION "5.15.2") -set(CALENDARUTILS_LIB_VERSION "5.15.2") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.15.2") -set(KLDAP_LIB_VERSION "5.15.2") -set(KMAILTRANSPORT_LIB_VERSION "5.15.2") -set(KONTACTINTERFACE_LIB_VERSION "5.15.2") -set(KMIME_LIB_VERSION "5.15.2") -set(KPIMTEXTEDIT_LIB_VERSION "5.15.2") -set(AKONADI_VERSION "5.15.2") -set(KTNEF_LIB_VERSION "5.15.2") +set(AKONADI_MIMELIB_VERSION "5.15.3") +set(AKONADI_CONTACT_VERSION "5.15.3") +set(CALENDARUTILS_LIB_VERSION "5.15.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.15.3") +set(KLDAP_LIB_VERSION "5.15.3") +set(KMAILTRANSPORT_LIB_VERSION "5.15.3") +set(KONTACTINTERFACE_LIB_VERSION "5.15.3") +set(KMIME_LIB_VERSION "5.15.3") +set(KPIMTEXTEDIT_LIB_VERSION "5.15.3") +set(AKONADI_VERSION "5.15.3") +set(KTNEF_LIB_VERSION "5.15.3") set(KDEPIM_LIB_VERSION "${PIM_VERSION}") set(KDEPIM_LIB_SOVERSION "5") @@ -64,17 +64,17 @@ 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.15.2") -set(MAILCOMMON_LIB_VERSION_LIB "5.15.2") -set(MESSAGELIB_LIB_VERSION_LIB "5.15.2") -set(LIBKLEO_LIB_VERSION_LIB "5.15.2") -set(PIMCOMMON_LIB_VERSION_LIB "5.15.2") -set(LIBKDEPIM_LIB_VERSION_LIB "5.15.2") -set(LIBKSIEVE_LIB_VERSION_LIB "5.15.2") +set(LIBGRAVATAR_VERSION_LIB "5.15.3") +set(MAILCOMMON_LIB_VERSION_LIB "5.15.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.15.3") +set(LIBKLEO_LIB_VERSION_LIB "5.15.3") +set(PIMCOMMON_LIB_VERSION_LIB "5.15.3") +set(LIBKDEPIM_LIB_VERSION_LIB "5.15.3") +set(LIBKSIEVE_LIB_VERSION_LIB "5.15.3") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.15.2" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.15.3" 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 15a5bed7d04cd65554e31eb7c5eb208bb27d1996 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Oct 2020 09:41:02 +0200 Subject: [PATCH 3/4] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/data/kmail2.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index 089cf8b63..0a1a56f7c 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -509,6 +509,7 @@ Name[fr]=Courriel ajouté à la liste des courriels à envoyer plus tard Name[it]=Messaggio di posta aggiunto alla coda di invio posticipato Name[ko]=이메일이 나중에 보내기 대기열에 추가됨 Name[nl]=E-mail toegevoegd aan de rij Later verzenden +Name[pl]=Dodano wiadomość do kolejki wysyłania Name[pt]=E-mail adicionado à fila de espera para envio posterior Name[pt_BR]=E-mail adicionado à fila de enviar mais tarde Name[ru]=Письмо добавлено в очередь отложенной доставки @@ -530,6 +531,7 @@ Comment[fr]=Un envoi de courriel différé est configuré et peut être annulé Comment[it]=Una consegna posticipata di un messaggio è ora configurata e può essere annullata Comment[ko]=지연된 이메일 전송이 설정되었고 취소할 수 있음 Comment[nl]=Er is een vertraagde e-mail aflevering geconfigureerd en deze kan geannuleerd worden +Comment[pl]=Opóźnione wysyłanie wiadomości jest włączone i możne je wyłączyć Comment[pt]=Está configurada uma entrega de e-mail posterior e pode ser cancelada Comment[pt_BR]=Uma entrega de e-mails atrasada está configurada e pode ser cancelada. Comment[ru]=Отложенная отправка письма уже запланирована и не может быть отменена From a4715e7efc0909c6e37dbbcf21c4309c769a1fd9 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 15 Oct 2020 07:33:41 +0200 Subject: [PATCH 4/4] Fix Bug 427697 - KMail did not apply data from mailto information. Add missing in-reply-to support BUG: 427697 FIXED-IN: 5.15.3 --- src/job/opencomposerjob.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/job/opencomposerjob.cpp b/src/job/opencomposerjob.cpp index cccc776a3..d1254f631 100644 --- a/src/job/opencomposerjob.cpp +++ b/src/job/opencomposerjob.cpp @@ -80,6 +80,10 @@ void OpenComposerJob::start() if (!mOpenComposerSettings.mReplyTo.isEmpty()) { mMsg->replyTo()->fromUnicodeString(mOpenComposerSettings.mReplyTo, "utf-8"); } + if (!mOpenComposerSettings.mInReplyTo.isEmpty()) { + mMsg->inReplyTo()->fromUnicodeString(mOpenComposerSettings.mInReplyTo, "utf-8"); + } + if (!mOpenComposerSettings.mMessageFile.isEmpty() && QFile::exists(mOpenComposerSettings.mMessageFile)) { QFile f(mOpenComposerSettings.mMessageFile); @@ -120,7 +124,7 @@ void OpenComposerJob::slotOpenComposer() if (!mOpenComposerSettings.mTo.isEmpty()) { cWin->setFocusToSubject(); } - QList attachURLs = QUrl::fromStringList(mOpenComposerSettings.mAttachmentPaths); + const QList attachURLs = QUrl::fromStringList(mOpenComposerSettings.mAttachmentPaths); QList::ConstIterator endAttachment(attachURLs.constEnd()); QList infoList; for (QList::ConstIterator it = attachURLs.constBegin(); it != endAttachment; ++it) {