diff -Nru kmbox-19.04.3/CMakeLists.txt kmbox-19.12.3/CMakeLists.txt --- kmbox-19.04.3/CMakeLists.txt 2019-06-24 05:01:32.000000000 +0000 +++ kmbox-19.12.3/CMakeLists.txt 2020-02-16 08:58:39.000000000 +0000 @@ -1,29 +1,30 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.11.3") +set(PIM_VERSION "5.13.3") project(KMbox VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.56.0") +set(KF5_MIN_VERSION "5.63.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) include(ECMSetupVersion) include(FeatureSummary) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) set(KMBOX_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIB_VERSION "5.11.3") +set(KMIME_LIB_VERSION "5.13.3") ecm_setup_version(PROJECT VARIABLE_PREFIX KMBOX VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h" @@ -34,12 +35,11 @@ ########### Find packages ########### find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) -# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it) -if (${Qt5Core_VERSION} STRGREATER "5.13") - MESSAGE(STATUS "Qt version: ${Qt5Core_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665") -else() - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) endif() + add_definitions(-DQT_NO_FOREACH) ########### Targets ########### @@ -73,6 +73,6 @@ COMPONENT Devel ) -install( FILES kmbox.renamecategories kmbox.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install(FILES kmbox.renamecategories kmbox.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru kmbox-19.04.3/debian/changelog kmbox-19.12.3/debian/changelog --- kmbox-19.04.3/debian/changelog 2019-07-23 17:55:27.000000000 +0000 +++ kmbox-19.12.3/debian/changelog 2020-04-11 12:58:40.000000000 +0000 @@ -1,3 +1,10 @@ +kmbox (19.12.3-0ubuntu1) focal; urgency=medium + + * Move qdebug categories files to new location. + * New upstream release (19.12.3) + + -- Rik Mills Sat, 11 Apr 2020 13:58:40 +0100 + kmbox (19.04.3-0ubuntu1) eoan; urgency=medium * New upstream release (19.04.3) diff -Nru kmbox-19.04.3/debian/control kmbox-19.12.3/debian/control --- kmbox-19.04.3/debian/control 2019-07-23 17:55:27.000000000 +0000 +++ kmbox-19.12.3/debian/control 2020-04-11 12:58:40.000000000 +0000 @@ -8,7 +8,7 @@ extra-cmake-modules (>= 5.31.0~), libboost-dev, libkf5kdelibs4support-dev (>= 5.31.0~), - libkf5mime-dev (>= 19.04.3~), + libkf5mime-dev (>= 19.12.3~), pkg-kde-tools (>> 0.15.15), qtbase5-dev (>= 5.6.1~), Standards-Version: 3.9.6 @@ -21,7 +21,7 @@ Architecture: any Multi-Arch: same Depends: libkf5mbox5 (= ${binary:Version}), - libkf5mime-dev (>= 19.04.3~), + libkf5mime-dev (>= 19.12.3~), qtbase5-dev (>= 5.6.1~), ${misc:Depends}, Description: library for handling mbox mailboxes - development files diff -Nru kmbox-19.04.3/debian/libkf5mbox5.install kmbox-19.12.3/debian/libkf5mbox5.install --- kmbox-19.04.3/debian/libkf5mbox5.install 2019-07-23 17:55:27.000000000 +0000 +++ kmbox-19.12.3/debian/libkf5mbox5.install 2020-04-11 12:58:40.000000000 +0000 @@ -1,4 +1,4 @@ -etc/xdg/kmbox.categories -etc/xdg/kmbox.renamecategories -usr/lib/*/libKF5Mbox.so.5.* usr/lib/*/libKF5Mbox.so.5 +usr/lib/*/libKF5Mbox.so.5.* +usr/share/qlogging-categories5/kmbox.categories +usr/share/qlogging-categories5/kmbox.renamecategories diff -Nru kmbox-19.04.3/debian/libkf5mbox5.maintscript kmbox-19.12.3/debian/libkf5mbox5.maintscript --- kmbox-19.04.3/debian/libkf5mbox5.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ kmbox-19.12.3/debian/libkf5mbox5.maintscript 2020-04-11 12:58:40.000000000 +0000 @@ -0,0 +1,2 @@ +rm_conffile /etc/xdg/kmbox.categories +rm_conffile /etc/xdg/kmbox.renamecategories diff -Nru kmbox-19.04.3/metainfo.yaml kmbox-19.12.3/metainfo.yaml --- kmbox-19.04.3/metainfo.yaml 2019-06-24 05:01:32.000000000 +0000 +++ kmbox-19.12.3/metainfo.yaml 2020-02-16 08:58:39.000000000 +0000 @@ -14,7 +14,7 @@ libraries: - qmake: Mbox cmake: "KF5::Mbox" - cmakename: KF5Mbox +cmakename: KF5Mbox public_lib: true group: kdepim diff -Nru kmbox-19.04.3/src/mbox.cpp kmbox-19.12.3/src/mbox.cpp --- kmbox-19.04.3/src/mbox.cpp 2019-06-24 05:01:32.000000000 +0000 +++ kmbox-19.12.3/src/mbox.cpp 2020-02-16 08:58:39.000000000 +0000 @@ -203,7 +203,8 @@ // FIXME: What if unlock fails? // if no separator was found, the file is still valid if it is empty - return unlock() && ((prevSeparator.size() != 0) || (d->mMboxFile.size() == 0)); + const bool val = unlock() && (!prevSeparator.isEmpty() || (d->mMboxFile.size() == 0)); + return val; } bool MBox::lock() @@ -565,7 +566,7 @@ bool MBox::save(const QString &fileName) { - if (!fileName.isEmpty() && QUrl(fileName).toLocalFile() != d->mMboxFile.fileName()) { + if (!fileName.isEmpty() && QUrl::fromUserInput(fileName).toLocalFile() != d->mMboxFile.fileName()) { if (!d->mMboxFile.copy(fileName)) { return false; } else { @@ -610,7 +611,6 @@ d->mMboxFile.write(d->mAppendedEntries); d->mAppendedEntries.clear(); d->mInitialMboxFileSize = d->mMboxFile.size(); - return unlock(); } diff -Nru kmbox-19.04.3/src/mboxentry.h kmbox-19.12.3/src/mboxentry.h --- kmbox-19.04.3/src/mboxentry.h 2019-06-24 05:01:32.000000000 +0000 +++ kmbox-19.12.3/src/mboxentry.h 2020-02-16 08:58:39.000000000 +0000 @@ -23,7 +23,6 @@ #include "kmbox_export.h" #include -#include #include #include