diff -Nru akonadi-mime-18.12.3+p18.10+git20190314.0113/autotests/mailserializertest.cpp akonadi-mime-18.12.3+p18.10+git20190411.0126/autotests/mailserializertest.cpp --- akonadi-mime-18.12.3+p18.10+git20190314.0113/autotests/mailserializertest.cpp 2019-03-14 01:13:53.000000000 +0000 +++ akonadi-mime-18.12.3+p18.10+git20190411.0126/autotests/mailserializertest.cpp 2019-04-11 01:26:38.000000000 +0000 @@ -25,7 +25,7 @@ #include -#include +#include #include using namespace Akonadi; diff -Nru akonadi-mime-18.12.3+p18.10+git20190314.0113/autotests/messagetests/messagetest.cpp akonadi-mime-18.12.3+p18.10+git20190411.0126/autotests/messagetests/messagetest.cpp --- akonadi-mime-18.12.3+p18.10+git20190314.0113/autotests/messagetests/messagetest.cpp 2019-03-14 01:13:53.000000000 +0000 +++ akonadi-mime-18.12.3+p18.10+git20190411.0126/autotests/messagetests/messagetest.cpp 2019-04-11 01:26:38.000000000 +0000 @@ -18,7 +18,7 @@ */ #include "messagetest.h" -#include +#include #include #include #include diff -Nru akonadi-mime-18.12.3+p18.10+git20190314.0113/CMakeLists.txt akonadi-mime-18.12.3+p18.10+git20190411.0126/CMakeLists.txt --- akonadi-mime-18.12.3+p18.10+git20190314.0113/CMakeLists.txt 2019-03-14 01:13:53.000000000 +0000 +++ akonadi-mime-18.12.3+p18.10+git20190411.0126/CMakeLists.txt 2019-04-11 01:26:38.000000000 +0000 @@ -1,14 +1,14 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.10.3") +set(PIM_VERSION "5.11.0") project(Akonadi-Mime VERSION ${PIM_VERSION}) # ECM setup -set(KF5_VERSION "5.51.0") +set(KF5_MIN_VERSION "5.56.0") -find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) +find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(QT_REQUIRED_VERSION "5.9.0") +set(QT_REQUIRED_VERSION "5.10.0") include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) @@ -23,8 +23,8 @@ set(AKONADI_MIME_VERSION ${PIM_VERSION}) -set(AKONADI_VERSION "5.10.3") -set(KF5_MIME_VERSION "5.10.3") +set(AKONADI_VERSION "5.11.0") +set(KF5_MIME_VERSION "5.11.0") ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADIMIME VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-mime_version.h" @@ -33,11 +33,11 @@ ) ########### Find packages ########### -find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) +find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KF5_MIME_VERSION} CONFIG REQUIRED) find_package(KF5ItemModels ${KF5_MIME_VERSION} CONFIG REQUIRED) @@ -56,7 +56,12 @@ ########### Targets ########### -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() add_subdirectory(src) add_subdirectory(serializers) diff -Nru akonadi-mime-18.12.3+p18.10+git20190314.0113/debian/changelog akonadi-mime-18.12.3+p18.10+git20190411.0126/debian/changelog --- akonadi-mime-18.12.3+p18.10+git20190314.0113/debian/changelog 2019-03-14 01:13:54.000000000 +0000 +++ akonadi-mime-18.12.3+p18.10+git20190411.0126/debian/changelog 2019-04-11 01:26:40.000000000 +0000 @@ -1,12 +1,20 @@ -akonadi-mime (4:18.12.3+p18.10+git20190314.0113-0) cosmic; urgency=high +akonadi-mime (4:18.12.3+p18.10+git20190411.0126-0) cosmic; urgency=high - [ Rik Mills ] - * New upstream release (18.12.3) - - [ Kubuntu CI ] * Automatic Ubuntu CI Build - -- Kubuntu CI Thu, 14 Mar 2019 01:13:54 +0000 + -- Kubuntu CI Thu, 11 Apr 2019 01:26:40 +0000 + +akonadi-mime (4:18.12.3-0ubuntu2) disco; urgency=medium + + * No-change rebuild for fixed akonadi server. + + -- Rik Mills Sun, 07 Apr 2019 17:43:55 +0100 + +akonadi-mime (4:18.12.3-0ubuntu1) disco; urgency=medium + + * New upstream release (18.12.3) + + -- Rik Mills Sat, 16 Mar 2019 15:03:39 +0000 akonadi-mime (4:18.04.3-0ubuntu1) cosmic; urgency=medium diff -Nru akonadi-mime-18.12.3+p18.10+git20190314.0113/.gitignore akonadi-mime-18.12.3+p18.10+git20190411.0126/.gitignore --- akonadi-mime-18.12.3+p18.10+git20190314.0113/.gitignore 2019-03-14 01:13:53.000000000 +0000 +++ akonadi-mime-18.12.3+p18.10+git20190411.0126/.gitignore 2019-04-11 01:26:38.000000000 +0000 @@ -4,6 +4,6 @@ *.kdev4 .swp.* .*.swp -/build/ +/build*/ CMakeLists.txt.user* *.unc-backup* diff -Nru akonadi-mime-18.12.3+p18.10+git20190314.0113/src/standardmailactionmanager.cpp akonadi-mime-18.12.3+p18.10+git20190411.0126/src/standardmailactionmanager.cpp --- akonadi-mime-18.12.3+p18.10+git20190314.0113/src/standardmailactionmanager.cpp 2019-03-14 01:13:53.000000000 +0000 +++ akonadi-mime-18.12.3+p18.10+git20190411.0126/src/standardmailactionmanager.cpp 2019-04-11 01:26:38.000000000 +0000 @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include