Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmbox for openSUSE:Factory checked in at 2023-04-23 22:45:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmbox (Old) and /work/SRC/openSUSE:Factory/.kmbox.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmbox" Sun Apr 23 22:45:10 2023 rev:92 rq:1082002 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmbox/kmbox.changes 2023-03-03 22:26:19.642917750 +0100 +++ /work/SRC/openSUSE:Factory/.kmbox.new.1533/kmbox.changes 2023-04-23 22:46:58.950548370 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:45:59 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:10 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:43:44 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- kmbox-22.12.3.tar.xz kmbox-22.12.3.tar.xz.sig New: ---- kmbox-23.04.0.tar.xz kmbox-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmbox.spec ++++++ --- /var/tmp/diff_new_pack.o0GIOV/_old 2023-04-23 22:47:00.746558518 +0200 +++ /var/tmp/diff_new_pack.o0GIOV/_new 2023-04-23 22:47:00.750558540 +0200 @@ -16,11 +16,10 @@ # -# 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}')} %bcond_without released +%define libname libKPim5Mbox5 Name: kmbox -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: KDE PIM Libraries: Mailbox functionality License: LGPL-2.1-or-later @@ -32,22 +31,24 @@ %endif BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem -BuildRequires: cmake(KF5Mime) +BuildRequires: cmake(KPim5Mime) BuildRequires: cmake(Qt5Test) +Conflicts: libKF5MBox5 < %{version} %description This package contains the basic packages for KDE PIM applications. -%package -n libKF5Mbox5 +%package -n %{libname} Summary: KDE PIM Libraries: Mailbox functionality +%requires_eq kmbox -%description -n libKF5Mbox5 +%description -n %{libname} This package provides the mailbox functionality for KDE PIM applications %package devel Summary: KDE PIM Libraries: Build Environment -Requires: libKF5Mbox5 = %{version} -Requires: cmake(KF5Mime) +Requires: %{libname} = %{version} +Requires: cmake(KPim5Mime) %description devel This package contains necessary include files and libraries needed @@ -57,24 +58,28 @@ %autosetup -p1 %build - %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} - %cmake_build +%cmake_kf5 -d build -- -DBUILD_TESTING=ON +%cmake_build %install - %kf5_makeinstall -C build +%kf5_makeinstall -C build -%ldconfig_scriptlets -n libKF5Mbox5 +%ldconfig_scriptlets -n %{libname} -%files -n libKF5Mbox5 +%files %license LICENSES/* %{_kf5_debugdir}/*.categories %{_kf5_debugdir}/*.renamecategories -%{_kf5_libdir}/libKF5Mbox.so.* + +%files -n %{libname} +%{_kf5_libdir}/libKPim5Mbox.so.* %files devel +%dir %{_includedir}/KPim5 +%{_includedir}/KPim5/KMbox/ %{_kf5_cmakedir}/KF5Mbox/ -%{_kf5_includedir}/KMbox/ -%{_kf5_libdir}/libKF5Mbox.so +%{_kf5_cmakedir}/KPim5Mbox/ +%{_kf5_libdir}/libKPim5Mbox.so %{_kf5_mkspecsdir}/qt_KMbox.pri %changelog ++++++ kmbox-22.12.3.tar.xz -> kmbox-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-22.12.3/.codespellrc.license new/kmbox-23.04.0/.codespellrc.license --- old/kmbox-22.12.3/.codespellrc.license 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/.codespellrc.license 2023-04-03 07:11:23.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2022-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-22.12.3/.gitlab-ci.yml new/kmbox-23.04.0/.gitlab-ci.yml --- old/kmbox-22.12.3/.gitlab-ci.yml 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/.gitlab-ci.yml 2023-04-03 07:11:23.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/kmbox-22.12.3/.kde-ci.yml new/kmbox-23.04.0/.kde-ci.yml --- old/kmbox-22.12.3/.kde-ci.yml 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/.kde-ci.yml 2023-04-03 07:11:23.000000000 +0200 @@ -2,7 +2,15 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'Android/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'pim/kmime' : '@same' + +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'Android/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'pim/kmime' : '@latest-kf6' + +Options: + require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-22.12.3/CMakeLists.txt new/kmbox-23.04.0/CMakeLists.txt --- old/kmbox-22.12.3/CMakeLists.txt 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/CMakeLists.txt 2023-04-03 07:11:23.000000000 +0200 @@ -2,13 +2,13 @@ # 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(KMbox VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.99.0") -find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) +set(KF_MIN_VERSION "5.103.0") +find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) @@ -30,26 +30,33 @@ include(ECMDeprecationSettings) include(ECMAddQch) - +if (QT_MAJOR_VERSION STREQUAL "6") + 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() set(KMBOX_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIB_VERSION "5.22.3") +set(KMIME_LIB_VERSION "5.23.0") +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)") ecm_setup_version(PROJECT VARIABLE_PREFIX KMBOX VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MboxConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MboxConfigVersion.cmake" SOVERSION 5 ) ########### Find packages ########### -find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) +find_package(KPim${KF_MAJOR_VERSION}Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) if (QT_MAJOR_VERSION STREQUAL "6") find_package(Qt6Core5Compat) endif() -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) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) @@ -57,6 +64,39 @@ if (USE_UNITY_CMAKE_SUPPORT) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() + +if (BUILD_WITH_COMPAT_LIBS) +if (QT_MAJOR_VERSION STREQUAL "5") +## +# TODO: Backwards compatiblity. Remove in next major version +## +set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Mbox") +set(KMBOX_KF5_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimMboxConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5MboxConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5MboxConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MboxConfigVersion.cmake" + RENAME "KF5MboxConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}MboxTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + FILE KPim${KF_MAJOR_VERSION}MboxTargets.cmake + NAMESPACE KF5:: +) +endif() +endif() + ########### Targets ########### add_subdirectory(src) @@ -65,37 +105,38 @@ endif() ########### CMake Config Files ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Mbox") - +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Mbox") +set(KMBOX_KF5_COMPAT FALSE) configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5MboxConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5MboxConfig.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/KPimMboxConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MboxConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5MboxConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5MboxConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MboxConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MboxConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KF5MboxTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5MboxTargets.cmake NAMESPACE KF5::) +install(EXPORT KPim${KF_MAJOR_VERSION}MboxTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE KPim${KF_MAJOR_VERSION}MboxTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMbox + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMbox COMPONENT Devel ) if (BUILD_QCH) ecm_install_qch_export( - TARGETS KF5MBox_QCH - FILE KF5MBoxQchTargets.cmake + TARGETS KPim${KF_MAJOR_VERSION}Mbox_QCH + FILE KPim${KF_MAJOR_VERSION}MBoxQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5MBoxQchTargets.cmake\")") + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MBoxQchTargets.cmake\")") endif() kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-22.12.3/CMakePresets.json new/kmbox-23.04.0/CMakePresets.json --- old/kmbox-22.12.3/CMakePresets.json 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/CMakePresets.json 2023-04-03 07:11:23.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/kmbox-22.12.3/CMakePresets.json.license new/kmbox-23.04.0/CMakePresets.json.license --- old/kmbox-22.12.3/CMakePresets.json.license 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/CMakePresets.json.license 2023-04-03 07:11:23.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/kmbox-22.12.3/KF5MboxConfig.cmake.in new/kmbox-23.04.0/KF5MboxConfig.cmake.in --- old/kmbox-22.12.3/KF5MboxConfig.cmake.in 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/KF5MboxConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: 2014 Christophe Giboudeaux <[email protected]> -# SPDX-License-Identifier: BSD-3-Clause - -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) -find_dependency(KF5Mime "@KMIME_LIB_VERSION@") - -include("${CMAKE_CURRENT_LIST_DIR}/KF5MboxTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-22.12.3/KPimMboxConfig.cmake.in new/kmbox-23.04.0/KPimMboxConfig.cmake.in --- old/kmbox-22.12.3/KPimMboxConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/kmbox-23.04.0/KPimMboxConfig.cmake.in 2023-04-03 07:11:23.000000000 +0200 @@ -0,0 +1,20 @@ +# SPDX-FileCopyrightText: 2014 Christophe Giboudeaux <[email protected]> +# SPDX-License-Identifier: BSD-3-Clause + +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(KPim@KF_MAJOR_VERSION@Mime "@KMIME_LIB_VERSION@") + +if (@KMBOX_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5Mbox) and KF5::Mbox targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@Mbox) and KPim@KF_MAJOR_VERSION@::Mbox 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/kmbox-22.12.3/autotests/CMakeLists.txt new/kmbox-23.04.0/autotests/CMakeLists.txt --- old/kmbox-22.12.3/autotests/CMakeLists.txt 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/autotests/CMakeLists.txt 2023-04-03 07:11:23.000000000 +0200 @@ -8,4 +8,4 @@ ########### next target ############### -ecm_add_tests(mboxtest.cpp mboxbenchmark.cpp NAME_PREFIX "mbox-" LINK_LIBRARIES KF5Mbox Qt::Test) +ecm_add_tests(mboxtest.cpp mboxbenchmark.cpp NAME_PREFIX "mbox-" LINK_LIBRARIES KPim${KF_MAJOR_VERSION}Mbox Qt::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-22.12.3/sanitizers.supp new/kmbox-23.04.0/sanitizers.supp --- old/kmbox-22.12.3/sanitizers.supp 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/sanitizers.supp 2023-04-03 07:11:23.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/kmbox-22.12.3/src/CMakeLists.txt new/kmbox-23.04.0/src/CMakeLists.txt --- old/kmbox-22.12.3/src/CMakeLists.txt 2023-02-04 11:43:36.000000000 +0100 +++ new/kmbox-23.04.0/src/CMakeLists.txt 2023-04-03 07:11:23.000000000 +0200 @@ -1,10 +1,10 @@ # SPDX-FileCopyrightText: none # SPDX-License-Identifier: BSD-3-Clause -add_library(KF5Mbox) -add_library(KF5::Mbox ALIAS KF5Mbox) +add_library(KPim${KF_MAJOR_VERSION}Mbox) +add_library(KPim${KF_MAJOR_VERSION}::Mbox ALIAS KPim${KF_MAJOR_VERSION}Mbox) -target_sources(KF5Mbox PRIVATE +target_sources(KPim${KF_MAJOR_VERSION}Mbox PRIVATE mboxentry.cpp mbox_p.cpp mbox.cpp @@ -14,35 +14,35 @@ mboxentry_p.h ) -ecm_qt_declare_logging_category(KF5Mbox HEADER kmbox_debug.h IDENTIFIER KMBOX_LOG CATEGORY_NAME org.kde.pim.kmbox +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}Mbox HEADER kmbox_debug.h IDENTIFIER KMBOX_LOG CATEGORY_NAME org.kde.pim.kmbox OLD_CATEGORY_NAMES log_kmbox DESCRIPTION "kmbox (pim lib)" EXPORT KMBOX) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) - set_target_properties(KF5Mbox PROPERTIES UNITY_BUILD ON) + set_target_properties(KPim${KF_MAJOR_VERSION}Mbox PROPERTIES UNITY_BUILD ON) endif() -generate_export_header(KF5Mbox BASE_NAME kmbox) +generate_export_header(KPim${KF_MAJOR_VERSION}Mbox BASE_NAME kmbox) -target_include_directories(KF5Mbox INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KMbox>") -target_include_directories(KF5Mbox PUBLIC "$<BUILD_INTERFACE:${KMbox_SOURCE_DIR}/src;${KMbox_BINARY_DIR}/src>") +target_include_directories(KPim${KF_MAJOR_VERSION}Mbox INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMbox>") +target_include_directories(KPim${KF_MAJOR_VERSION}Mbox PUBLIC "$<BUILD_INTERFACE:${KMbox_SOURCE_DIR}/src;${KMbox_BINARY_DIR}/src>") -target_link_libraries(KF5Mbox +target_link_libraries(KPim${KF_MAJOR_VERSION}Mbox PUBLIC - KF5::Mime + KPim${KF_MAJOR_VERSION}::Mime ) if (TARGET Qt6::Core5Compat) - target_link_libraries(KF5Mbox PRIVATE Qt6::Core5Compat) # QTextCodec + target_link_libraries(KPim${KF_MAJOR_VERSION}Mbox PRIVATE Qt6::Core5Compat) # QTextCodec endif() -set_target_properties(KF5Mbox PROPERTIES +set_target_properties(KPim${KF_MAJOR_VERSION}Mbox PROPERTIES VERSION ${KMBOX_VERSION} SOVERSION ${KMBOX_SOVERSION} EXPORT_NAME Mbox ) -install(TARGETS KF5Mbox EXPORT KF5MboxTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KPim${KF_MAJOR_VERSION}Mbox EXPORT KPim${KF_MAJOR_VERSION}MboxTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) ########### Generate Headers ############### ecm_generate_headers(KMbox_CamelCase_HEADERS @@ -55,7 +55,7 @@ install(FILES ${KMbox_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMbox/KMbox/ + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMbox/KMbox/ COMPONENT Devel ) @@ -63,19 +63,20 @@ install(FILES ${KMbox_BINARY_DIR}/src/kmbox_export.h ${KMbox_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMbox/kmbox + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMbox/kmbox COMPONENT Devel ) ecm_qt_install_logging_categories(EXPORT KMBOX FILE kmbox.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -ecm_generate_pri_file(BASE_NAME KMbox LIB_NAME KF5Mbox DEPS "KMime" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KMbox) +ecm_generate_pri_file(BASE_NAME KMbox LIB_NAME KPim${KF_MAJOR_VERSION}Mbox DEPS "KMime" + FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KMbox) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) if (BUILD_QCH) ecm_add_qch( - KF5MBox_QCH - NAME KMBox - BASE_NAME KF5MBox + KPim${KF_MAJOR_VERSION}Mbox_QCH + NAME KMbox + BASE_NAME KPim${KF_MAJOR_VERSION}Mbox VERSION ${PIM_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API @@ -83,7 +84,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
