Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmbox for openSUSE:Factory checked in at 2022-04-24 00:19:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmbox (Old) and /work/SRC/openSUSE:Factory/.kmbox.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmbox" Sun Apr 24 00:19:30 2022 rev:80 rq:971502 version:22.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmbox/kmbox.changes 2022-03-04 20:15:48.992799537 +0100 +++ /work/SRC/openSUSE:Factory/.kmbox.new.1538/kmbox.changes 2022-04-24 00:19:52.368274494 +0200 @@ -1,0 +2,27 @@ +Mon Apr 18 07:51:54 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.04.0/ + +------------------------------------------------------------------- +Fri Apr 8 18:19:40 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.90 + * New feature release + +------------------------------------------------------------------- +Wed Mar 23 08:14:22 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.80 + * New feature release +- Changes since 21.12.3: + * Fix compile without deprecated method + * Install *_version.h in KF5/<module> + * Add qt6 CI support + * Adapt build system for building against qt6 + * Add missing include (qt6) + * Correct prefix to other PIM repositories in .kde-ci.yml + +------------------------------------------------------------------- Old: ---- kmbox-21.12.3.tar.xz kmbox-21.12.3.tar.xz.sig New: ---- kmbox-22.04.0.tar.xz kmbox-22.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmbox.spec ++++++ --- /var/tmp/diff_new_pack.tJhPDA/_old 2022-04-24 00:19:52.904274899 +0200 +++ /var/tmp/diff_new_pack.tJhPDA/_new 2022-04-24 00:19:52.912274905 +0200 @@ -20,7 +20,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: kmbox -Version: 21.12.3 +Version: 22.04.0 Release: 0 Summary: KDE PIM Libraries: Mailbox functionality License: LGPL-2.1-or-later @@ -78,7 +78,6 @@ %files devel %{_kf5_cmakedir}/KF5Mbox/ %{_kf5_includedir}/KMbox/ -%{_kf5_includedir}/kmbox_version.h %{_kf5_libdir}/libKF5Mbox.so %{_kf5_mkspecsdir}/qt_KMbox.pri ++++++ kmbox-21.12.3.tar.xz -> kmbox-22.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/.git-blame-ignore-revs new/kmbox-22.04.0/.git-blame-ignore-revs --- old/kmbox-21.12.3/.git-blame-ignore-revs 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/.git-blame-ignore-revs 2022-04-09 17:56:29.000000000 +0200 @@ -1,2 +1,4 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: none # clang-format f18008304349f55a7bf2f03057bfeee90a942fbc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/.gitignore new/kmbox-22.04.0/.gitignore --- old/kmbox-21.12.3/.gitignore 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/.gitignore 2022-04-09 17:56:29.000000000 +0200 @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: CC0-1.0 +# SPDX-FileCopyrightText: none # Ignore the following files *~ *.[oa] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/.gitlab-ci.yml new/kmbox-22.04.0/.gitlab-ci.yml --- old/kmbox-21.12.3/.gitlab-ci.yml 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/.gitlab-ci.yml 2022-04-09 17:56:29.000000000 +0200 @@ -1,7 +1,10 @@ -# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml - 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/.krazy.license new/kmbox-22.04.0/.krazy.license --- old/kmbox-21.12.3/.krazy.license 1970-01-01 01:00:00.000000000 +0100 +++ new/kmbox-22.04.0/.krazy.license 2022-04-09 17:56:29.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/kmbox-21.12.3/CMakeLists.txt new/kmbox-22.04.0/CMakeLists.txt --- old/kmbox-21.12.3/CMakeLists.txt 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/CMakeLists.txt 2022-04-09 17:56:29.000000000 +0200 @@ -1,10 +1,13 @@ +# SPDX-FileCopyrightText: none +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.19.3") +set(PIM_VERSION "5.20.0") project(KMbox VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.87.0") +set(KF5_MIN_VERSION "5.91.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -24,12 +27,13 @@ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) include(ECMQtDeclareLoggingCategory) +include(ECMDeprecationSettings) include(ECMAddQch) set(KMBOX_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIB_VERSION "5.19.3") +set(KMIME_LIB_VERSION "5.20.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)") ecm_setup_version(PROJECT VARIABLE_PREFIX KMBOX @@ -40,9 +44,12 @@ ########### Find packages ########### find_package(KF5Mime ${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.92.0) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) @@ -77,7 +84,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMbox COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/CMakePresets.json new/kmbox-22.04.0/CMakePresets.json --- old/kmbox-21.12.3/CMakePresets.json 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/CMakePresets.json 2022-04-09 17:56:29.000000000 +0200 @@ -13,6 +13,30 @@ "installDir": "$env{KF5}" }, { + "name": "coverage", + "displayName": "Build as debug", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_COVERAGE": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-qt6", + "displayName": "Build against qt6", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-qt6", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_WITH_QT6": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF6}" + }, + { "name": "dev-disable-deprecated", "displayName": "Build as without deprecated methods", "generator": "Ninja", @@ -118,6 +142,10 @@ "configurePreset": "dev" }, { + "name": "dev-qt6", + "configurePreset": "dev-qt6" + }, + { "name": "dev-disable-deprecated", "configurePreset": "dev-disable-deprecated" }, @@ -130,6 +158,10 @@ "configurePreset": "release" }, { + "name": "coverage", + "configurePreset": "coverage" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/CMakePresets.json.license new/kmbox-22.04.0/CMakePresets.json.license --- old/kmbox-21.12.3/CMakePresets.json.license 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/CMakePresets.json.license 2022-04-09 17:56:29.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/KF5MboxConfig.cmake.in new/kmbox-22.04.0/KF5MboxConfig.cmake.in --- old/kmbox-21.12.3/KF5MboxConfig.cmake.in 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/KF5MboxConfig.cmake.in 2022-04-09 17:56:29.000000000 +0200 @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2014 Christophe Giboudeaux <[email protected]> +# SPDX-License-Identifier: BSD-3-Clause + @PACKAGE_INIT@ include(CMakeFindDependencyMacro) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/LICENSES/BSD-3-Clause.txt new/kmbox-22.04.0/LICENSES/BSD-3-Clause.txt --- old/kmbox-21.12.3/LICENSES/BSD-3-Clause.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kmbox-22.04.0/LICENSES/BSD-3-Clause.txt 2022-04-09 17:56:29.000000000 +0200 @@ -0,0 +1,26 @@ +Copyright (c) <year> <owner>. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/README.md.license new/kmbox-22.04.0/README.md.license --- old/kmbox-21.12.3/README.md.license 1970-01-01 01:00:00.000000000 +0100 +++ new/kmbox-22.04.0/README.md.license 2022-04-09 17:56:29.000000000 +0200 @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2016 Daniel Vr??til <[email protected]> +SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/autotests/CMakeLists.txt new/kmbox-22.04.0/autotests/CMakeLists.txt --- old/kmbox-21.12.3/autotests/CMakeLists.txt 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/autotests/CMakeLists.txt 2022-04-09 17:56:29.000000000 +0200 @@ -1,8 +1,11 @@ +# SPDX-FileCopyrightText: none +# SPDX-License-Identifier: BSD-3-Clause + kde_enable_exceptions() include(ECMAddTests) -find_package(Qt5Test CONFIG REQUIRED) +find_package(Qt${QT_MAJOR_VERSION}Test CONFIG REQUIRED) ########### 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 KF5Mbox Qt${QT_MAJOR_VERSION}::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/sanitizers.supp new/kmbox-22.04.0/sanitizers.supp --- old/kmbox-21.12.3/sanitizers.supp 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/sanitizers.supp 2022-04-09 17:56:29.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2022 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-21.12.3/src/CMakeLists.txt new/kmbox-22.04.0/src/CMakeLists.txt --- old/kmbox-21.12.3/src/CMakeLists.txt 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/src/CMakeLists.txt 2022-04-09 17:56:29.000000000 +0200 @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: none +# SPDX-License-Identifier: BSD-3-Clause + add_library(KF5Mbox) add_library(KF5::Mbox ALIAS KF5Mbox) @@ -22,13 +25,16 @@ generate_export_header(KF5Mbox BASE_NAME kmbox) -target_include_directories(KF5Mbox INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/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_link_libraries(KF5Mbox PUBLIC KF5::Mime ) +if (TARGET Qt6::Core5Compat) + target_link_libraries(KF5Mbox PRIVATE Qt6::Core5Compat) # QTextCodec +endif() set_target_properties(KF5Mbox PROPERTIES VERSION ${KMBOX_VERSION} @@ -49,7 +55,7 @@ install(FILES ${KMbox_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KMbox/KMbox/ + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KMbox/KMbox/ COMPONENT Devel ) @@ -57,12 +63,12 @@ install(FILES ${KMbox_BINARY_DIR}/src/kmbox_export.h ${KMbox_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KMbox/kmbox + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/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_KF5}/KMbox) +ecm_generate_pri_file(BASE_NAME KMbox LIB_NAME KF5Mbox DEPS "KMime" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KMbox) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) if (BUILD_QCH) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.12.3/src/mbox_p.h new/kmbox-22.04.0/src/mbox_p.h --- old/kmbox-21.12.3/src/mbox_p.h 2022-02-07 07:11:57.000000000 +0100 +++ new/kmbox-22.04.0/src/mbox_p.h 2022-04-09 17:56:29.000000000 +0200 @@ -10,6 +10,7 @@ #include <QFile> #include <QObject> +#include <QRegExp> #include <QTimer> namespace KMBox
