Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package akonadi-notes for openSUSE:Factory checked in at 2023-04-23 22:45:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-notes (Old) and /work/SRC/openSUSE:Factory/.akonadi-notes.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-notes" Sun Apr 23 22:45:01 2023 rev:81 rq:1081196 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-notes/akonadi-notes.changes 2023-03-03 22:25:14.934701763 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-notes.new.1533/akonadi-notes.changes 2023-04-23 22:46:44.954469289 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:45:09 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- 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:41:30 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:42:49 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- akonadi-notes-22.12.3.tar.xz akonadi-notes-22.12.3.tar.xz.sig New: ---- akonadi-notes-23.04.0.tar.xz akonadi-notes-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-notes.spec ++++++ --- /var/tmp/diff_new_pack.ALaFI2/_old 2023-04-23 22:46:45.494472340 +0200 +++ /var/tmp/diff_new_pack.ALaFI2/_new 2023-04-23 22:46:45.502472385 +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.104.0 +%define libname libKPim5AkonadiNotes5 %bcond_without released Name: akonadi-notes -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: Library to implement management of notes in Akonadi License: LGPL-2.1-or-later @@ -33,11 +32,10 @@ %endif BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem -BuildRequires: cmake(KF5Akonadi) BuildRequires: cmake(KF5I18n) >= %{kf5_version} -BuildRequires: cmake(KF5Mime) -BuildRequires: cmake(Qt5Test) >= 5.15.0 -BuildRequires: cmake(Qt5Xml) >= 5.15.0 +BuildRequires: cmake(KPim5Mime) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Xml) %description Akonadi Notes is a library that bridges the type-agnostic API of @@ -45,12 +43,13 @@ a helper class for note attachments and for wrapping notes into KMime::Message objects. -%package -n libKF5AkonadiNotes5 +%package -n %{libname} Summary: Library to implement management of notes in Akonadi -Recommends: %{name}-lang Provides: %{name} = %{version} +# Renamed +Obsoletes: akonadi-notes-lang <= 23.04.0 -%description -n libKF5AkonadiNotes5 +%description -n %{libname} Akonadi Notes is a library that bridges the type-agnostic API of the Akonadi client libraries and the domain-specific KMime library. It provides a helper class for note attachments and for wrapping notes into KMime::Message @@ -58,39 +57,42 @@ %package devel Summary: Build environment for akonadi-notes -Requires: libKF5AkonadiNotes5 = %{version} -Requires: cmake(KF5Mime) +Requires: %{libname} = %{version} +Requires: cmake(KPim5Mime) %description devel This package contains the development files needed to use the akonadi-notes library in other applications. -%lang_package +%lang_package -n %{libname} %prep %autosetup -p1 -n akonadi-notes-%{version} %build -%cmake_kf5 -d build -- -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} +%cmake_kf5 -d build + %cmake_build %install %kf5_makeinstall -C build -%find_lang %{name} --with-man --all-name +%find_lang %{libname} --with-man --all-name -%ldconfig_scriptlets -n libKF5AkonadiNotes5 +%ldconfig_scriptlets -n %{libname} -%files -n libKF5AkonadiNotes5 +%files -n %{libname} %license LICENSES/* -%{_kf5_libdir}/libKF5AkonadiNotes.so.* +%{_kf5_libdir}/libKPim5AkonadiNotes.so.* %files devel +%dir %{_includedir}/KPim5 %{_kf5_cmakedir}/KF5AkonadiNotes/ -%{_kf5_includedir}/AkonadiNotes/ -%{_kf5_libdir}/libKF5AkonadiNotes.so +%{_kf5_cmakedir}/KPim5AkonadiNotes/ +%{_includedir}/KPim5/AkonadiNotes/ +%{_kf5_libdir}/libKPim5AkonadiNotes.so %{_kf5_mkspecsdir}/qt_AkonadiNotes.pri -%files lang -f %{name}.lang +%files -n %{libname}-lang -f %{libname}.lang %changelog ++++++ akonadi-notes-22.12.3.tar.xz -> akonadi-notes-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/.codespellrc.license new/akonadi-notes-23.04.0/.codespellrc.license --- old/akonadi-notes-22.12.3/.codespellrc.license 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/.codespellrc.license 2023-04-11 06:34:26.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2022-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/.gitlab-ci.yml new/akonadi-notes-23.04.0/.gitlab-ci.yml --- old/akonadi-notes-22.12.3/.gitlab-ci.yml 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/.gitlab-ci.yml 2023-04-11 06:34:26.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2020-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/.kde-ci.yml new/akonadi-notes-23.04.0/.kde-ci.yml --- old/akonadi-notes-22.12.3/.kde-ci.yml 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/.kde-ci.yml 2023-04-11 06:34:26.000000000 +0200 @@ -2,11 +2,17 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'pim/akonadi' : '@same' 'pim/kmime' : '@same' +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'pim/akonadi' : '@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/akonadi-notes-22.12.3/CMakeLists.txt new/akonadi-notes-23.04.0/CMakeLists.txt --- old/akonadi-notes-22.12.3/CMakeLists.txt 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/CMakeLists.txt 2023-04-11 06:34:26.000000000 +0200 @@ -1,14 +1,14 @@ # SPDX-FileCopyrightText: none # 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(Akonadi-Notes 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 ${ECM_MODULE_PATH}) include(KDEInstallDirs) @@ -30,6 +30,7 @@ include(ECMDeprecationSettings) include(ECMAddQch) +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)") @@ -40,27 +41,34 @@ endif() set(AKONADI_NOTES_VERSION ${PIM_VERSION}) -set(KMIMELIB_VERSION "5.22.3") -set(AKONADI_VERSION "5.22.3") +set(KMIMELIB_VERSION "5.23.0") +set(AKONADI_VERSION "5.23.0") + + +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() ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADINOTES VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-notes_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiNotesConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}AkonadiNotesConfigVersion.cmake" SOVERSION 5 ) ########### Find packages ########### find_package(Qt${QT_MAJOR_VERSION}Xml ${QT_REQUIRED_VERSION} CONFIG REQUIRED) -find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5Mime ${KMIMELIB_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KPim${KF_MAJOR_VERSION}Mime ${KMIMELIB_VERSION} CONFIG REQUIRED) ########### Targets ########### add_definitions(-DTRANSLATION_DOMAIN=\"akonadinotes5\") -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) add_subdirectory(src) @@ -68,26 +76,26 @@ add_subdirectory(autotests) endif() ########### CMake Config Files ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5AkonadiNotes") - +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}AkonadiNotes") +set(AKONADINOTES_KF5_COMPAT FALSE) configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiNotesConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiNotesConfig.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiNotesConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}AkonadiNotesConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiNotesConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiNotesConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}AkonadiNotesConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}AkonadiNotesConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KF5AkonadiNotesTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5AkonadiNotesTargets.cmake NAMESPACE KF5::) +install(EXPORT KPim${KF_MAJOR_VERSION}AkonadiNotesTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}AkonadiNotesTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/akonadi-notes_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiNotes COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/AkonadiNotes COMPONENT Devel ) kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) @@ -95,12 +103,59 @@ if (BUILD_QCH) ecm_install_qch_export( - TARGETS KF5AkonadiNotes_QCH - FILE KF5AkonadiNotesQchTargets.cmake + TARGETS KPim${KF_MAJOR_VERSION}AkonadiNotes_QCH + FILE KPim${KF_MAJOR_VERSION}AkonadiNotesQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiNotesQchTargets.cmake\")") + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}AkonadiNotesQchTargets.cmake\")") +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}/KF5AkonadiNotes") +set(AKONADINOTES_KF5_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiNotesConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiNotesConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiNotesConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}AkonadiNotesConfigVersion.cmake" + RENAME "KF5AkonadiNotesConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}AkonadiNotesTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + FILE KPim${KF_MAJOR_VERSION}AkonadiNotesTargets.cmake + NAMESPACE KF5:: +) +if (BUILD_QCH) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}AkonadiNotesQchTargets.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel + ) +endif() +endif() +endif() + +option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) + +set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) +if (USE_UNITY_CMAKE_SUPPORT) + set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/CMakePresets.json new/akonadi-notes-23.04.0/CMakePresets.json --- old/akonadi-notes-22.12.3/CMakePresets.json 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/CMakePresets.json 2023-04-11 06:34:26.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/akonadi-notes-22.12.3/CMakePresets.json.license new/akonadi-notes-23.04.0/CMakePresets.json.license --- old/akonadi-notes-22.12.3/CMakePresets.json.license 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/CMakePresets.json.license 2023-04-11 06:34:26.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/KF5AkonadiNotesConfig.cmake.in new/akonadi-notes-23.04.0/KF5AkonadiNotesConfig.cmake.in --- old/akonadi-notes-22.12.3/KF5AkonadiNotesConfig.cmake.in 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/KF5AkonadiNotesConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: none -# SPDX-License-Identifier: BSD-3-Clause - -@PACKAGE_INIT@ -include(CMakeFindDependencyMacro) -find_dependency(KF5Mime "@KMIMELIB_VERSION@") - - -include("${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiNotesTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/KPimAkonadiNotesConfig.cmake.in new/akonadi-notes-23.04.0/KPimAkonadiNotesConfig.cmake.in --- old/akonadi-notes-22.12.3/KPimAkonadiNotesConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-notes-23.04.0/KPimAkonadiNotesConfig.cmake.in 2023-04-11 06:34:26.000000000 +0200 @@ -0,0 +1,19 @@ +# SPDX-FileCopyrightText: none +# SPDX-License-Identifier: BSD-3-Clause + +@PACKAGE_INIT@ +include(CMakeFindDependencyMacro) +find_dependency(KPim@KF_MAJOR_VERSION@Mime "@KMIMELIB_VERSION@") + +if (@AKONADINOTES_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5AkonadiNotes) and KF5::AkonadiNotes targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@AkonadiNotes) and KPim@KF_MAJOR_VERSION@::AkonadiNotes instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@KF_MAJOR_VERSION@AkonadiNotesTargets.cmake") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/autotests/CMakeLists.txt new/akonadi-notes-23.04.0/autotests/CMakeLists.txt --- old/akonadi-notes-22.12.3/autotests/CMakeLists.txt 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/autotests/CMakeLists.txt 2023-04-11 06:34:26.000000000 +0200 @@ -6,6 +6,6 @@ add_executable(notestest notestest.cpp) add_test(NAME notestest COMMAND notestest) ecm_mark_as_test(notestest) -target_link_libraries(notestest KF5AkonadiNotes KF5::Mime Qt::Test) +target_link_libraries(notestest KPim${KF_MAJOR_VERSION}AkonadiNotes KPim${KF_MAJOR_VERSION}::Mime Qt::Test) set(CMAKE_PREFIX_PATH ../) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/po/ast/akonadinotes5.po new/akonadi-notes-23.04.0/po/ast/akonadinotes5.po --- old/akonadi-notes-22.12.3/po/ast/akonadinotes5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-notes-23.04.0/po/ast/akonadinotes5.po 2023-04-11 06:34:26.000000000 +0200 @@ -0,0 +1,24 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the akonadi-notes package. +# +# Enol P. <en...@softastur.org>, 2022. +msgid "" +msgstr "" +"Project-Id-Version: akonadi-notes\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2021-11-26 00:28+0000\n" +"PO-Revision-Date: 2022-12-03 22:50+0100\n" +"Last-Translator: Enol P. <en...@softastur.org>\n" +"Language-Team: \n" +"Language: ast\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 22.08.3\n" + +#: noteutils.cpp:375 +#, kde-format +msgctxt "The default name for new notes." +msgid "New Note" +msgstr "Nota nueva" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/po/is/akonadinotes5.po new/akonadi-notes-23.04.0/po/is/akonadinotes5.po --- old/akonadi-notes-22.12.3/po/is/akonadinotes5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-notes-23.04.0/po/is/akonadinotes5.po 2023-04-11 06:34:26.000000000 +0200 @@ -0,0 +1,24 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the akonadi-notes package. +# +# Sveinn à Felli <s...@fellsnet.is>, 2023. +msgid "" +msgstr "" +"Project-Id-Version: akonadi-notes\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2021-11-26 00:28+0000\n" +"PO-Revision-Date: 2023-02-02 14:41+0000\n" +"Last-Translator: Sveinn à Felli <s...@fellsnet.is>\n" +"Language-Team: Icelandic\n" +"Language: is\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 21.12.3\n" + +#: noteutils.cpp:375 +#, kde-format +msgctxt "The default name for new notes." +msgid "New Note" +msgstr "Nýr minnispunktur" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/po/zh_CN/akonadinotes5.po new/akonadi-notes-23.04.0/po/zh_CN/akonadinotes5.po --- old/akonadi-notes-22.12.3/po/zh_CN/akonadinotes5.po 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/po/zh_CN/akonadinotes5.po 2023-04-11 06:34:26.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-11-26 00:28+0000\n" -"PO-Revision-Date: 2023-02-24 12:58\n" +"PO-Revision-Date: 2023-04-10 14:13\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/sanitizers.supp new/akonadi-notes-23.04.0/sanitizers.supp --- old/akonadi-notes-22.12.3/sanitizers.supp 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/sanitizers.supp 2023-04-11 06:34:26.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <mon...@kde.org> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-notes-22.12.3/src/CMakeLists.txt new/akonadi-notes-23.04.0/src/CMakeLists.txt --- old/akonadi-notes-22.12.3/src/CMakeLists.txt 2023-02-25 05:51:03.000000000 +0100 +++ new/akonadi-notes-23.04.0/src/CMakeLists.txt 2023-04-11 06:34:26.000000000 +0200 @@ -1,40 +1,41 @@ # SPDX-FileCopyrightText: none # SPDX-License-Identifier: BSD-3-Clause -add_library(KF5AkonadiNotes) -add_library(KF5::KF5AkonadiNotes ALIAS KF5AkonadiNotes) +add_library(KPim${KF_MAJOR_VERSION}AkonadiNotes) +add_library(KPim${KF_MAJOR_VERSION}::AkonadiNotes ALIAS KPim${KF_MAJOR_VERSION}AkonadiNotes) +add_library(KF5::AkonadiNotes ALIAS KPim${KF_MAJOR_VERSION}AkonadiNotes) -target_sources(KF5AkonadiNotes PRIVATE +target_sources(KPim${KF_MAJOR_VERSION}AkonadiNotes PRIVATE noteutils.cpp noteutils.h ) -ecm_qt_declare_logging_category(KF5AkonadiNotes HEADER akonadi_notes_debug.h IDENTIFIER AKONADINOTES_LOG CATEGORY_NAME log_akonadi_notes) +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}AkonadiNotes HEADER akonadi_notes_debug.h IDENTIFIER AKONADINOTES_LOG CATEGORY_NAME log_akonadi_notes) -generate_export_header(KF5AkonadiNotes BASE_NAME akonadi-notes) +generate_export_header(KPim${KF_MAJOR_VERSION}AkonadiNotes BASE_NAME akonadi-notes) -kde_target_enable_exceptions(KF5AkonadiNotes PUBLIC) +kde_target_enable_exceptions(KPim${KF_MAJOR_VERSION}AkonadiNotes PUBLIC) -target_include_directories(KF5AkonadiNotes INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiNotes>") -target_include_directories(KF5AkonadiNotes PUBLIC "$<BUILD_INTERFACE:${Akonadi-Notes_SOURCE_DIR}/src;${Akonadi-Notes_BINARY_DIR}/src;>") +target_include_directories(KPim${KF_MAJOR_VERSION}AkonadiNotes INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/AkonadiNotes>") +target_include_directories(KPim${KF_MAJOR_VERSION}AkonadiNotes PUBLIC "$<BUILD_INTERFACE:${Akonadi-Notes_SOURCE_DIR}/src;${Akonadi-Notes_BINARY_DIR}/src;>") -target_link_libraries(KF5AkonadiNotes +target_link_libraries(KPim${KF_MAJOR_VERSION}AkonadiNotes PUBLIC - KF5::Mime + KPim${KF_MAJOR_VERSION}::Mime PRIVATE Qt::Xml - KF5::I18n + KF${KF_MAJOR_VERSION}::I18n ) -set_target_properties(KF5AkonadiNotes PROPERTIES +set_target_properties(KPim${KF_MAJOR_VERSION}AkonadiNotes PROPERTIES VERSION ${AKONADINOTES_VERSION} SOVERSION ${AKONADINOTES_SOVERSION} EXPORT_NAME AkonadiNotes ) install(TARGETS - KF5AkonadiNotes - EXPORT KF5AkonadiNotesTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} + KPim${KF_MAJOR_VERSION}AkonadiNotes + EXPORT KPim${KF_MAJOR_VERSION}AkonadiNotesTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} ) ecm_generate_headers(AkonadiNotes_CamelCase_HEADERS @@ -47,7 +48,7 @@ install(FILES ${AkonadiNotes_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiNotes/Akonadi + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/AkonadiNotes/Akonadi COMPONENT Devel ) @@ -55,12 +56,12 @@ ${AkonadiNotes_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/akonadi-notes_export.h ${AkonadiNotes_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiNotes/akonadi + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/AkonadiNotes/akonadi COMPONENT Devel ) ecm_generate_pri_file(BASE_NAME AkonadiNotes - LIB_NAME KF5AkonadiNotes + LIB_NAME KF${KF_MAJOR_VERSION}AkonadiNotes DEPS "KMime" FILENAME_VAR PRI_FILENAME ) @@ -68,9 +69,9 @@ if (BUILD_QCH) ecm_add_qch( - KF5AkonadiNotes_QCH - NAME KF5AkonadiNotes - BASE_NAME KF5AkonadiNotes + KPim${KF_MAJOR_VERSION}AkonadiNotes_QCH + NAME KPim${KF_MAJOR_VERSION}AkonadiNotes + BASE_NAME KPim${KF_MAJOR_VERSION}AkonadiNotes VERSION ${PIM_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API @@ -78,7 +79,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
