Hello community, here is the log from the commit of package akonadi-mime for openSUSE:Factory checked in at 2020-04-25 20:20:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-mime (Old) and /work/SRC/openSUSE:Factory/.akonadi-mime.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-mime" Sat Apr 25 20:20:42 2020 rev:45 rq:796837 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-mime/akonadi-mime.changes 2020-03-11 18:35:09.055001916 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-mime.new.2738/akonadi-mime.changes 2020-04-25 20:21:17.809152571 +0200 @@ -1,0 +2,29 @@ +Thu Apr 23 12:21:46 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:29:33 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- No code change since 20.03.80 + +------------------------------------------------------------------- +Sun Mar 22 09:16:28 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * Autogenerate categories file + * Remove usage of KDBusConnectionPool + +------------------------------------------------------------------- Old: ---- akonadi-mime-19.12.3.tar.xz akonadi-mime-19.12.3.tar.xz.sig New: ---- akonadi-mime-20.04.0.tar.xz akonadi-mime-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-mime.spec ++++++ --- /var/tmp/diff_new_pack.lVbGWZ/_old 2020-04-25 20:21:18.417153825 +0200 +++ /var/tmp/diff_new_pack.lVbGWZ/_new 2020-04-25 20:21:18.421153833 +0200 @@ -22,17 +22,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-mime -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: MIME email parser for KDE PIM License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libxslt-devel @@ -48,6 +44,10 @@ BuildRequires: cmake(Qt5Test) >= 5.6.0 BuildRequires: cmake(Qt5Widgets) >= 5.6.0 Recommends: %{name}-lang +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description This package provides libraries needed for the correct parsing of email messages. ++++++ akonadi-mime-19.12.3.tar.xz -> akonadi-mime-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/.gitignore new/akonadi-mime-20.04.0/.gitignore --- old/akonadi-mime-19.12.3/.gitignore 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/.gitignore 2020-04-06 06:57:18.000000000 +0200 @@ -1,9 +1,20 @@ # Ignore the following files *~ *.[oa] +*.diff +*.kate-swp *.kdev4 -.swp.* +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user .*.swp +.swp.* +Doxyfile +Makefile /build*/ +.cmake/ CMakeLists.txt.user* *.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/CMakeLists.txt new/akonadi-mime-20.04.0/CMakeLists.txt --- old/akonadi-mime-19.12.3/CMakeLists.txt 2020-03-03 01:33:07.000000000 +0100 +++ new/akonadi-mime-20.04.0/CMakeLists.txt 2020-04-17 02:38:25.000000000 +0200 @@ -1,14 +1,14 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.13.3") +set(PIM_VERSION "5.14.0") project(Akonadi-Mime VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.63.0") +set(KF5_MIN_VERSION "5.68.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.12.0") include(KDEInstallDirs) include(KDECMakeSettings) @@ -23,8 +23,8 @@ include(ECMQtDeclareLoggingCategory) set(AKONADI_MIME_VERSION ${PIM_VERSION}) -set(AKONADI_VERSION "5.13.3") -set(KF5_MIME_VERSION "5.13.3") +set(AKONADI_VERSION "5.14.0") +set(KF5_MIME_VERSION "5.14.0") ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADIMIME VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-mime_version.h" @@ -35,7 +35,6 @@ ########### Find packages ########### find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -59,7 +58,7 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() add_definitions(-DQT_NO_FOREACH) @@ -102,7 +101,12 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install(FILES akonadi-mime.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +ecm_qt_install_logging_categories( + EXPORT AKONADIMIME + FILE akonadi-mime.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} + ) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/akonadi-mime.categories new/akonadi-mime-20.04.0/akonadi-mime.categories --- old/akonadi-mime-19.12.3/akonadi-mime.categories 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/akonadi-mime.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.pim.akonadi_serializer_mail akonadi-mime (akonadi_serializer_mail) IDENTIFIER [AKONADI_SERIALIZER_MAIL_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/autotests/benchmarker/CMakeLists.txt new/akonadi-mime-20.04.0/autotests/benchmarker/CMakeLists.txt --- old/akonadi-mime-19.12.3/autotests/benchmarker/CMakeLists.txt 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/autotests/benchmarker/CMakeLists.txt 2020-04-06 06:57:18.000000000 +0200 @@ -24,9 +24,9 @@ KF5::Mime Qt5::Test KF5::AkonadiCore - KF5::DBusAddons KF5::I18n Qt5::Widgets + Qt5::DBus ) install(TARGETS akonadi_benchmarker ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/autotests/benchmarker/maketest.cpp new/akonadi-mime-20.04.0/autotests/benchmarker/maketest.cpp --- old/akonadi-mime-19.12.3/autotests/benchmarker/maketest.cpp 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/autotests/benchmarker/maketest.cpp 2020-04-06 06:57:18.000000000 +0200 @@ -20,8 +20,6 @@ #include "test.h" -#include "KDBusConnectionPool" - #include <agentinstancecreatejob.h> #include <collectiondeletejob.h> #include <collectionfetchjob.h> @@ -29,6 +27,7 @@ #include <QDebug> #include <QTest> +#include <QDBusConnection> #include <QDBusInterface> using namespace Akonadi; @@ -62,7 +61,7 @@ void MakeTest::configureDBusIface(const QString &name, const QString &dir) { QDBusInterface *configIface = new QDBusInterface(QLatin1String("org.freedesktop.Akonadi.Resource.") + currentInstance.identifier(), - QStringLiteral("/Settings"), QLatin1String("org.kde.Akonadi.") + name + QLatin1String(".Settings"), KDBusConnectionPool::threadConnection(), this); + QStringLiteral("/Settings"), QLatin1String("org.kde.Akonadi.") + name + QLatin1String(".Settings"), QDBusConnection::sessionBus(), this); configIface->call(QStringLiteral("setPath"), dir); configIface->call(QStringLiteral("setReadOnly"), true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/autotests/localfolderstest.cpp new/akonadi-mime-20.04.0/autotests/localfolderstest.cpp --- old/akonadi-mime-19.12.3/autotests/localfolderstest.cpp 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/autotests/localfolderstest.cpp 2020-04-06 06:57:18.000000000 +0200 @@ -20,9 +20,9 @@ #include "localfolderstest.h" #include "collectionpathresolver.h" -#include "kdbusconnectionpool.h" #include "specialmailcollectionssettings.h" +#include <QDBusConnection> #include <QDBusConnectionInterface> #include <QFile> #include <QSignalSpy> @@ -91,13 +91,13 @@ } // Initially not locked. - QVERIFY(!KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName)); + QVERIFY(!QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName)); // Get the lock. { GetLockJob *ljob = new GetLockJob(this); AKVERIFYEXEC(ljob); - QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName)); + QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName)); } // Getting the lock again should fail. @@ -107,9 +107,9 @@ } // Release the lock. - QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName)); + QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName)); releaseLock(); - QVERIFY(!KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName)); + QVERIFY(!QDBusConnection::sessionBus().interface()->isServiceRegistered(dbusName)); } void LocalFoldersTest::testInitialState() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/po/en_GB/libakonadi-kmime5.po new/akonadi-mime-20.04.0/po/en_GB/libakonadi-kmime5.po --- old/akonadi-mime-19.12.3/po/en_GB/libakonadi-kmime5.po 2020-03-03 01:33:05.000000000 +0100 +++ new/akonadi-mime-20.04.0/po/en_GB/libakonadi-kmime5.po 2020-04-17 02:38:24.000000000 +0200 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2017-12-29 15:41+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" -"Language-Team: British English <kde-i18n-...@kde.org>\n" +"Language-Team: British English <kde-l10n-en...@kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/po/ia/libakonadi-kmime5.po new/akonadi-mime-20.04.0/po/ia/libakonadi-kmime5.po --- old/akonadi-mime-19.12.3/po/ia/libakonadi-kmime5.po 2020-03-03 01:33:06.000000000 +0100 +++ new/akonadi-mime-20.04.0/po/ia/libakonadi-kmime5.po 2020-04-17 02:38:24.000000000 +0200 @@ -7,15 +7,15 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 03:14+0200\n" -"PO-Revision-Date: 2020-01-20 22:26+0100\n" -"Last-Translator: Giovanni Sora <g.s...@tiscali.it>\n" -"Language-Team: Interlingua <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2020-02-12 13:10+0100\n" +"Last-Translator: giovanni <g.s...@tiscali.it>\n" +"Language-Team: Interlingua <kde-i18n...@kde.org>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" #: emptytrashcommand.cpp:60 #, kde-format @@ -28,14 +28,13 @@ msgstr "Tu es secur que tu vole vacuar le dossier de corbe de omne contos?" #: markascommand.cpp:142 -#, fuzzy, kde-format -#| msgid "Do you really want to delete this folder and all its sub-folders?" -#| msgid_plural "" -#| "Do you really want to delete %1 folders and all their sub-folders?" +#, kde-format msgid "" "Are you sure you want to mark all messages in this folder and all its " "subfolders?" -msgstr "Tu vermente vole deler iste dossier e tote su sub-dossieres?" +msgstr "" +"Tu es secur que tu vole marcar omne messages in iste dossier e in tote su " +"sub-dossieres?" #: markascommand.cpp:143 #, kde-format @@ -513,22 +512,19 @@ msgstr "Marca tote messages seligite como legite" #: standardmailactionmanager.cpp:804 -#, fuzzy, kde-format -#| msgid "Mark &All Messages as Read" +#, kde-format msgid "Mark &All Messages as Read Recursively" -msgstr "Marca &Tote messages como legite" +msgstr "Marca &Tote messages como legite recursivemente" #: standardmailactionmanager.cpp:805 -#, fuzzy, kde-format -#| msgid "Mark All as Read" +#, kde-format msgid "Mark All as Read Recursively" -msgstr "Marca toto como legite" +msgstr "Marca toto como legite recursivemente" #: standardmailactionmanager.cpp:806 standardmailactionmanager.cpp:807 -#, fuzzy, kde-format -#| msgid "Mark all messages as read." +#, kde-format msgid "Mark all messages as read recursively." -msgstr "Marca tote messages seligite como legite" +msgstr "Marca tote messages como legite recursivemente." #: standardmailactionmanager.cpp:818 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/po/it/libakonadi-kmime5.po new/akonadi-mime-20.04.0/po/it/libakonadi-kmime5.po --- old/akonadi-mime-19.12.3/po/it/libakonadi-kmime5.po 2020-03-03 01:33:06.000000000 +0100 +++ new/akonadi-mime-20.04.0/po/it/libakonadi-kmime5.po 2020-04-17 02:38:24.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Federico Zenith <federico.zen...@member.fsf.org>, 2011, 2012, 2013, 2014. -# Luigi Toscano <luigi.tosc...@tiscali.it>, 2015, 2016. +# Luigi Toscano <luigi.tosc...@tiscali.it>, 2015, 2016, 2020. # msgid "" msgstr "" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.12.0\n" #: emptytrashcommand.cpp:60 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/po/ko/libakonadi-kmime5.po new/akonadi-mime-20.04.0/po/ko/libakonadi-kmime5.po --- old/akonadi-mime-19.12.3/po/ko/libakonadi-kmime5.po 2020-03-03 01:33:06.000000000 +0100 +++ new/akonadi-mime-20.04.0/po/ko/libakonadi-kmime5.po 2020-04-17 02:38:24.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park <k...@peremen.name>, 2014, 2015, 2016. +# Shinjo Park <k...@peremen.name>, 2014, 2015, 2016, 2020. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 03:14+0200\n" -"PO-Revision-Date: 2016-12-11 23:22+0100\n" +"PO-Revision-Date: 2020-04-03 22:59+0200\n" "Last-Translator: Shinjo Park <k...@peremen.name>\n" "Language-Team: Korean <kde...@kde.org>\n" "Language: ko\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.04.3\n" #: emptytrashcommand.cpp:60 #, kde-format @@ -176,7 +176,7 @@ #: standardmailactionmanager.cpp:148 standardmailactionmanager.cpp:150 #, kde-format msgid "Copy the selected folders to the clipboard." -msgstr "선택한 폴더를 클립보드로 복사합니다." +msgstr "선택한 폴더를 클립보드에 복사합니다." #: standardmailactionmanager.cpp:153 #, kde-format @@ -260,7 +260,7 @@ #: standardmailactionmanager.cpp:209 standardmailactionmanager.cpp:211 #, kde-format msgid "Copy the selected messages to the clipboard." -msgstr "선택한 메시지를 클립보드로 복사합니다." +msgstr "선택한 메시지를 클립보드에 복사합니다." #: standardmailactionmanager.cpp:215 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/po/nb/libakonadi-kmime5.po new/akonadi-mime-20.04.0/po/nb/libakonadi-kmime5.po --- old/akonadi-mime-19.12.3/po/nb/libakonadi-kmime5.po 2020-03-03 01:33:06.000000000 +0100 +++ new/akonadi-mime-20.04.0/po/nb/libakonadi-kmime5.po 2020-04-17 02:38:24.000000000 +0200 @@ -8,7 +8,7 @@ "POT-Creation-Date: 2019-05-20 03:14+0200\n" "PO-Revision-Date: 2014-09-23 21:53+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" -"Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" +"Language-Team: Norwegian Bokmål <l10n...@lister.huftis.org>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/po/uk/libakonadi-kmime5.po new/akonadi-mime-20.04.0/po/uk/libakonadi-kmime5.po --- old/akonadi-mime-19.12.3/po/uk/libakonadi-kmime5.po 2020-03-03 01:33:07.000000000 +0100 +++ new/akonadi-mime-20.04.0/po/uk/libakonadi-kmime5.po 2020-04-17 02:38:25.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of libakonadi-kmime5.po to Ukrainian -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/po/zh_CN/libakonadi-kmime5.po new/akonadi-mime-20.04.0/po/zh_CN/libakonadi-kmime5.po --- old/akonadi-mime-19.12.3/po/zh_CN/libakonadi-kmime5.po 2020-03-03 01:33:07.000000000 +0100 +++ new/akonadi-mime-20.04.0/po/zh_CN/libakonadi-kmime5.po 2020-04-17 02:38:25.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 03:14+0200\n" -"PO-Revision-Date: 2020-01-20 21:56\n" +"PO-Revision-Date: 2020-03-25 19:56\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/serializers/CMakeLists.txt new/akonadi-mime-20.04.0/serializers/CMakeLists.txt --- old/akonadi-mime-19.12.3/serializers/CMakeLists.txt 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/serializers/CMakeLists.txt 2020-04-06 06:57:18.000000000 +0200 @@ -5,11 +5,15 @@ set(akonadi_serializer_mail_SRCS akonadi_serializer_mail.cpp ) + ecm_qt_declare_logging_category(akonadi_serializer_mail_SRCS - HEADER akonadi_serializer_mail_debug.h - IDENTIFIER AKONADI_SERIALIZER_MAIL_LOG - CATEGORY_NAME org.kde.pim.akonadi_serializer_mail -) + HEADER akonadi_serializer_mail_debug.h + IDENTIFIER AKONADI_SERIALIZER_MAIL_LOG + DESCRIPTION "akonadi-mime (akonadi_serializer_mail)" + CATEGORY_NAME org.kde.pim.akonadi_serializer_mail + EXPORT AKONADIMIME + ) + add_library(akonadi_serializer_mail MODULE ${akonadi_serializer_mail_SRCS}) target_link_libraries(akonadi_serializer_mail KF5::Mime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/serializers/akonadi_serializer_mail.desktop new/akonadi-mime-20.04.0/serializers/akonadi_serializer_mail.desktop --- old/akonadi-mime-19.12.3/serializers/akonadi_serializer_mail.desktop 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/serializers/akonadi_serializer_mail.desktop 2020-04-06 06:57:18.000000000 +0200 @@ -67,7 +67,7 @@ Comment[ja]=メールオブジェクトのための Akonadi シリアライザプラグイン Comment[kk]=Akonadi пошта нысандарының тізбектеуіш плагині Comment[km]=កម្មវិធីជំនួយកម្មវិធីបោះពុម្ព Akonadi សម្រាប់វត្ថុសំបុត្រ -Comment[ko]=메일 객체를 위한 Akonadi 시리얼라이저 플러그인 +Comment[ko]=메일 객체용 Akonadi 시리얼라이저 플러그인 Comment[lt]=Akonadi serializatoriaus papildinys pašto objektams Comment[lv]=Akonadi pasta serializēšanas spraudnis Comment[nb]=Et Akonadi programtillegg for serialisering av e-postobjekter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/src/CMakeLists.txt new/akonadi-mime-20.04.0/src/CMakeLists.txt --- old/akonadi-mime-19.12.3/src/CMakeLists.txt 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/src/CMakeLists.txt 2020-04-06 06:57:18.000000000 +0200 @@ -81,7 +81,6 @@ KF5::Mime KF5::AkonadiWidgets KF5::KIOCore - KF5::DBusAddons KF5::I18n KF5::ConfigWidgets KF5::XmlGui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/src/markascommand.cpp new/akonadi-mime-20.04.0/src/markascommand.cpp --- old/akonadi-mime-19.12.3/src/markascommand.cpp 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/src/markascommand.cpp 2020-04-06 06:57:18.000000000 +0200 @@ -25,8 +25,8 @@ #include <itemmodifyjob.h> #include <collectionfetchjob.h> -#include <kmessagebox.h> -#include <klocalizedstring.h> +#include <KMessageBox> +#include <KLocalizedString> using namespace Akonadi; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/src/standardmailactionmanager.cpp new/akonadi-mime-20.04.0/src/standardmailactionmanager.cpp --- old/akonadi-mime-19.12.3/src/standardmailactionmanager.cpp 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/src/standardmailactionmanager.cpp 2020-04-06 06:57:18.000000000 +0200 @@ -45,7 +45,7 @@ #include <kmime/kmime_message.h> #include <QAction> -#include <kactioncollection.h> +#include <KActionCollection> #include <KLocalizedString> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-mime-19.12.3/src/util.cpp new/akonadi-mime-20.04.0/src/util.cpp --- old/akonadi-mime-19.12.3/src/util.cpp 2020-02-16 10:00:26.000000000 +0100 +++ new/akonadi-mime-20.04.0/src/util.cpp 2020-04-06 06:57:18.000000000 +0200 @@ -21,7 +21,7 @@ #include "imapsettings.h" #include <servermanager.h> -#include <KDBusConnectionPool> +#include <QDBusConnection> #include <assert.h> #include "akonadi_mime_debug.h" @@ -48,6 +48,6 @@ //NOTE(Andras): from kmail/util.cpp return new OrgKdeAkonadiImapSettingsInterface(Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, ident), QStringLiteral("/Settings"), - KDBusConnectionPool::threadConnection()); + QDBusConnection::sessionBus()); } }
