From 68f3009187e22ac7ed63128d49bc0181b8b763aa Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 26 Nov 2019 07:44:08 +0100 Subject: [PATCH 1/2] GIT_SILENT: Prepare 5.13.0RC --- CMakeLists.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 565b58f02..43070f6b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,17 +43,17 @@ endif() set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION} (${KDE_APPLICATIONS_VERSION})") -set(AKONADI_MIMELIB_VERSION "5.12.80") -set(AKONADI_CONTACT_VERSION "5.12.80") -set(CALENDARUTILS_LIB_VERSION "5.12.80") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.12.80") -set(KLDAP_LIB_VERSION "5.12.80") -set(KMAILTRANSPORT_LIB_VERSION "5.12.80") -set(KONTACTINTERFACE_LIB_VERSION "5.12.80") -set(KMIME_LIB_VERSION "5.12.80") -set(KPIMTEXTEDIT_LIB_VERSION "5.12.80") -set(AKONADI_VERSION "5.12.80") -set(KTNEF_LIB_VERSION "5.12.80") +set(AKONADI_MIMELIB_VERSION "5.12.90") +set(AKONADI_CONTACT_VERSION "5.12.90") +set(CALENDARUTILS_LIB_VERSION "5.12.90") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.12.90") +set(KLDAP_LIB_VERSION "5.12.90") +set(KMAILTRANSPORT_LIB_VERSION "5.12.90") +set(KONTACTINTERFACE_LIB_VERSION "5.12.90") +set(KMIME_LIB_VERSION "5.12.90") +set(KPIMTEXTEDIT_LIB_VERSION "5.12.90") +set(AKONADI_VERSION "5.12.90") +set(KTNEF_LIB_VERSION "5.12.90") 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.12.80") -set(MAILCOMMON_LIB_VERSION_LIB "5.12.80") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.12.80") -set(MESSAGELIB_LIB_VERSION_LIB "5.12.80") -set(LIBKLEO_LIB_VERSION_LIB "5.12.80") -set(PIMCOMMON_LIB_VERSION_LIB "5.12.80") -set(LIBKDEPIM_LIB_VERSION_LIB "5.12.80") -set(LIBKSIEVE_LIB_VERSION_LIB "5.12.80") +set(LIBGRAVATAR_VERSION_LIB "5.12.90") +set(MAILCOMMON_LIB_VERSION_LIB "5.12.90") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.12.90") +set(MESSAGELIB_LIB_VERSION_LIB "5.12.90") +set(LIBKLEO_LIB_VERSION_LIB "5.12.90") +set(PIMCOMMON_LIB_VERSION_LIB "5.12.90") +set(LIBKDEPIM_LIB_VERSION_LIB "5.12.90") +set(LIBKSIEVE_LIB_VERSION_LIB "5.12.90") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.12.80" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.12.90" 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 5094d894211f41dbf84ab706164bd7da8035ab6c Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 28 Nov 2019 09:15:12 +0100 Subject: [PATCH 2/2] GIT_SILENT: Reduce deprecated version in release --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43070f6b1..e9a6ab33f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,8 +147,8 @@ if(BUILD_TESTING) endif() if (EXISTS "${CMAKE_SOURCE_DIR}/.git") - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) - #add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000) #Need to find a convert method for KPluginInfo::fromServices + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + #add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) #Need to find a convert method for KPluginInfo::fromServices endif() add_definitions(-DQT_NO_FOREACH) set(CMAKE_CXX_STANDARD 14)