Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ksmtp for openSUSE:Factory checked in at 2021-08-16 10:06:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksmtp (Old) and /work/SRC/openSUSE:Factory/.ksmtp.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksmtp" Mon Aug 16 10:06:51 2021 rev:47 rq:911738 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ksmtp/ksmtp.changes 2021-07-09 23:59:19.680529784 +0200 +++ /work/SRC/openSUSE:Factory/.ksmtp.new.1899/ksmtp.changes 2021-08-16 10:08:28.683318127 +0200 @@ -1,0 +2,28 @@ +Fri Aug 6 09:40:45 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08.0 +- No code change since 21.07.90 + +------------------------------------------------------------------- +Fri Jul 30 10:05:29 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + +------------------------------------------------------------------- +Sat Jul 17 20:06:37 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.07.80 + * New feature release +- Changes since 21.04.3: + * Remove explicit includes + * Use more target-centric cmake code + * Modernize code + * Use forward declaration here +- Only install the license files once + +------------------------------------------------------------------- Old: ---- ksmtp-21.04.3.tar.xz ksmtp-21.04.3.tar.xz.sig New: ---- ksmtp-21.08.0.tar.xz ksmtp-21.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksmtp.spec ++++++ --- /var/tmp/diff_new_pack.hV1bTT/_old 2021-08-16 10:08:29.207317500 +0200 +++ /var/tmp/diff_new_pack.hV1bTT/_new 2021-08-16 10:08:29.207317500 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: ksmtp -Version: 21.04.3 +Version: 21.08.0 Release: 0 Summary: Job-based library to send email through an SMTP server License: LGPL-2.1-or-later @@ -38,7 +38,6 @@ BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Test) -Recommends: %{name}-lang %description KSMTP is a job based library to send email through an SMTP server. @@ -89,11 +88,9 @@ %{_kf5_libdir}/libKPimSMTP.so.* %files -%license LICENSES/* %{_kf5_debugdir}/ksmtp.categories %files devel -%license LICENSES/* %{_includedir}/KPim/ %{_kf5_cmakedir}/KPimSMTP/ %{_kf5_libdir}/libKPimSMTP.so @@ -101,7 +98,6 @@ %if %{with lang} %files lang -f %{name}.lang -%license LICENSES/* %endif %changelog ++++++ ksmtp-21.04.3.tar.xz -> ksmtp-21.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/.clang-format new/ksmtp-21.08.0/.clang-format --- old/ksmtp-21.04.3/.clang-format 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/.clang-format 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ ---- -# SPDX-FileCopyrightText: 2019 Christoph Cullmann <[email protected]> -# SPDX-FileCopyrightText: 2019 Gernot Gebhard <[email protected]> -# -# SPDX-License-Identifier: MIT - -# Style for C++ -Language: Cpp - -# base is WebKit coding style: https://webkit.org/code-style-guidelines/ -# below are only things set that diverge from this style! -BasedOnStyle: WebKit - -# enforce C++11 (e.g. for std::vector<std::vector<lala>> -Standard: Cpp11 - -# 4 spaces indent -TabWidth: 4 - -# 2 * 80 wide lines -ColumnLimit: 160 - -# sort includes inside line separated groups -SortIncludes: true - -# break before braces on function, namespace and class definitions. -BreakBeforeBraces: Linux - -# CrlInstruction *a; -PointerAlignment: Right - -# horizontally aligns arguments after an open bracket. -AlignAfterOpenBracket: Align - -# don't move all parameters to new line -AllowAllParametersOfDeclarationOnNextLine: false - -# no single line functions -AllowShortFunctionsOnASingleLine: None - -# always break before you encounter multi line strings -AlwaysBreakBeforeMultilineStrings: true - -# don't move arguments to own lines if they are not all on the same -BinPackArguments: false - -# don't move parameters to own lines if they are not all on the same -BinPackParameters: false - -# In case we have an if statement whith multiple lines the operator should be at the beginning of the line -# but we do not want to break assignments -BreakBeforeBinaryOperators: NonAssignment - -# format C++11 braced lists like function calls -Cpp11BracedListStyle: true - -# do not put a space before C++11 braced lists -SpaceBeforeCpp11BracedList: false - -# remove empty lines -KeepEmptyLinesAtTheStartOfBlocks: false - -# no namespace indentation to keep indent level low -NamespaceIndentation: None - -# we use template< without space. -SpaceAfterTemplateKeyword: false - -# macros for which the opening brace stays attached. -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] - -# keep lambda formatting multi-line if not empty -AllowShortLambdasOnASingleLine: Empty - -# We do not want clang-format to put all arguments on a new line -AllowAllArgumentsOnNextLine: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/.gitignore new/ksmtp-21.08.0/.gitignore --- old/ksmtp-21.04.3/.gitignore 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/.gitignore 2021-07-30 14:47:27.000000000 +0200 @@ -19,3 +19,8 @@ CMakeLists.txt.user* *.unc-backup* compile_commands.json +.clang-format +.clangd +.idea +/cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/CMakeLists.txt new/ksmtp-21.08.0/CMakeLists.txt --- old/ksmtp-21.04.3/CMakeLists.txt 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/CMakeLists.txt 2021-07-30 14:47:27.000000000 +0200 @@ -1,13 +1,13 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -set(PIM_VERSION "5.17.3") +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) +set(PIM_VERSION "5.18.0") project(KSMTP VERSION ${PIM_VERSION}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # ECM setup -set(KF5_MIN_VERSION "5.79.0") +set(KF5_MIN_VERSION "5.83.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -28,7 +28,7 @@ set(KSMTP_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.14.0") +set(QT_REQUIRED_VERSION "5.15.0") ecm_setup_version(PROJECT VARIABLE_PREFIX KSMTP VERSION_HEADER ${KSMTP_BINARY_DIR}/ksmtp_version.h PACKAGE_VERSION_FILE ${KSMTP_BINARY_DIR}/KPimSMTPConfigVersion.cmake @@ -60,17 +60,14 @@ add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) -option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE) +option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) -set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false) +set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if (USE_UNITY_CMAKE_SUPPORT) - if(${CMAKE_VERSION} VERSION_LESS "3.16.0") - message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support") - else() - set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true) - endif() + set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() + ########### Targets ########### add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/CMakePresets.json new/ksmtp-21.08.0/CMakePresets.json --- old/ksmtp-21.04.3/CMakePresets.json 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/CMakePresets.json 2021-07-30 14:47:27.000000000 +0200 @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "configurePresets": [ { "name": "dev", @@ -23,6 +23,20 @@ } }, { + "name": "dev-clang", + "displayName": "dev-clang", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clang", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "environment": { + "CXX": "clang++", + "CCACHE_DISABLE": "ON" + } + }, + { "name": "unity", "displayName": "Build with CMake unity support.", "generator": "Ninja", @@ -51,6 +65,64 @@ "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" } + }, + { + "name": "clazy", + "displayName": "clazy", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clazy", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + }, + "environment": { + "CXX": "clazy", + "CCACHE_DISABLE": "ON" + } + } + + ], + "buildPresets": [ + { + "name": "dev", + "configurePreset": "dev" + }, + { + "name": "release", + "configurePreset": "release" + }, + { + "name": "dev-clang", + "configurePreset": "dev-clang" + }, + { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { + "name": "clazy", + "configurePreset": "clazy", + "environment": { + "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE" : "ON" + } } + ], + "testPresets": [ + { + "name": "dev", + "configurePreset": "dev", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": false} + }, + { + "name": "asan", + "configurePreset": "asan", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/autotests/CMakeLists.txt new/ksmtp-21.08.0/autotests/CMakeLists.txt --- old/ksmtp-21.04.3/autotests/CMakeLists.txt 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/autotests/CMakeLists.txt 2021-07-30 14:47:27.000000000 +0200 @@ -2,6 +2,6 @@ find_package(Qt5Test ${QT_REQUIRED_VERSION} REQUIRED) ecm_add_test(smtptest.cpp fakeserver.cpp - LINK_LIBRARIES KPimSMTP Qt5::Test Qt5::Network + LINK_LIBRARIES KPimSMTP Qt::Test Qt::Network TEST_NAME smtptest ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/autotests/fakeserver.cpp new/ksmtp-21.08.0/autotests/fakeserver.cpp --- old/ksmtp-21.04.3/autotests/fakeserver.cpp 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/autotests/fakeserver.cpp 2021-07-30 14:47:27.000000000 +0200 @@ -10,6 +10,8 @@ #include <QDebug> #include <QFile> +#include <QTcpServer> +#include <QTcpSocket> #include <QTest> FakeServer::FakeServer(QObject *parent) @@ -146,7 +148,7 @@ { QMutexLocker locker(&m_mutex); - for (const QList<QByteArray> &scenario : qAsConst(m_scenarios)) { + for (const QList<QByteArray> &scenario : std::as_const(m_scenarios)) { if (!scenario.isEmpty()) { qDebug() << scenario; return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/autotests/fakeserver.h new/ksmtp-21.08.0/autotests/fakeserver.h --- old/ksmtp-21.04.3/autotests/fakeserver.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/autotests/fakeserver.h 2021-07-30 14:47:27.000000000 +0200 @@ -6,14 +6,12 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_FAKESERVER_H -#define KSMTP_FAKESERVER_H +#pragma once #include <QMutex> -#include <QTcpServer> -#include <QTcpSocket> #include <QThread> - +class QTcpServer; +class QTcpSocket; Q_DECLARE_METATYPE(QList<QByteArray>) class FakeServer : public QThread @@ -52,4 +50,3 @@ QList<QTcpSocket *> m_clientSockets; }; -#endif // KSMTP_FAKESERVER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/autotests/smtptest.h new/ksmtp-21.08.0/autotests/smtptest.h --- old/ksmtp-21.04.3/autotests/smtptest.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/autotests/smtptest.h 2021-07-30 14:47:27.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_SMTPTEST_H -#define KSMTP_SMTPTEST_H +#pragma once #include "QObject" @@ -34,4 +33,3 @@ // TODO: (CL) Check if SendJob parses properly the data it gets before sending }; -#endif // KSMTP_SMTPTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/metainfo.yaml.license new/ksmtp-21.08.0/metainfo.yaml.license --- old/ksmtp-21.04.3/metainfo.yaml.license 1970-01-01 01:00:00.000000000 +0100 +++ new/ksmtp-21.08.0/metainfo.yaml.license 2021-07-30 14:47:27.000000000 +0200 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: none +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/po/hi/libksmtp5.po new/ksmtp-21.08.0/po/hi/libksmtp5.po --- old/ksmtp-21.04.3/po/hi/libksmtp5.po 2021-07-06 07:29:31.000000000 +0200 +++ new/ksmtp-21.08.0/po/hi/libksmtp5.po 2021-08-06 02:25:21.000000000 +0200 @@ -1,13 +1,14 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the ksmtp package. # +# Sameer Singh <[email protected]>, 2021. # Raghavendra Kamath <[email protected]>, 2021. msgid "" msgstr "" "Project-Id-Version: ksmtp\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-27 03:10+0100\n" -"PO-Revision-Date: 2021-06-29 18:33+0530\n" +"PO-Revision-Date: 2021-06-27 15:18+0530\n" "Last-Translator: Raghavendra Kamath <[email protected]>\n" "Language-Team: kde-hindi\n" "Language: hi\n" @@ -25,12 +26,12 @@ #: job.cpp:63 #, kde-format msgid "Mailbox unavailable. The server said: %1" -msgstr "????????? ???????????? ????????????????????????. ??????????????? ?????????: %1" +msgstr "????????????????????? ??????????????????????????? ??????????????? ?????? ?????????: %1" #: job.cpp:65 #, kde-format msgid "Insufficient storage space on server. The server said: %1" -msgstr "??????????????? ????????? ??????????????????????????? ?????????. ??????????????? ?????????: %1" +msgstr "??????????????? ????????? ??????????????????????????? ???????????? ??????????????? ?????? ?????????: %1" #: job.cpp:67 #, kde-format @@ -40,7 +41,7 @@ #: job.cpp:76 #, kde-format msgid "Connection to server lost." -msgstr "??????????????? ?????? ????????????????????? ????????????." +msgstr "??????????????? ?????? ????????????????????? ???????????????" #: loginjob.cpp:81 #, kde-format @@ -50,7 +51,7 @@ #: loginjob.cpp:146 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." -msgstr "??????????????? ????????? ??????????????????????????????????????? ???????????????????????? ??????, ??????????????????/?????????????????? ?????? ?????????????????? ???????????? ???????????????" +msgstr "??????????????? ????????? ??????????????????????????????????????? ???????????????????????? ??????, ???????????? ???????????? ??????????????????/?????????????????? ?????? ?????????????????? ???????????? ???????????????" #: loginjob.cpp:209 #, kde-format @@ -68,7 +69,7 @@ #: loginjob.cpp:314 #, kde-format msgid "Login failed, cannot initialize the SASL library" -msgstr "??????????????? ????????????, ????????????????????? ???????????????????????? ?????? ?????????????????? ???????????? ?????? ?????????" +msgstr "??????????????? ????????????, ????????????????????? ???????????????????????? ?????? ?????????????????? ???????????? ?????? ?????????" #: sendjob.cpp:53 #, kde-format @@ -82,7 +83,7 @@ "missing or invalid" msgstr "" "?????????????????? ???????????? ???????????? ?????? ????????? ????????????????????? ?????????????????? ?????? ?????????????????? ????????????????????? ????????? ?????? ????????? ?????? ?????? ?????? ???????????? ?????? ?????? ????????? " -"???????????? ??????." +"???????????? ?????????" #: sendjob.cpp:112 #, kde-format @@ -90,4 +91,5 @@ "Could not send the message because it exceeds the maximum allowed size of %1 " "bytes. (Message size: %2 bytes.)" msgstr "" -"?????????????????? ???????????? ???????????? ?????? ????????? ????????????????????? ?????? %1 ?????????????????? ?????? ???????????? ??????. (?????????????????? ?????? ????????????: %2 ??????????????????)" +"??????????????? ???????????? ???????????? ?????? ????????? ????????????????????? ?????? ?????????????????? ??????????????? ???????????? %1 ?????????????????? ?????? ???????????? ????????? (??????????????? ?????? " +"????????????: %2 ?????????????????????)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/po/zh_CN/libksmtp5.po new/ksmtp-21.08.0/po/zh_CN/libksmtp5.po --- old/ksmtp-21.04.3/po/zh_CN/libksmtp5.po 2021-07-06 07:29:31.000000000 +0200 +++ new/ksmtp-21.08.0/po/zh_CN/libksmtp5.po 2021-08-06 02:25:21.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-27 03:10+0100\n" -"PO-Revision-Date: 2021-06-20 07:37\n" +"PO-Revision-Date: 2021-07-26 13:49\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -25,17 +25,17 @@ #: job.cpp:63 #, kde-format msgid "Mailbox unavailable. The server said: %1" -msgstr "" +msgstr "?????????????????????????????????????????????%1" #: job.cpp:65 #, kde-format msgid "Insufficient storage space on server. The server said: %1" -msgstr "" +msgstr "??????????????????????????????????????????????????????%1" #: job.cpp:67 #, kde-format msgid "Server error: %1" -msgstr "" +msgstr "??????????????????%1" #: job.cpp:76 #, kde-format @@ -45,7 +45,7 @@ #: loginjob.cpp:81 #, kde-format msgid "Login" -msgstr "?????????" +msgstr "??????" #: loginjob.cpp:146 #, kde-format @@ -57,12 +57,12 @@ msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" -msgstr "???????????? SMTP ??????????????????????????????????????????" +msgstr "???????????? SMTP ????????????????????????????????????????????????????????????????????????" #: loginjob.cpp:270 #, kde-format msgid "Token expired" -msgstr "" +msgstr "???????????????" #: loginjob.cpp:314 #, kde-format @@ -79,11 +79,11 @@ msgid "" "Could not send the message because either the sender or recipient field is " "missing or invalid" -msgstr "???????????????????????????????????????????????????????????????" +msgstr "???????????????????????????????????????????????????????????????" #: sendjob.cpp:112 #, kde-format msgid "" "Could not send the message because it exceeds the maximum allowed size of %1 " "bytes. (Message size: %2 bytes.)" -msgstr "??????????????????????????????????????????????????? %1 ???????????????(???????????????%2 ?????????)" +msgstr "??????????????????????????????????????????????????? %1 ???????????????(???????????????%2 ?????????)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/sanitizers.supp new/ksmtp-21.08.0/sanitizers.supp --- old/ksmtp-21.04.3/sanitizers.supp 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/sanitizers.supp 2021-07-30 14:47:27.000000000 +0200 @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN leak:libspeechd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/CMakeLists.txt new/ksmtp-21.08.0/src/CMakeLists.txt --- old/ksmtp-21.04.3/src/CMakeLists.txt 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/CMakeLists.txt 2021-07-30 14:47:27.000000000 +0200 @@ -1,4 +1,7 @@ -set(ksmtp_SRCS + +add_library(KPimSMTP) +add_library(KPim::SMTP ALIAS KPimSMTP) +target_sources(KPimSMTP PRIVATE job.cpp loginjob.cpp sendjob.cpp @@ -7,18 +10,16 @@ sessionuiproxy.cpp ) -ecm_qt_declare_logging_category(ksmtp_SRCS HEADER ksmtp_debug.h +ecm_qt_declare_logging_category(KPimSMTP HEADER ksmtp_debug.h IDENTIFIER KSMTP_LOG CATEGORY_NAME org.kde.pim.ksmtp DESCRIPTION "ksmtp (ksmtp)" EXPORT KSMTP ) -add_library(KPimSMTP ${ksmtp_SRCS}) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) set_target_properties(KPimSMTP PROPERTIES UNITY_BUILD ON) endif() -generate_export_header(KPimSMTP BASE_NAME ksmtp) -add_library(KPim::SMTP ALIAS KPimSMTP) +generate_export_header(KPimSMTP BASE_NAME ksmtp) target_include_directories(KPimSMTP INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP;${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP/ksmtp>") if (WIN32) @@ -32,13 +33,13 @@ PRIVATE KF5::I18n KF5::KIOCore - Qt5::Network + Qt::Network Sasl2::Sasl2 ${extra_LIBS} ) set_target_properties(KPimSMTP PROPERTIES - VERSION ${KSMTP_VERSION_STRING} + VERSION ${KSMTP_VERSION} SOVERSION ${KSMTP_SOVERSION} EXPORT_NAME SMTP ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/job.h new/ksmtp-21.08.0/src/job.h --- old/ksmtp-21.04.3/src/job.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/job.h 2021-07-30 14:47:27.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_JOB_H -#define KSMTP_JOB_H +#pragma once #include "ksmtp_export.h" @@ -49,4 +48,3 @@ }; } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/job_p.h new/ksmtp-21.08.0/src/job_p.h --- old/ksmtp-21.04.3/src/job_p.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/job_p.h 2021-07-30 14:47:27.000000000 +0200 @@ -5,8 +5,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_JOB_P_H -#define KSMTP_JOB_P_H +#pragma once #include "session.h" @@ -42,4 +41,3 @@ }; } -#endif // KSMTP_JOB_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/loginjob.h new/ksmtp-21.08.0/src/loginjob.h --- old/ksmtp-21.04.3/src/loginjob.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/loginjob.h 2021-07-30 14:47:27.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_LOGINJOB_H -#define KSMTP_LOGINJOB_H +#pragma once #include "ksmtp_export.h" @@ -53,4 +52,3 @@ }; } -#endif // KSMTP_LOGINJOB_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/sendjob.cpp new/ksmtp-21.08.0/src/sendjob.cpp --- old/ksmtp-21.04.3/src/sendjob.cpp 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/sendjob.cpp 2021-07-30 14:47:27.000000000 +0200 @@ -32,11 +32,11 @@ void addRecipients(const QStringList &rcpts); bool prepare(); - typedef struct { + using MessagePart = struct { QString contentType; QString name; QByteArray content; - } MessagePart; + }; QString m_returnPath; QStringList m_recipients; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/sendjob.h new/ksmtp-21.08.0/src/sendjob.h --- old/ksmtp-21.04.3/src/sendjob.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/sendjob.h 2021-07-30 14:47:27.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_SENDJOB_H -#define KSMTP_SENDJOB_H +#pragma once #include "ksmtp_export.h" @@ -64,4 +63,3 @@ }; } -#endif // KSMTP_SENDJOB_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/serverresponse_p.h new/ksmtp-21.08.0/src/serverresponse_p.h --- old/ksmtp-21.04.3/src/serverresponse_p.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/serverresponse_p.h 2021-07-30 14:47:27.000000000 +0200 @@ -5,8 +5,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_SERVERRESPONSE_P_H -#define KSMTP_SERVERRESPONSE_P_H +#pragma once #include <QByteArray> @@ -29,4 +28,3 @@ }; } -#endif // KSMTP_SERVERRESPONSE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/session.h new/ksmtp-21.08.0/src/session.h --- old/ksmtp-21.04.3/src/session.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/session.h 2021-07-30 14:47:27.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_SESSION_H -#define KSMTP_SESSION_H +#pragma once #include "ksmtp_export.h" #include "sessionuiproxy.h" @@ -155,4 +154,3 @@ }; } -#endif // KSMTP_SESSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/session_p.h new/ksmtp-21.08.0/src/session_p.h --- old/ksmtp-21.04.3/src/session_p.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/session_p.h 2021-07-30 14:47:27.000000000 +0200 @@ -5,8 +5,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_SESSION_P_H -#define KSMTP_SESSION_P_H +#pragma once #include "session.h" @@ -91,4 +90,3 @@ }; } -#endif // KSMTP_SESSION_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/sessionthread.cpp new/ksmtp-21.08.0/src/sessionthread.cpp --- old/ksmtp-21.04.3/src/sessionthread.cpp 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/sessionthread.cpp 2021-07-30 14:47:27.000000000 +0200 @@ -137,13 +137,8 @@ connect(m_socket.get(), &QSslSocket::disconnected, m_parentSession->d, &SessionPrivate::socketDisconnected); connect(m_socket.get(), &QSslSocket::connected, m_parentSession->d, &SessionPrivate::socketConnected); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - connect(m_socket.get(), - QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), -#else connect(m_socket.get(), QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::errorOccurred), -#endif this, [this](QAbstractSocket::SocketError err) { qCWarning(KSMTP_LOG) << "SMTP Socket error:" << err << m_socket->errorString(); @@ -211,19 +206,11 @@ QMutexLocker locker(&m_mutex); QSslCipher cipher = m_socket->sessionCipher(); -#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - if (!m_socket->sslErrors().isEmpty() -#else if (!m_socket->sslHandshakeErrors().isEmpty() -#endif || !m_socket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) { qCDebug(KSMTP_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits() << ", the socket says:" << m_socket->errorString() << "and the list of SSL errors contains" -#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) - << m_socket->sslErrors().count() -#else << m_socket->sslHandshakeErrors().count() -#endif << "items."; KSslErrorUiData errorData(m_socket.get()); Q_EMIT sslError(errorData); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/sessionthread_p.h new/ksmtp-21.08.0/src/sessionthread_p.h --- old/ksmtp-21.04.3/src/sessionthread_p.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/sessionthread_p.h 2021-07-30 14:47:27.000000000 +0200 @@ -6,8 +6,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef KSMTP_SESSIONTHREAD_P_H -#define KSMTP_SESSIONTHREAD_P_H +#pragma once #include <QMutex> #include <QQueue> @@ -73,4 +72,3 @@ }; } -#endif // KSMTP_SESSIONTHREAD_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/src/sessionuiproxy.h new/ksmtp-21.08.0/src/sessionuiproxy.h --- old/ksmtp-21.04.3/src/sessionuiproxy.h 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/src/sessionuiproxy.h 2021-07-30 14:47:27.000000000 +0200 @@ -4,8 +4,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#ifndef KSMTP_SESSIONUIPROXY_H -#define KSMTP_SESSIONUIPROXY_H +#pragma once #include "ksmtp_export.h" @@ -51,4 +50,3 @@ }; } -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-21.04.3/tests/CMakeLists.txt new/ksmtp-21.08.0/tests/CMakeLists.txt --- old/ksmtp-21.04.3/tests/CMakeLists.txt 2021-06-08 21:08:06.000000000 +0200 +++ new/ksmtp-21.08.0/tests/CMakeLists.txt 2021-07-30 14:47:27.000000000 +0200 @@ -1,4 +1,2 @@ -include_directories(${KSMTP_SOURCE_DIR}/src ${KSMTP_BINARY_DIR}/src) - add_executable(logintest logintest.cpp) -target_link_libraries(logintest KPimSMTP Qt5::Core KF5::KIOWidgets) +target_link_libraries(logintest KPimSMTP Qt::Core KF5::KIOWidgets)
