Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmime for openSUSE:Factory checked in at 2023-04-23 22:45:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmime (Old) and /work/SRC/openSUSE:Factory/.kmime.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmime" Sun Apr 23 22:45:13 2023 rev:93 rq:1082022 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmime/kmime.changes 2023-03-03 22:26:21.386923311 +0100 +++ /work/SRC/openSUSE:Factory/.kmime.new.1533/kmime.changes 2023-04-23 22:47:05.458585142 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:46:00 UTC 2023 - Christophe Marin <[email protected]> + +- 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:11 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:43:45 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- kmime-22.12.3.tar.xz kmime-22.12.3.tar.xz.sig New: ---- kmime-23.04.0.tar.xz kmime-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmime.spec ++++++ --- /var/tmp/diff_new_pack.Ks735m/_old 2023-04-23 22:47:06.674592012 +0200 +++ /var/tmp/diff_new_pack.Ks735m/_new 2023-04-23 22:47:06.678592035 +0200 @@ -16,12 +16,11 @@ # -%define kf5_version 5.99.0 -# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%define kf5_version 5.103.0 %bcond_without released +%define libname libKPim5Mime5 Name: kmime -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: KDE PIM libraries MIME support License: LGPL-2.1-or-later @@ -36,54 +35,60 @@ BuildRequires: cmake(KF5Codecs) >= %{kf5_version} BuildRequires: cmake(KF5I18n) >= %{kf5_version} BuildRequires: cmake(Qt5Test) +Conflicts: libKF5Mime5 < %{version} %description This package contains the basic packages for KDE PIM applications. -%package -n libKF5Mime5 +%package -n %{libname} Summary: KDE PIM libraries MIME Support -Recommends: %{name}-lang -Provides: %{name} = %{version} +%requires_eq %{name} +# Renamed +Obsoletes: kmime-lang <= 23.04.0 -%description -n libKF5Mime5 +%description -n %{libname} This package provides MIME support for KDE PIM applications %package devel Summary: Build environment for the KDE PIM MIME libraries -Requires: libKF5Mime5 = %{version} +Requires: %{libname} = %{version} Requires: cmake(KF5Codecs) %description devel This package contains necessary include files and libraries needed to develop KDE PIM applications. -%lang_package +%lang_package -n %{libname} %prep %autosetup -p1 -n kmime-%{version} %build -%cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} +%cmake_kf5 -d build -- -DBUILD_TESTING=ON %cmake_build %install %kf5_makeinstall -C build -%find_lang %{name} --with-man --all-name +%find_lang %{libname} --with-man --all-name -%ldconfig_scriptlets -n libKF5Mime5 +%ldconfig_scriptlets -n %{libname} -%files -n libKF5Mime5 +%files %license LICENSES/* -%{_kf5_libdir}/libKF5Mime.so.* %{_kf5_debugdir}/kmime.categories +%files -n %{libname} +%{_kf5_libdir}/libKPim5Mime.so.* + %files devel +%dir %{_includedir}/KPim5 +%{_includedir}/KPim5/KMime/ %{_kf5_cmakedir}/KF5Mime/ -%{_kf5_includedir}/KMime/ -%{_kf5_libdir}/libKF5Mime.so +%{_kf5_cmakedir}/KPim5Mime/ +%{_kf5_libdir}/libKPim5Mime.so %{_kf5_mkspecsdir}/qt_KMime.pri -%files lang -f %{name}.lang +%files -n %{libname}-lang -f %{libname}.lang %changelog ++++++ kmime-22.12.3.tar.xz -> kmime-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/.gitlab-ci.yml new/kmime-23.04.0/.gitlab-ci.yml --- old/kmime-22.12.3/.gitlab-ci.yml 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/.gitlab-ci.yml 2023-04-11 06:37:30.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2020-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/.kde-ci.yml new/kmime-23.04.0/.kde-ci.yml --- old/kmime-22.12.3/.kde-ci.yml 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/.kde-ci.yml 2023-04-11 06:37:30.000000000 +0200 @@ -2,8 +2,17 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'Android/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'frameworks/kcodecs' : '@latest' 'frameworks/ki18n' : '@latest' + +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'Android/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/kcodecs' : '@latest-kf6' + 'frameworks/ki18n' : '@latest-kf6' + +Options: + require-passing-tests-on: [ 'Linux', 'FreeBSD' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/CMakeLists.txt new/kmime-23.04.0/CMakeLists.txt --- old/kmime-22.12.3/CMakeLists.txt 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/CMakeLists.txt 2023-04-11 06:37:30.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.22.3") +set(PIM_VERSION "5.23.0") project(KMime 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 ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) include(KDEInstallDirs) @@ -25,6 +25,16 @@ set(KMIME_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(KF_MIN_VERSION "5.240.0") + set(KF_MAJOR_VERSION "6") +else() + set(KF_MIN_VERSION "5.100.0") + set(KF_MAJOR_VERSION "5") +endif() + + find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) if (QT_MAJOR_VERSION STREQUAL "6") find_package(Qt6Core5Compat) @@ -32,18 +42,19 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmime_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MimeConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeConfigVersion.cmake" SOVERSION 5 ) +option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will allow to co-install lib)" ON) 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)") ########### Find packages ########### -find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}Codecs ${KF_MIN_VERSION} CONFIG REQUIRED) add_definitions(-DTRANSLATION_DOMAIN=\"libkmime5\") -ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.99.0) +ecm_set_disabled_deprecation_versions(QT 6.4.0 KF 5.104.0) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) @@ -51,6 +62,7 @@ if (USE_UNITY_CMAKE_SUPPORT) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() + ########### Targets ########### add_subdirectory(src) add_subdirectory(includes) @@ -61,42 +73,82 @@ endif() ########### CMake Config Files ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Mime") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Mime") +set(KMIME_KF5_COMPAT FALSE) +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KPim${KF_MAJOR_VERSION}Mime_QCH + FILE KPim${KF_MAJOR_VERSION}MimeQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MimeQchTargets.cmake\")") +endif() + configure_package_config_file( - "${KMime_SOURCE_DIR}/KF5MimeConfig.cmake.in" - "${KMime_BINARY_DIR}/KF5MimeConfig.cmake" + "${KMime_SOURCE_DIR}/KPimMimeConfig.cmake.in" + "${KMime_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${KMime_BINARY_DIR}/KF5MimeConfig.cmake" - "${KMime_BINARY_DIR}/KF5MimeConfigVersion.cmake" + "${KMime_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeConfig.cmake" + "${KMime_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KF5MimeTargets +install(EXPORT KPim${KF_MAJOR_VERSION}MimeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KF5MimeTargets.cmake - NAMESPACE KF5:: + FILE KPim${KF_MAJOR_VERSION}MimeTargets.cmake + NAMESPACE KPim${KF_MAJOR_VERSION}:: ) install(FILES ${KMime_BINARY_DIR}/kmime_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMime/ + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMime/ COMPONENT Devel ) +#if (QT_MAJOR_VERSION STREQUAL "5") +if (BUILD_WITH_COMPAT_LIBS) +## +# TODO: Backwards compatiblity. Remove in next major version +## +set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Mime") +set(KMIME_KF5_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimMimeConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5MimeConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5MimeConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeConfigVersion.cmake" + RENAME "KF5MimeConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}MimeTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + FILE KPim${KF_MAJOR_VERSION}MimeTargets.cmake + NAMESPACE KF5:: +) if (BUILD_QCH) - ecm_install_qch_export( - TARGETS KF5Mime_QCH - FILE KF5MimeQchTargets.cmake - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeQchTargets.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" COMPONENT Devel ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5MimeQchTargets.cmake\")") endif() + +endif() +#endif() ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/CMakePresets.json new/kmime-23.04.0/CMakePresets.json --- old/kmime-22.12.3/CMakePresets.json 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/CMakePresets.json 2023-04-11 06:37:30.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/kmime-22.12.3/CMakePresets.json.license new/kmime-23.04.0/CMakePresets.json.license --- old/kmime-22.12.3/CMakePresets.json.license 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/CMakePresets.json.license 2023-04-11 06:37:30.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/KF5MimeConfig.cmake.in new/kmime-23.04.0/KF5MimeConfig.cmake.in --- old/kmime-22.12.3/KF5MimeConfig.cmake.in 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/KF5MimeConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -@PACKAGE_INIT@ -include(CMakeFindDependencyMacro) -find_dependency(Qt@QT_MAJOR_VERSION@Core @QT_REQUIRED_VERSION@) -find_dependency(KF5Codecs @KF5_MIN_VERSION@) - -include("${CMAKE_CURRENT_LIST_DIR}/KF5MimeTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/KPimMimeConfig.cmake.in new/kmime-23.04.0/KPimMimeConfig.cmake.in --- old/kmime-22.12.3/KPimMimeConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/kmime-23.04.0/KPimMimeConfig.cmake.in 2023-04-11 06:37:30.000000000 +0200 @@ -0,0 +1,16 @@ +@PACKAGE_INIT@ +include(CMakeFindDependencyMacro) +find_dependency(Qt@QT_MAJOR_VERSION@Core @QT_REQUIRED_VERSION@) +find_dependency(KF@KF_MAJOR_VERSION@Codecs @KF_MIN_VERSION@) + +if (@KMIME_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5Mime) and KF5::Mime targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@Mime) and KPim@KF_MAJOR_VERSION@::Mime instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/autotests/CMakeLists.txt new/kmime-23.04.0/autotests/CMakeLists.txt --- old/kmime-22.12.3/autotests/CMakeLists.txt 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/autotests/CMakeLists.txt 2023-04-11 06:37:30.000000000 +0200 @@ -17,9 +17,9 @@ add_executable(${_testName} ${_testName}.cpp ${kmime_autotest_SRCS}) add_test(NAME kmime-${_testName} COMMAND ${_testName}) target_link_libraries(${_testName} - KF5Mime + KPim${KF_MAJOR_VERSION}Mime Qt::Test - KF5::Codecs + KF${KF_MAJOR_VERSION}::Codecs ) if (TARGET Qt6::Core5Compat) target_link_libraries(${_testName} Qt6::Core5Compat) # QTextCodec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/includes/CMakeLists.txt new/kmime-23.04.0/includes/CMakeLists.txt --- old/kmime-22.12.3/includes/CMakeLists.txt 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/includes/CMakeLists.txt 2023-04-11 06:37:30.000000000 +0200 @@ -16,5 +16,5 @@ install(FILES ${KMime_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMime/KMime COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMime/KMime COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/po/zh_CN/libkmime5.po new/kmime-23.04.0/po/zh_CN/libkmime5.po --- old/kmime-22.12.3/po/zh_CN/libkmime5.po 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/po/zh_CN/libkmime5.po 2023-04-11 06:37:30.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-12-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/kmime-22.12.3/sanitizers.supp new/kmime-23.04.0/sanitizers.supp --- old/kmime-22.12.3/sanitizers.supp 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/sanitizers.supp 2023-04-11 06:37:30.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/src/CMakeLists.txt new/kmime-23.04.0/src/CMakeLists.txt --- old/kmime-22.12.3/src/CMakeLists.txt 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/src/CMakeLists.txt 2023-04-11 06:37:30.000000000 +0200 @@ -6,10 +6,10 @@ kde_enable_exceptions() ########### next target ############### -add_library(KF5Mime) -add_library(KF5::Mime ALIAS KF5Mime) +add_library(KPim${KF_MAJOR_VERSION}Mime) +add_library(KPim${KF_MAJOR_VERSION}::Mime ALIAS KPim${KF_MAJOR_VERSION}Mime) -target_sources(KF5Mime PRIVATE +target_sources(KPim${KF_MAJOR_VERSION}Mime PRIVATE kmime_charfreq.cpp kmime_util.cpp kmime_mdn.cpp @@ -41,43 +41,43 @@ kmime_types.h ) -ecm_qt_declare_logging_category(KF5Mime +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}Mime HEADER kmime_debug.h IDENTIFIER KMIME_LOG CATEGORY_NAME org.kde.pim.kmime DESCRIPTION "kmime (pim lib)" EXPORT KMIME) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) - set_target_properties(KF5Mime PROPERTIES UNITY_BUILD ON) + set_target_properties(KPim${KF_MAJOR_VERSION}Mime PROPERTIES UNITY_BUILD ON) endif() -generate_export_header(KF5Mime BASE_NAME KMime) +generate_export_header(KPim${KF_MAJOR_VERSION}Mime BASE_NAME KMime) -target_include_directories(KF5Mime INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KMime>") -target_include_directories(KF5Mime PUBLIC "$<BUILD_INTERFACE:${KMime_SOURCE_DIR}/src;${KMime_BINARY_DIR}/src;${KMime_BINARY_DIR}>") +target_include_directories(KPim${KF_MAJOR_VERSION}Mime INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMime>") +target_include_directories(KPim${KF_MAJOR_VERSION}Mime PUBLIC "$<BUILD_INTERFACE:${KMime_SOURCE_DIR}/src;${KMime_BINARY_DIR}/src;${KMime_BINARY_DIR}>") if (WIN32) set(_kmime_extra_libs ws2_32) endif() -target_link_libraries(KF5Mime +target_link_libraries(KPim${KF_MAJOR_VERSION}Mime PUBLIC Qt::Core PRIVATE - KF5::I18n - KF5::Codecs + KF${KF_MAJOR_VERSION}::I18n + KF${KF_MAJOR_VERSION}::Codecs ${_kmime_extra_libs} ) if (TARGET Qt6::Core5Compat) - target_link_libraries(KF5Mime PRIVATE Qt6::Core5Compat) # QTextCodec + target_link_libraries(KPim${KF_MAJOR_VERSION}Mime PRIVATE Qt6::Core5Compat) # QTextCodec endif() -set_target_properties(KF5Mime PROPERTIES +set_target_properties(KPim${KF_MAJOR_VERSION}Mime PROPERTIES VERSION ${KMIME_VERSION} SOVERSION ${KMIME_SOVERSION} EXPORT_NAME Mime ) -install(TARGETS KF5Mime EXPORT KF5MimeTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KPim${KF_MAJOR_VERSION}Mime EXPORT KPim${KF_MAJOR_VERSION}MimeTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) # Don't install them but needed to compile kdepimlibs ecm_generate_headers(KMime_CamelCase_HEADERS @@ -105,14 +105,14 @@ kmime_dateformatter.h kmime_util.h kmime_types.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMime/kmime COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMime/kmime COMPONENT Devel ) if (BUILD_QCH) ecm_add_qch( - KF5Mime_QCH + KPim${KF_MAJOR_VERSION}Mime_QCH NAME KMime - BASE_NAME KF5Mime + BASE_NAME KPim${KF_MAJOR_VERSION}Mime VERSION ${PIM_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API @@ -120,7 +120,7 @@ MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" LINK_QCHS - Qt5Core_QCH + Qt${QT_MAJOR_VERSION}Core_QCH INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS @@ -133,5 +133,5 @@ ecm_qt_install_logging_categories(EXPORT KMIME FILE kmime.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -ecm_generate_pri_file(BASE_NAME KMime LIB_NAME KF5Mime DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KMime) +ecm_generate_pri_file(BASE_NAME KMime LIB_NAME KPim${KF_MAJOR_VERSION}Mime DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMime) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/src/kmime_codecs.cpp new/kmime-23.04.0/src/kmime_codecs.cpp --- old/kmime-22.12.3/src/kmime_codecs.cpp 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/src/kmime_codecs.cpp 2023-04-11 06:37:30.000000000 +0200 @@ -10,7 +10,6 @@ #include "kmime_codecs.h" #include "kmime_debug.h" -#include <KCharsets> #include <QTextCodec> @@ -25,19 +24,17 @@ int start = 0; int end = 0; bool nonAscii = false; - bool ok = true; bool useQEncoding = false; // fromLatin1() is safe here, codecForName() uses toLatin1() internally - const QTextCodec *codec = KCharsets::charsets()->codecForName(QString::fromLatin1(charset), ok); + const QTextCodec *codec = QTextCodec::codecForName(charset); QByteArray usedCS; - if (!ok) { + if (!codec) { //no codec available => try local8Bit and hope the best ;-) - usedCS = QTextCodec::codecForLocale()->name(); - codec = KCharsets::charsets()->codecForName(QString::fromLatin1(usedCS), ok); + codec = QTextCodec::codecForLocale(); + usedCS = codec->name(); } else { - Q_ASSERT(codec); if (charset.isEmpty()) { usedCS = codec->name(); } else { @@ -99,10 +96,9 @@ if (useQEncoding) { result += "?Q?"; - char c; char hexcode; // "Q"-encoding implementation described in RFC 2047 for (int i = start; i < end; i++) { - c = encoded8Bit[i]; + char c = encoded8Bit[i]; if (c == ' ') { // make the result readable with not MIME-capable readers result += '_'; } else { @@ -184,7 +180,7 @@ return {}; } - const QTextCodec *codec = KCharsets::charsets()->codecForName(QString::fromLatin1(charset)); + const QTextCodec *codec = QTextCodec::codecForName(charset); QByteArray latin; if (charset == "us-ascii") { latin = str.toLatin1(); @@ -244,7 +240,11 @@ { int p = str.indexOf('\''); if (p < 0) { - return KCharsets::charsets()->codecForName(QString::fromLatin1(defaultCS))->toUnicode(str); + auto codec = QTextCodec::codecForName(defaultCS); + if (!codec) { + codec = QTextCodec::codecForLocale(); + } + return codec->toUnicode(str); } QByteArray charset = str.left(p); @@ -274,9 +274,12 @@ p++; } qCDebug(KMIME_LOG) << "Got pre-decoded:" << st; - const QTextCodec *charsetcodec = KCharsets::charsets()->codecForName(QString::fromLatin1(charset)); + const QTextCodec *charsetcodec = QTextCodec::codecForName(charset); if (!charsetcodec || forceCS) { - charsetcodec = KCharsets::charsets()->codecForName(QString::fromLatin1(defaultCS)); + charsetcodec = QTextCodec::codecForName(defaultCS); + } + if (!charsetcodec) { + charsetcodec = QTextCodec::codecForLocale(); } usedCS = charsetcodec->name(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/src/kmime_content.cpp new/kmime-23.04.0/src/kmime_content.cpp --- old/kmime-22.12.3/src/kmime_content.cpp 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/src/kmime_content.cpp 2023-04-11 06:37:30.000000000 +0200 @@ -28,10 +28,12 @@ #include "kmime_parsers.h" #include "kmime_util_p.h" -#include <KCharsets> #include <KCodecs> - +#include <QDebug> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <QStringDecoder> +#endif #include <QTextCodec> using namespace KMime; @@ -367,16 +369,25 @@ return {}; } - bool ok = true; - QTextCodec *codec = - KCharsets::charsets()->codecForName(QLatin1String(contentType()->charset()), ok); - if (!ok || codec == nullptr) { // no suitable codec found => try local settings and hope the best ;-) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QTextCodec *codec = QTextCodec::codecForName(contentType()->charset()); + if (codec == nullptr) { // no suitable codec found => try local settings and hope the best ;-) codec = QTextCodec::codecForLocale(); QByteArray chset = codec->name(); contentType()->setCharset(chset); } QString s = codec->toUnicode(d_ptr->body.data(), d_ptr->body.length()); +#else + QStringDecoder codec(contentType()->charset().constData()); + if (!codec.isValid()) { // no suitable codec found => try local settings and hope the best ;-) + codec = QStringDecoder(QStringDecoder::System); + QByteArray chset = codec.name(); + contentType()->setCharset(chset); + } + + QString s = codec.decode(d_ptr->body); +#endif if (trimText || removeTrailingNewlines) { int i; @@ -403,11 +414,9 @@ void Content::fromUnicodeString(const QString &s) { - bool ok = true; - QTextCodec *codec = - KCharsets::charsets()->codecForName(QLatin1String(contentType()->charset()), ok); + QTextCodec *codec = QTextCodec::codecForName(contentType()->charset()); - if (!ok) { // no suitable codec found => try local settings and hope the best ;-) + if (!codec) { // no suitable codec found => try local settings and hope the best ;-) codec = QTextCodec::codecForLocale(); QByteArray chset = codec->name(); contentType()->setCharset(chset); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/src/kmime_header_parsing.cpp new/kmime-23.04.0/src/kmime_header_parsing.cpp --- old/kmime-22.12.3/src/kmime_header_parsing.cpp 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/src/kmime_header_parsing.cpp 2023-04-11 06:37:30.000000000 +0200 @@ -18,8 +18,6 @@ #include "kmime_debug.h" #include "kmime_warning.h" -#include <KCharsets> - #include <KCodecs> #include <QTextCodec> @@ -182,22 +180,24 @@ assert(dec); // try if there's a (text)codec for the charset found: - bool matchOK = false; QTextCodec *textCodec = nullptr; if (forceCS || maybeCharset.isEmpty()) { - textCodec = KCharsets::charsets()->codecForName(QLatin1String(defaultCS), matchOK); + textCodec = QTextCodec::codecForName(defaultCS); + if (!textCodec) { + textCodec = QTextCodec::codecForName("iso-8859-1"); + } usedCS = cachedCharset(defaultCS); } else { - textCodec = KCharsets::charsets()->codecForName(QLatin1String(maybeCharset), matchOK); - if (!matchOK) { //no suitable codec found => use default charset - textCodec = KCharsets::charsets()->codecForName(QLatin1String(defaultCS), matchOK); + textCodec = QTextCodec::codecForName(maybeCharset); + if (textCodec) { //no suitable codec found => use default charset usedCS = cachedCharset(defaultCS); } else { + textCodec = QTextCodec::codecForName("iso-8859-1"); usedCS = cachedCharset(maybeCharset); } } - if (!matchOK || !textCodec) { + if (!textCodec) { KMIME_WARN_UNKNOWN(Charset, maybeCharset); delete dec; return false; @@ -1425,10 +1425,8 @@ // get the decoders: // - bool matchOK = false; - textcodec = KCharsets::charsets()->codecForName(QLatin1String(charset), matchOK); - if (!matchOK) { - textcodec = nullptr; + textcodec = QTextCodec::codecForName(charset); + if (!textcodec) { KMIME_WARN_UNKNOWN(Charset, charset); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/src/kmime_headers.cpp new/kmime-23.04.0/src/kmime_headers.cpp --- old/kmime-22.12.3/src/kmime_headers.cpp 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/src/kmime_headers.cpp 2023-04-11 06:37:30.000000000 +0200 @@ -35,7 +35,6 @@ #include "kmime_debug.h" #include "kmime_warning.h" -#include <KCharsets> #include <KCodecs> #include <cassert> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/src/kmime_util.cpp new/kmime-23.04.0/src/kmime_util.cpp --- old/kmime-22.12.3/src/kmime_util.cpp 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/src/kmime_util.cpp 2023-04-11 06:37:30.000000000 +0200 @@ -19,7 +19,6 @@ #include <config-kmime.h> -#include <KCharsets> #include <QCoreApplication> #include <QRegularExpression> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmime-22.12.3/tests/CMakeLists.txt new/kmime-23.04.0/tests/CMakeLists.txt --- old/kmime-22.12.3/tests/CMakeLists.txt 2023-02-25 06:08:26.000000000 +0100 +++ new/kmime-23.04.0/tests/CMakeLists.txt 2023-04-11 06:37:30.000000000 +0200 @@ -6,13 +6,13 @@ ########### next target ############### add_executable(test_kmime_header_parsing test_kmime_header_parsing.cpp) - target_link_libraries(test_kmime_header_parsing KF5Mime) + target_link_libraries(test_kmime_header_parsing KPim${KF_MAJOR_VERSION}Mime) ########### next target ############### add_executable(test_mdn test_mdn.cpp) add_test(NAME test_mdn COMMAND test_mdn) - target_link_libraries(test_mdn KF5Mime) + target_link_libraries(test_mdn KPim${KF_MAJOR_VERSION}Mime) endif() @@ -20,10 +20,10 @@ add_executable(test_charfreq test_charfreq.cpp) add_test(NAME test_charfreq COMMAND test_charfreq) -target_link_libraries(test_charfreq KF5Mime) +target_link_libraries(test_charfreq KPim${KF_MAJOR_VERSION}Mime) ########### next target ############### add_executable(test_dates test_dates.cpp) add_test(NAME test_dates COMMAND test_dates) -target_link_libraries(test_dates KF5Mime) +target_link_libraries(test_dates KPim${KF_MAJOR_VERSION}Mime)
