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-08-31 13:43:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmbox (Old) and /work/SRC/openSUSE:Factory/.kmbox.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmbox" Thu Aug 31 13:43:17 2023 rev:96 rq:1105722 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmbox/kmbox.changes 2023-07-07 15:47:32.500275057 +0200 +++ /work/SRC/openSUSE:Factory/.kmbox.new.1766/kmbox.changes 2023-08-31 13:45:01.834749101 +0200 @@ -1,0 +2,26 @@ +Sun Aug 20 13:59:42 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.08.0/ +- No code change since 23.07.90 + +------------------------------------------------------------------- +Mon Aug 14 08:02:59 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.07.90 + * New feature release +- No code change since 23.07.80 + +------------------------------------------------------------------- +Tue Aug 1 10:13:59 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Remove CI 6 job. We will use kf6 branch for kf6 works + * Generate PACKAGE_INCLUDE_QCHTARGETS first + * Use correct INSTALL_TARGETS_DEFAULT_ARGS + +------------------------------------------------------------------- Old: ---- kmbox-23.04.3.tar.xz kmbox-23.04.3.tar.xz.sig New: ---- kmbox-23.08.0.tar.xz kmbox-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmbox.spec ++++++ --- /var/tmp/diff_new_pack.y6zkvM/_old 2023-08-31 13:45:03.082793709 +0200 +++ /var/tmp/diff_new_pack.y6zkvM/_new 2023-08-31 13:45:03.082793709 +0200 @@ -19,7 +19,7 @@ %bcond_without released %define libname libKPim5Mbox5 Name: kmbox -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: KDE PIM Libraries: Mailbox functionality License: LGPL-2.1-or-later @@ -77,7 +77,6 @@ %files devel %dir %{_includedir}/KPim5 %{_includedir}/KPim5/KMbox/ -%{_kf5_cmakedir}/KF5Mbox/ %{_kf5_cmakedir}/KPim5Mbox/ %{_kf5_libdir}/libKPim5Mbox.so %{_kf5_mkspecsdir}/qt_KMbox.pri ++++++ kmbox-23.04.3.tar.xz -> kmbox-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-23.04.3/.gitignore new/kmbox-23.08.0/.gitignore --- old/kmbox-23.04.3/.gitignore 2023-06-10 16:10:21.000000000 +0200 +++ new/kmbox-23.08.0/.gitignore 2023-08-13 09:04:32.000000000 +0200 @@ -26,3 +26,4 @@ .idea /cmake-build* .cache +Testing/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-23.04.3/.gitlab-ci.yml new/kmbox-23.08.0/.gitlab-ci.yml --- old/kmbox-23.04.3/.gitlab-ci.yml 2023-06-10 16:10:21.000000000 +0200 +++ new/kmbox-23.08.0/.gitlab-ci.yml 2023-08-13 09:04:32.000000000 +0200 @@ -6,8 +6,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-23.04.3/.kde-ci.yml new/kmbox-23.08.0/.kde-ci.yml --- old/kmbox-23.04.3/.kde-ci.yml 2023-06-10 16:10:21.000000000 +0200 +++ new/kmbox-23.08.0/.kde-ci.yml 2023-08-13 09:04:32.000000000 +0200 @@ -7,10 +7,5 @@ '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-23.04.3/CMakeLists.txt new/kmbox-23.08.0/CMakeLists.txt --- old/kmbox-23.04.3/CMakeLists.txt 2023-06-10 16:10:21.000000000 +0200 +++ new/kmbox-23.08.0/CMakeLists.txt 2023-08-13 09:04:32.000000000 +0200 @@ -2,12 +2,12 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.23.3") +set(PIM_VERSION "5.24.0") project(KMbox VERSION ${PIM_VERSION}) # ECM setup -set(KF_MIN_VERSION "5.103.0") +set(KF_MIN_VERSION "5.105.0") find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -39,8 +39,7 @@ endif() set(KMBOX_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIB_VERSION "5.23.3") -option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will allow to co-install lib)" ON) +set(KMIME_LIB_VERSION "5.24.0") 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)") @@ -56,7 +55,7 @@ find_package(Qt6Core5Compat) endif() -ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.105.0) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) @@ -65,38 +64,6 @@ 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) @@ -106,7 +73,15 @@ ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Mbox") -set(KMBOX_KF5_COMPAT FALSE) +if (BUILD_QCH) + ecm_install_qch_export( + 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}/KPim${KF_MAJOR_VERSION}MBoxQchTargets.cmake\")") +endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimMboxConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MboxConfig.cmake" @@ -129,15 +104,5 @@ COMPONENT Devel ) -if (BUILD_QCH) - ecm_install_qch_export( - 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}/KPim${KF_MAJOR_VERSION}MBoxQchTargets.cmake\")") -endif() - kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-23.04.3/CMakePresets.json new/kmbox-23.08.0/CMakePresets.json --- old/kmbox-23.04.3/CMakePresets.json 2023-06-10 16:10:21.000000000 +0200 +++ new/kmbox-23.08.0/CMakePresets.json 2023-08-13 09:04:32.000000000 +0200 @@ -41,6 +41,31 @@ ] }, { + "name": "dev-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "dev-qt6-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base-qt6" + ] + }, + + { "name": "dev-qt6", "displayName": "Build against qt6", "binaryDir": "${sourceDir}/build-qt6", @@ -158,11 +183,19 @@ "name": "dev-mold", "configurePreset": "dev-mold" }, + { + "name": "dev-qch", + "configurePreset": "dev-qch" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { + "name": "dev-qt6-qch", + "configurePreset": "dev-qt6-qch" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-23.04.3/KPimMboxConfig.cmake.in new/kmbox-23.08.0/KPimMboxConfig.cmake.in --- old/kmbox-23.04.3/KPimMboxConfig.cmake.in 2023-06-10 16:10:21.000000000 +0200 +++ new/kmbox-23.08.0/KPimMboxConfig.cmake.in 2023-08-13 09:04:32.000000000 +0200 @@ -5,16 +5,5 @@ 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@KF_MAJOR_VERSION@MboxTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@
