From 3ff04d55302b9e74ac34ceddc7d5790da4d6eb4d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Mar 2019 08:08:08 +0100 Subject: [PATCH 1/3] GIT_SILENT made messages (after extraction) --- src/data/org.kde.kmail2.appdata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/org.kde.kmail2.appdata.xml b/src/data/org.kde.kmail2.appdata.xml index cd82e6082..db9357bce 100644 --- a/src/data/org.kde.kmail2.appdata.xml +++ b/src/data/org.kde.kmail2.appdata.xml @@ -23,6 +23,7 @@ Спільнота KDE xxThe KDE Communityxx KDE 社区 + KDE 社群 KMail بريدك KMail @@ -82,6 +83,7 @@ Багата на можливості програма для роботи з електронною пошти xxA feature-rich email applicationxx 功能丰富的电子邮件应用 + 多功能的電子郵件應用程式

KMail is a state-of-the-art email client that integrates well with widely used email providers like GMail. It provides many tools and features to maximize your productivity and makes working with large email accounts easy and fast. KMail supports a large variety of email protocols - POP3, IMAP, Microsoft Exchange (EWS) and more. From c393f56fb1bf9b470ed53aed09a0c0418a7cc2ae Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 25 Mar 2019 08:13:29 +0100 Subject: [PATCH 2/3] GIT_SILENT: Prepare 5.11.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee58ba287..2f499209f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.10.80") +set(KDEPIM_VERSION_NUMBER "5.10.90") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) From c47e4a73e6070dcef2d08ec8a27b1790b2848c7d Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 25 Mar 2019 09:01:02 +0100 Subject: [PATCH 3/3] Workaround qt5.13 bug --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f499209f..195ee7709 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,12 @@ configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ente include_directories(${kmail_SOURCE_DIR} ${kmail_BINARY_DIR}) configure_file(kmail-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h @ONLY) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it) +if (${Qt5Widgets_VERSION} STRGREATER "5.13") + MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665") +else() + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +endif() if (${KF5Config_VERSION} STRGREATER "5.56.0") add_definitions(-DQT_NO_FOREACH) MESSAGE(STATUS "compile without foreach")