Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ksmtp for openSUSE:Factory checked in at 2023-04-23 22:44:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksmtp (Old) and /work/SRC/openSUSE:Factory/.ksmtp.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksmtp" Sun Apr 23 22:44:57 2023 rev:67 rq:1081188 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ksmtp/ksmtp.changes 2023-03-03 22:26:42.962992121 +0100 +++ /work/SRC/openSUSE:Factory/.ksmtp.new.1533/ksmtp.changes 2023-04-23 22:46:39.426438054 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:46:17 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.04.0/ + +------------------------------------------------------------------- +Fri Mar 31 16:42:25 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:44:04 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- ksmtp-22.12.3.tar.xz ksmtp-22.12.3.tar.xz.sig New: ---- ksmtp-23.04.0.tar.xz ksmtp-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksmtp.spec ++++++ --- /var/tmp/diff_new_pack.cAPvij/_old 2023-04-23 22:46:40.610444745 +0200 +++ /var/tmp/diff_new_pack.cAPvij/_new 2023-04-23 22:46:40.614444767 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: ksmtp -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: Job-based library to send email through an SMTP server License: LGPL-2.1-or-later @@ -41,28 +41,28 @@ %description KSMTP is a job based library to send email through an SMTP server. -%package -n libKPimSMTP5 +%package -n libKPim5SMTP5 Summary: Job-based library to send email through an SMTP server -Requires: %{name} -Recommends: %{name}-lang = %{version} +# Renamed +Obsoletes: ksmtp-lang <= 23.04.0 -%description -n libKPimSMTP5 +%description -n libKPim5SMTP5 KSMTP is a job based library to send email through an SMTP server. This package contains the KSMTP library itself. %package devel Summary: Development files for KSMTP -Requires: libKPimSMTP5 = %{version} +Requires: libKPim5SMTP5 = %{version} Requires: cmake(KF5CoreAddons) Requires: cmake(KF5I18n) Requires: cmake(KF5KIO) -Requires: cmake(KF5Mime) +Requires: cmake(KPim5Mime) %description devel This package contains all necessary include files and libraries needed to build programs that use the KSMTP library. -%lang_package +%lang_package -n libKPim5SMTP5 %prep %autosetup -p1 @@ -74,23 +74,26 @@ %install %kf5_makeinstall -C build -%find_lang %{name} --with-man --with-qt --all-name +%find_lang libKPim5SMTP5 --with-man --with-qt --all-name -%ldconfig_scriptlets -n libKPimSMTP5 +%ldconfig_scriptlets -n libKPim5SMTP5 -%files -n libKPimSMTP5 +%files -n libKPim5SMTP5 %license LICENSES/* -%{_kf5_libdir}/libKPimSMTP.so.* +%{_kf5_libdir}/libKPim5SMTP.so.* %files %{_kf5_debugdir}/ksmtp.categories %files devel -%{_includedir}/KPim/ +%dir %{_includedir}/KPim5 +%{_includedir}/KPim5/KSMTP/ +%{_includedir}/KPim5/ksmtp_version.h +%{_kf5_cmakedir}/KPim5SMTP/ %{_kf5_cmakedir}/KPimSMTP/ -%{_kf5_libdir}/libKPimSMTP.so +%{_kf5_libdir}/libKPim5SMTP.so %{_kf5_mkspecsdir}/qt_KSMTP.pri -%files lang -f %{name}.lang +%files -n libKPim5SMTP5-lang -f libKPim5SMTP5.lang %changelog ++++++ ksmtp-22.12.3.tar.xz -> ksmtp-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/.codespellrc.license new/ksmtp-23.04.0/.codespellrc.license --- old/ksmtp-22.12.3/.codespellrc.license 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/.codespellrc.license 2023-04-11 06:38:12.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2022-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/.gitlab-ci.yml new/ksmtp-23.04.0/.gitlab-ci.yml --- old/ksmtp-22.12.3/.gitlab-ci.yml 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/.gitlab-ci.yml 2023-04-11 06:38:12.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2020-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/.kde-ci.yml new/ksmtp-23.04.0/.kde-ci.yml --- old/ksmtp-22.12.3/.kde-ci.yml 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/.kde-ci.yml 2023-04-11 06:38:12.000000000 +0200 @@ -2,12 +2,19 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'frameworks/ki18n': '@latest' 'frameworks/kio': '@latest' 'frameworks/kcoreaddons': '@latest' +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/ki18n': '@latest-kf6' + 'frameworks/kio': '@latest-kf6' + 'frameworks/kcoreaddons': '@latest-kf6' + Options: require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/CMakeLists.txt new/ksmtp-23.04.0/CMakeLists.txt --- old/ksmtp-22.12.3/CMakeLists.txt 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/CMakeLists.txt 2023-04-11 06:38:12.000000000 +0200 @@ -1,15 +1,15 @@ # SPDX-FileCopyrightText: none # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.22.3") +set(PIM_VERSION "5.23.0") project(KSMTP VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.99.0") +set(KF_MIN_VERSION "5.103.0") -find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) @@ -35,15 +35,22 @@ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") +option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will allow to co-install lib)" ON) + set(KSMTP_LIB_VERSION ${PIM_VERSION}) set(QT_REQUIRED_VERSION "5.15.2") if (QT_MAJOR_VERSION STREQUAL "6") - set(QT_REQUIRED_VERSION "6.4.0") + set(QT_MIN_VERSION "6.4.0") + set(KF_MIN_VERSION "5.240.0") + set(KF_MAJOR_VERSION "6") +else() + set(KF_MAJOR_VERSION "5") endif() + ecm_setup_version(PROJECT VARIABLE_PREFIX KSMTP VERSION_HEADER ${KSMTP_BINARY_DIR}/ksmtp_version.h - PACKAGE_VERSION_FILE ${KSMTP_BINARY_DIR}/KPimSMTPConfigVersion.cmake + PACKAGE_VERSION_FILE ${KSMTP_BINARY_DIR}/KPim${KF_MAJOR_VERSION}SMTPConfigVersion.cmake SOVERSION 5 ) @@ -53,25 +60,56 @@ if (QT_MAJOR_VERSION STREQUAL "6") find_package(Qt6Core5Compat) endif() -find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}CoreAddons ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}KIO ${KF_MIN_VERSION} CONFIG REQUIRED) find_package(Sasl2) set_package_properties(Sasl2 PROPERTIES TYPE REQUIRED) ########### CMake Config Files ############ -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimSMTP") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}SMTP") configure_package_config_file( "${KSMTP_SOURCE_DIR}/KPimSMTPConfig.cmake.in" - "${KSMTP_BINARY_DIR}/KPimSMTPConfig.cmake" + "${KSMTP_BINARY_DIR}/KPim${KF_MAJOR_VERSION}SMTPConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) add_definitions(-DTRANSLATION_DOMAIN=\"libksmtp5\") -ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.99.0) +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) +if (BUILD_WITH_COMPAT_LIBS) +if (QT_MAJOR_VERSION STREQUAL "5") +## +# TODO: Backwards compatiblity. Remove in next major version +## +set(CMAKECONFIG_INSTALL_DIR_SMTP "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimSMTP") +set(KSMTP_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimSMTPConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPimSMTPConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_SMTP} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPimSMTPConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_SMTP}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}SMTPConfigVersion.cmake" + RENAME "KPimSMTPConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_SMTP}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}SMTPTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_SMTP}" + FILE KPim${KF_MAJOR_VERSION}SMTPTargets.cmake + NAMESPACE KPim:: +) +endif() +endif() option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) @@ -92,27 +130,27 @@ ########### Install Files ############ install(FILES - "${KSMTP_BINARY_DIR}/KPimSMTPConfig.cmake" - "${KSMTP_BINARY_DIR}/KPimSMTPConfigVersion.cmake" + "${KSMTP_BINARY_DIR}/KPim${KF_MAJOR_VERSION}SMTPConfig.cmake" + "${KSMTP_BINARY_DIR}/KPim${KF_MAJOR_VERSION}SMTPConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KPimSMTPTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPimSMTPTargets.cmake NAMESPACE KPim::) +install(EXPORT KPim${KF_MAJOR_VERSION}SMTPTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}SMTPTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) install(FILES ${KSMTP_BINARY_DIR}/ksmtp_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION} COMPONENT Devel ) if (BUILD_QCH) ecm_install_qch_export( - TARGETS KPimSMTP_QCH - FILE KPimSMTPQchTargets.cmake + TARGETS KPim${KF_MAJOR_VERSION}SMTP_QCH + FILE KPim${KF_MAJOR_VERSION}SMTPQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPimSMTPQchTargets.cmake\")") + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}SMPTQchTargets.cmake\")") endif() kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/CMakePresets.json new/ksmtp-23.04.0/CMakePresets.json --- old/ksmtp-22.12.3/CMakePresets.json 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/CMakePresets.json 2023-04-11 06:38:12.000000000 +0200 @@ -5,28 +5,35 @@ "name": "base", "displayName": "base preset", "generator": "Ninja", - "binaryDir": "${sourceDir}/build-${presetName}", - "installDir": "$env{KF5}", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF5}", "hidden": true }, { - "name": "dev", - "displayName": "Build as debug", + "name": "base-qt6", + "displayName": "base preset", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF6}", + "hidden": true + }, + { + "name": "dev-mold", + "displayName": "Build as debug + using mold linker", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold" }, "inherits": [ "base" ] - }, { - "name": "coverage", + "name": "dev", "displayName": "Build as debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "BUILD_COVERAGE": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, "inherits": [ @@ -43,19 +50,7 @@ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, "inherits": [ - "base" - ] - }, - { - "name": "dev-disable-deprecated", - "displayName": "Build as without deprecated methods", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" - }, - "inherits": [ - "base" + "base-qt6" ] }, { @@ -63,20 +58,7 @@ "displayName": "Build with Asan support.", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "ECM_ENABLE_SANITIZERS" : "'address;undefined'", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - }, - "inherits": [ - "base" - ] - }, - { - "name": "pch", - "displayName": "Build with PCH support.", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "ECM_ENABLE_SANITIZERS" : "'address;undefined'" }, "inherits": [ "base" @@ -102,8 +84,7 @@ "displayName": "Build with CMake unity support.", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "USE_UNITY_CMAKE_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "USE_UNITY_CMAKE_SUPPORT": "ON" }, "inherits": [ "base" @@ -123,8 +104,19 @@ "name": "profile", "displayName": "profile", "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + }, + "inherits": [ + "base" + ] + }, + { + "name": "coverage", + "displayName": "coverage", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_UNITY_CMAKE_SUPPORT": "OFF", + "BUILD_COVERAGE": "ON" }, "inherits": [ "base" @@ -143,21 +135,36 @@ "inherits": [ "base" ] + }, + { + "name": "pch", + "displayName": "pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_PRECOMPILED_HEADERS": "ON", + "BUILD_COVERAGE": "ON" + }, + "inherits": [ + "base" + ] } - ], "buildPresets": [ { "name": "dev", "configurePreset": "dev" }, + { + "name": "dev-mold", + "configurePreset": "dev-mold" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { - "name": "dev-disable-deprecated", - "configurePreset": "dev-disable-deprecated" + "name": "dev-clang", + "configurePreset": "dev-clang" }, { "name": "pch", @@ -168,22 +175,18 @@ "configurePreset": "release" }, { - "name": "coverage", - "configurePreset": "coverage" + "name": "unity", + "configurePreset": "unity" }, { - "name": "dev-clang", - "configurePreset": "dev-clang" + "name": "coverage", + "configurePreset": "coverage" }, - { + { "name": "asan", "configurePreset": "asan" }, { - "name": "unity", - "configurePreset": "unity" - }, - { "name": "clazy", "configurePreset": "clazy", "environment": { @@ -193,17 +196,29 @@ } ], "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} + }, + { + "name": "unity", + "configurePreset": "unity", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + }, + { + "name": "coverage", + "configurePreset": "coverage", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} } - ] + ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/CMakePresets.json.license new/ksmtp-23.04.0/CMakePresets.json.license --- old/ksmtp-22.12.3/CMakePresets.json.license 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/CMakePresets.json.license 2023-04-11 06:38:12.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/KPimSMTPConfig.cmake.in new/ksmtp-23.04.0/KPimSMTPConfig.cmake.in --- old/ksmtp-22.12.3/KPimSMTPConfig.cmake.in 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/KPimSMTPConfig.cmake.in 2023-04-11 06:38:12.000000000 +0200 @@ -4,6 +4,17 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(KF5CoreAddons "@KF5_MIN_VERSION@") +find_dependency(KF@KF_MAJOR_VERSION@CoreAddons "@KF_MIN_VERSION@") -include("${CMAKE_CURRENT_LIST_DIR}/KPimSMTPTargets.cmake") +if (@KSMTP_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5Smtp) and KF5::Smtp targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@Tnef) and KPim@KF_MAJOR_VERSION@::Stmp instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@KF_MAJOR_VERSION@SMTPTargets.cmake") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/autotests/CMakeLists.txt new/ksmtp-23.04.0/autotests/CMakeLists.txt --- old/ksmtp-22.12.3/autotests/CMakeLists.txt 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/autotests/CMakeLists.txt 2023-04-11 06:38:12.000000000 +0200 @@ -4,6 +4,6 @@ find_package(Qt${QT_MAJOR_VERSION}Test ${QT_REQUIRED_VERSION} REQUIRED) ecm_add_test(smtptest.cpp fakeserver.cpp smtptest.h fakeserver.h - LINK_LIBRARIES KPimSMTP Qt::Test Qt::Network + LINK_LIBRARIES KPim${KF_MAJOR_VERSION}SMTP Qt::Test Qt::Network TEST_NAME smtptest ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/po/ca/libksmtp5.po new/ksmtp-23.04.0/po/ca/libksmtp5.po --- old/ksmtp-22.12.3/po/ca/libksmtp5.po 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/po/ca/libksmtp5.po 2023-04-11 06:38:12.000000000 +0200 @@ -94,3 +94,6 @@ msgstr "" "No s'ha pogut enviar el missatge perquè s'ha excedit la mida mà xima permesa " "de %1 bytes. (Mida del missatge: %2 bytes)." + +#~ msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." +#~ msgstr "STARTTLS no està acceptat pel servidor, proveu amb SSL/TLS." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/po/zh_CN/libksmtp5.po new/ksmtp-23.04.0/po/zh_CN/libksmtp5.po --- old/ksmtp-22.12.3/po/zh_CN/libksmtp5.po 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/po/zh_CN/libksmtp5.po 2023-04-11 06:38:12.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-04-14 00:45+0000\n" -"PO-Revision-Date: 2023-02-24 12:58\n" +"PO-Revision-Date: 2023-04-10 14:12\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/sanitizers.supp new/ksmtp-23.04.0/sanitizers.supp --- old/ksmtp-22.12.3/sanitizers.supp 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/sanitizers.supp 2023-04-11 06:38:12.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/src/CMakeLists.txt new/ksmtp-23.04.0/src/CMakeLists.txt --- old/ksmtp-22.12.3/src/CMakeLists.txt 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/src/CMakeLists.txt 2023-04-11 06:38:12.000000000 +0200 @@ -1,8 +1,9 @@ # SPDX-FileCopyrightText: none # SPDX-License-Identifier: BSD-3-Clause -add_library(KPimSMTP) -add_library(KPim::SMTP ALIAS KPimSMTP) -target_sources(KPimSMTP PRIVATE +add_library(KPim${KF_MAJOR_VERSION}SMTP) +add_library(KPim${KF_MAJOR_VERSION}::SMTP ALIAS KPim${KF_MAJOR_VERSION}SMTP) +add_library(KPim${KF_MAJOR_VERSION}::SMTP ALIAS KPim${KF_MAJOR_VERSION}SMTP) +target_sources(KPim${KF_MAJOR_VERSION}SMTP PRIVATE job.cpp loginjob.cpp sendjob.cpp @@ -20,35 +21,35 @@ sendjob.h ) -ecm_qt_declare_logging_category(KPimSMTP HEADER ksmtp_debug.h +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}SMTP HEADER ksmtp_debug.h IDENTIFIER KSMTP_LOG CATEGORY_NAME org.kde.pim.ksmtp DESCRIPTION "ksmtp (ksmtp)" EXPORT KSMTP ) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) - set_target_properties(KPimSMTP PROPERTIES UNITY_BUILD ON) + set_target_properties(KPim${KF_MAJOR_VERSION}SMTP PROPERTIES UNITY_BUILD ON) endif() -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>") +generate_export_header(KPim${KF_MAJOR_VERSION}SMTP BASE_NAME ksmtp) +target_include_directories(KPim${KF_MAJOR_VERSION}SMTP INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KSMTP;${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KSMTP/ksmtp>") if (WIN32) set(extra_LIBS ws2_32) endif() -target_link_libraries(KPimSMTP +target_link_libraries(KPim${KF_MAJOR_VERSION}SMTP PUBLIC - KF5::CoreAddons + KF${KF_MAJOR_VERSION}::CoreAddons PRIVATE - KF5::I18n - KF5::KIOCore + KF${KF_MAJOR_VERSION}::I18n + KF${KF_MAJOR_VERSION}::KIOCore Qt::Network Sasl2::Sasl2 ${extra_LIBS} ) -set_target_properties(KPimSMTP PROPERTIES +set_target_properties(KPim${KF_MAJOR_VERSION}SMTP PROPERTIES VERSION ${KSMTP_VERSION} SOVERSION ${KSMTP_SOVERSION} EXPORT_NAME SMTP @@ -66,17 +67,17 @@ REQUIRED_HEADERS KSMTP_HEADERS ) -install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KPim${KF_MAJOR_VERSION}SMTP EXPORT KPim${KF_MAJOR_VERSION}SMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h ${KSMTP_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP/ksmtp + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KSMTP/ksmtp ) install(FILES ${KSMTP_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP/KSMTP + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KSMTP/KSMTP ) ecm_qt_install_logging_categories(EXPORT KSMTP FILE ksmtp.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) @@ -92,9 +93,9 @@ #MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" LINK_QCHS - Qt5Core_QCH - Qt5Gui_QCH - Qt5Widgets_QCH + Qt${QT_MAJOR_VERSION}Core_QCH + Qt${QT_MAJOR_VERSION}Gui_QCH + Qt${QT_MAJOR_VERSION}Widgets_QCH INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS @@ -105,5 +106,5 @@ ) endif() -ecm_generate_pri_file(BASE_NAME KSMTP LIB_NAME KPimSMTP DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP) +ecm_generate_pri_file(BASE_NAME KSMTP LIB_NAME KPim${KF_MAJOR_VERSION}SMTP DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/src/session.cpp new/ksmtp-23.04.0/src/session.cpp --- old/ksmtp-22.12.3/src/session.cpp 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/src/session.cpp 2023-04-11 06:38:12.000000000 +0200 @@ -252,11 +252,19 @@ } } else if (r.isCode(25)) { if (r.text().startsWith("SIZE ")) { // krazy:exclude=strings +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) m_size = r.text().remove(0, QByteArray("SIZE ").count()).toInt(); +#else + m_size = r.text().remove(0, QByteArray("SIZE ").size()).toInt(); +#endif } else if (r.text() == "STARTTLS") { m_allowsTls = true; } else if (r.text().startsWith("AUTH ")) { // krazy:exclude=strings +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) setAuthenticationMethods(r.text().remove(0, QByteArray("AUTH ").count()).split(' ')); +#else + setAuthenticationMethods(r.text().remove(0, QByteArray("AUTH ").size()).split(' ')); +#endif } else if (r.text() == "DSN") { m_allowsDsn = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-22.12.3/tests/CMakeLists.txt new/ksmtp-23.04.0/tests/CMakeLists.txt --- old/ksmtp-22.12.3/tests/CMakeLists.txt 2023-02-25 06:14:00.000000000 +0100 +++ new/ksmtp-23.04.0/tests/CMakeLists.txt 2023-04-11 06:38:12.000000000 +0200 @@ -1,4 +1,4 @@ # SPDX-FileCopyrightText: none # SPDX-License-Identifier: BSD-3-Clause add_executable(logintest logintest.cpp) -target_link_libraries(logintest KPimSMTP Qt::Core KF5::KIOWidgets) +target_link_libraries(logintest KPim${KF_MAJOR_VERSION}SMTP Qt::Core KF${KF_MAJOR_VERSION}::KIOWidgets)
