Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmbox for openSUSE:Factory checked in at 2021-12-13 20:39:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmbox (Old) and /work/SRC/openSUSE:Factory/.kmbox.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmbox" Mon Dec 13 20:39:38 2021 rev:76 rq:937971 version:21.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmbox/kmbox.changes 2021-11-06 18:15:46.072814278 +0100 +++ /work/SRC/openSUSE:Factory/.kmbox.new.2520/kmbox.changes 2021-12-13 20:40:50.912459002 +0100 @@ -1,0 +2,29 @@ +Fri Dec 3 19:22:14 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.12.0/ +- Changes since 21.11.90: + * Enable new GitLab CI on stable branch. + +------------------------------------------------------------------- +Sat Nov 27 10:11:09 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.90 + * New feature release +- No code change since 21.11.80 + +------------------------------------------------------------------- +Sat Nov 13 17:55:31 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.80 + * New feature release +- Changes since 21.08.3: + * Allow to show header in qtc6 + * Fix some cppcheck warning + * Fix wrong for index variable. + * Add KDE CI file + * Fix some clazy warning + +------------------------------------------------------------------- Old: ---- kmbox-21.08.3.tar.xz kmbox-21.08.3.tar.xz.sig New: ---- kmbox-21.12.0.tar.xz kmbox-21.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmbox.spec ++++++ --- /var/tmp/diff_new_pack.lsTcwl/_old 2021-12-13 20:40:51.528459078 +0100 +++ /var/tmp/diff_new_pack.lsTcwl/_new 2021-12-13 20:40:51.532459078 +0100 @@ -16,12 +16,11 @@ # -%define kf5_version 5.79.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}')} %bcond_without lang Name: kmbox -Version: 21.08.3 +Version: 21.12.0 Release: 0 Summary: KDE PIM Libraries: Mailbox functionality License: LGPL-2.1-or-later ++++++ kmbox-21.08.3.tar.xz -> kmbox-21.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/.gitlab-ci.yml new/kmbox-21.12.0/.gitlab-ci.yml --- old/kmbox-21.08.3/.gitlab-ci.yml 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/.gitlab-ci.yml 2021-11-30 19:54:28.000000000 +0100 @@ -1,34 +1,7 @@ # SPDX-FileCopyrightText: 2020-2021 Laurent Montel <[email protected]> -# SPDX-FileCopyrightText: 2021 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml - -build_clazy_clang_tidy: - stage: build - image: kdeorg/ci-suse-qt515 - extends: .linux - #only: - # - merge_requests - before_script: - - zypper install -y clazy - - git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git $CI_TOOLING - - git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git $CI_TOOLING/repo-metadata - - git clone --depth=1 https://invent.kde.org/sysadmin/kde-build-metadata.git $CI_TOOLING/kde-build-metadata - - git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git $CI_TOOLING/kde-dev-scripts - - script: - - export CXX=clazy - - export CC=clang - - export CXXFLAGS="-Wno-deprecated-declarations" - - export CLAZY_HEADER_FILTER='^(?!ui_)\w+.h\$' - - export CLAZY_CHECKS="level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs" - - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment production --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX - - cd build && run-clang-tidy - variables: - PLATFORM: SUSEQt5.15 - BRANCH_GROUP: stable-kf5-qt5 + - 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/.kde-ci.yml new/kmbox-21.12.0/.kde-ci.yml --- old/kmbox-21.08.3/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/kmbox-21.12.0/.kde-ci.yml 2021-11-30 19:54:28.000000000 +0100 @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +Dependencies: +- 'on': ['@all'] + 'require': + 'frameworks/extra-cmake-modules': '@latest' + 'pim/kmime' : '@same' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/CMakeLists.txt new/kmbox-21.12.0/CMakeLists.txt --- old/kmbox-21.08.3/CMakeLists.txt 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/CMakeLists.txt 2021-11-30 19:54:28.000000000 +0100 @@ -1,16 +1,16 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.3") +set(PIM_VERSION "5.19.0") project(KMbox VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.83.0") +set(KF5_MIN_VERSION "5.87.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(KDECompilerSettings NO_POLICY_SCOPE) include(GenerateExportHeader) include(ECMGenerateHeaders) @@ -19,14 +19,19 @@ include(ECMSetupVersion) include(FeatureSummary) include(KDEGitCommitHooks) -include(ECMQtDeclareLoggingCategory) +include(KDEClangFormat) +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) +include(ECMQtDeclareLoggingCategory) +include(ECMAddQch) set(KMBOX_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIB_VERSION "5.18.3") - +set(KMIME_LIB_VERSION "5.19.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 VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MboxConfigVersion.cmake" @@ -36,11 +41,9 @@ ########### Find packages ########### find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) @@ -78,5 +81,15 @@ COMPONENT Devel ) +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5MBox_QCH + FILE KF5MBoxQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5MBoxQchTargets.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-21.08.3/CMakePresets.json new/kmbox-21.12.0/CMakePresets.json --- old/kmbox-21.08.3/CMakePresets.json 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/CMakePresets.json 2021-11-30 19:54:28.000000000 +0100 @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "configurePresets": [ { "name": "dev", @@ -8,8 +8,21 @@ "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-disable-deprecated", + "displayName": "Build as without deprecated methods", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-disable-deprecated", + "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" + }, + "installDir": "$env{KF5}" }, { "name": "asan", @@ -19,8 +32,21 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "ECM_ENABLE_SANITIZERS" : "'address;undefined'", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "pch", + "displayName": "Build with PCH support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "dev-clang", @@ -34,7 +60,8 @@ "environment": { "CXX": "clang++", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" }, { "name": "unity", @@ -43,9 +70,10 @@ "binaryDir": "${sourceDir}/build-unity", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "USE_UNITY_CMAKE_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "USE_UNITY_CMAKE_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "release", @@ -54,7 +82,8 @@ "binaryDir": "${sourceDir}/build-release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" - } + }, + "installDir": "$env{KF5}" }, { "name": "profile", @@ -63,8 +92,9 @@ "binaryDir": "${sourceDir}/build-profile", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "clazy", @@ -77,7 +107,8 @@ "environment": { "CXX": "clazy", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" } ], @@ -87,6 +118,14 @@ "configurePreset": "dev" }, { + "name": "dev-disable-deprecated", + "configurePreset": "dev-disable-deprecated" + }, + { + "name": "pch", + "configurePreset": "pch" + }, + { "name": "release", "configurePreset": "release" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/autotests/mboxtest.cpp new/kmbox-21.12.0/autotests/mboxtest.cpp --- old/kmbox-21.08.3/autotests/mboxtest.cpp 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/autotests/mboxtest.cpp 2021-11-30 19:54:28.000000000 +0100 @@ -173,14 +173,14 @@ QCOMPARE(mbox.entries().size(), 0); QCOMPARE(mbox.appendMessage(mMail1).messageOffset(), static_cast<quint64>(0)); QCOMPARE(mbox.entries().size(), 1); - QVERIFY(mbox.entries().first().separatorSize() > 0); - QCOMPARE(mbox.entries().first().messageSize(), static_cast<quint64>(sEntry1.size())); + QVERIFY(mbox.entries().constFirst().separatorSize() > 0); + QCOMPARE(mbox.entries().constFirst().messageSize(), static_cast<quint64>(sEntry1.size())); const MBoxEntry offsetMail2 = mbox.appendMessage(mMail2); QVERIFY(offsetMail2.messageOffset() > static_cast<quint64>(sEntry1.size())); QCOMPARE(mbox.entries().size(), 2); - QVERIFY(mbox.entries().last().separatorSize() > 0); - QCOMPARE(mbox.entries().last().messageSize(), static_cast<quint64>(sEntry2.size())); + QVERIFY(mbox.entries().constLast().separatorSize() > 0); + QCOMPARE(mbox.entries().constLast().messageSize(), static_cast<quint64>(sEntry2.size())); // check if appended entries can be read const MBoxEntry::List list = mbox.entries(); @@ -232,7 +232,7 @@ QCOMPARE(infos1.size(), 2); QVERIFY(mbox.save()); - QVERIFY(QFileInfo(fileName()).exists()); + QVERIFY(QFileInfo::exists(fileName())); MBoxEntry::List infos2 = mbox.entries(); QCOMPARE(infos2.size(), 2); @@ -287,9 +287,9 @@ quint64 minSize = sEntry1.size() + i - 1; // Possibly on '\n' falls off. quint64 maxSize = sEntry1.size() + i; - for (int i = 0; i < 3; ++i) { - QVERIFY(mbox1.entries().at(i).messageSize() >= minSize); - QVERIFY(mbox1.entries().at(i).messageSize() <= maxSize); + for (int j = 0; j < 3; ++j) { + QVERIFY(mbox1.entries().at(j).messageSize() >= minSize); + QVERIFY(mbox1.entries().at(j).messageSize() <= maxSize); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/metainfo.yaml new/kmbox-21.12.0/metainfo.yaml --- old/kmbox-21.08.3/metainfo.yaml 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/metainfo.yaml 2021-11-30 19:54:28.000000000 +0100 @@ -6,7 +6,7 @@ - name: Linux - name: FreeBSD - name: Windows - - name: MacOSX + - name: macOS - name: Android portingAid: false deprecated: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/src/CMakeLists.txt new/kmbox-21.12.0/src/CMakeLists.txt --- old/kmbox-21.08.3/src/CMakeLists.txt 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/src/CMakeLists.txt 2021-11-30 19:54:28.000000000 +0100 @@ -5,6 +5,10 @@ mboxentry.cpp mbox_p.cpp mbox.cpp + mboxentry.h + mbox.h + mbox_p.h + mboxentry_p.h ) ecm_qt_declare_logging_category(KF5Mbox HEADER kmbox_debug.h IDENTIFIER KMBOX_LOG CATEGORY_NAME org.kde.pim.kmbox @@ -60,3 +64,26 @@ 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) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + +if (BUILD_QCH) + ecm_add_qch( + KF5MBox_QCH + NAME KMBox + BASE_NAME KF5MBox + VERSION ${PIM_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${KMbox_HEADERS} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" + LINK_QCHS + Qt5Core_QCH + INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} + BLANK_MACROS + KMBOX_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/src/mbox.cpp new/kmbox-21.12.0/src/mbox.cpp --- old/kmbox-21.08.3/src/mbox.cpp 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/src/mbox.cpp 2021-11-30 19:54:28.000000000 +0100 @@ -464,7 +464,7 @@ } } - // Remove te last '\n' added by writeEntry. + // Remove the last '\n' added by writeEntry. if (message.endsWith('\n')) { message.chop(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/src/mbox.h new/kmbox-21.12.0/src/mbox.h --- old/kmbox-21.08.3/src/mbox.h 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/src/mbox.h 2021-11-30 19:54:28.000000000 +0100 @@ -10,7 +10,7 @@ #include "mboxentry.h" #include <memory> -#include <kmime/kmime_message.h> +#include <KMime/KMimeMessage> namespace KMBox { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/src/mbox_p.cpp new/kmbox-21.12.0/src/mbox_p.cpp --- old/kmbox-21.08.3/src/mbox_p.cpp 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/src/mbox_p.cpp 2021-11-30 19:54:28.000000000 +0100 @@ -83,7 +83,8 @@ QByteArray MBoxPrivate::mboxMessageSeparator(const QByteArray &msg) { KMime::Message mail; - QByteArray body, header; + QByteArray body; + QByteArray header; KMime::HeaderParsing::extractHeaderAndBody(KMime::CRLFtoLF(msg), header, body); body.clear(); mail.setHead(header); @@ -127,7 +128,7 @@ const char *const e = s + strLen - STRDIM("From "); char *d = result.data(); - bool onlyAnglesAfterLF = false; // dont' match ^From_ + bool onlyAnglesAfterLF = false; // don't match ^From_ while (s < e) { switch (*s) { case '\n': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-21.08.3/src/mboxentry_p.h new/kmbox-21.12.0/src/mboxentry_p.h --- old/kmbox-21.08.3/src/mboxentry_p.h 2021-10-09 09:26:17.000000000 +0200 +++ new/kmbox-21.12.0/src/mboxentry_p.h 2021-11-30 19:54:28.000000000 +0100 @@ -19,10 +19,10 @@ MBoxEntryPrivate(const MBoxEntryPrivate &other) : QSharedData(other) + , mOffset(other.mOffset) + , mMessageSize(other.mMessageSize) + , mSeparatorSize(other.mSeparatorSize) { - mOffset = other.mOffset; - mMessageSize = other.mMessageSize; - mSeparatorSize = other.mSeparatorSize; } quint64 mOffset = 0;
