Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libgravatar for openSUSE:Factory checked in at 2023-04-23 22:45:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgravatar (Old) and /work/SRC/openSUSE:Factory/.libgravatar.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgravatar" Sun Apr 23 22:45:08 2023 rev:86 rq:1081215 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libgravatar/libgravatar.changes 2023-03-03 22:26:52.819023552 +0100 +++ /work/SRC/openSUSE:Factory/.libgravatar.new.1533/libgravatar.changes 2023-04-23 22:46:54.422522786 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:46:29 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:42:35 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:44:18 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- libgravatar-22.12.3.tar.xz libgravatar-22.12.3.tar.xz.sig New: ---- libgravatar-23.04.0.tar.xz libgravatar-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgravatar.spec ++++++ --- /var/tmp/diff_new_pack.Py4WNr/_old 2023-04-23 22:46:56.010531758 +0200 +++ /var/tmp/diff_new_pack.Py4WNr/_new 2023-04-23 22:46:56.058532029 +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 libKPim5Gravatar5 Name: libgravatar -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: Library to download and display gravatars License: GPL-2.0-only AND LGPL-2.1-or-later @@ -35,9 +34,9 @@ BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5PimCommon) BuildRequires: cmake(KF5TextWidgets) BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5PimCommon) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) @@ -45,26 +44,26 @@ %description This package contains the debug categories for the libgravatar library. -%package -n libKF5Gravatar5 +%package -n %{libname} Summary: Libgravatar library for KDE PIM applications License: LGPL-2.1-or-later -Requires: %{name} +Requires: libgravatar +# Renamed +Obsoletes: libgravatar-lang <= 23.04.0 -%description -n libKF5Gravatar5 +%description -n %{libname} libgravatar adds support for downloading and displaying gravatars in applications. -%ldconfig_scriptlets -n libKF5Gravatar5 - %package devel Summary: Development package for libgravatar License: LGPL-2.1-or-later -Requires: libKF5Gravatar5 = %{version} +Requires: %{libname} = %{version} %description devel The development package for the libgravatar library. -%lang_package +%lang_package -n %{libname} %prep %autosetup -p1 @@ -77,22 +76,26 @@ %install %kf5_makeinstall -C build -%find_lang %{name} --with-man --all-name +%find_lang %{libname} --with-man --all-name + +%ldconfig_scriptlets -n %{libname} %files %{_kf5_debugdir}/libgravatar.categories %{_kf5_debugdir}/libgravatar.renamecategories -%files -n libKF5Gravatar5 +%files -n %{libname} %license LICENSES/* -%{_libdir}/libKF5Gravatar.so.* +%{_libdir}/libKPim5Gravatar.so.* %files devel +%dir %{_includedir}/KPim5 +%{_includedir}/KPim5/Gravatar/ %{_kf5_cmakedir}/KF5Gravatar/ -%{_kf5_includedir}/Gravatar/ -%{_kf5_libdir}/libKF5Gravatar.so +%{_kf5_cmakedir}/KPim5Gravatar/ +%{_kf5_libdir}/libKPim5Gravatar.so %{_kf5_mkspecsdir}/qt_Gravatar.pri -%files lang -f %{name}.lang +%files -n %{libname}-lang -f %{libname}.lang %changelog ++++++ libgravatar-22.12.3.tar.xz -> libgravatar-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/.codespellrc.license new/libgravatar-23.04.0/.codespellrc.license --- old/libgravatar-22.12.3/.codespellrc.license 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/.codespellrc.license 2023-04-11 06:38: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/libgravatar-22.12.3/.gitlab-ci.yml new/libgravatar-23.04.0/.gitlab-ci.yml --- old/libgravatar-22.12.3/.gitlab-ci.yml 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/.gitlab-ci.yml 2023-04-11 06:38: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/libgravatar-22.12.3/.kde-ci.yml new/libgravatar-23.04.0/.kde-ci.yml --- old/libgravatar-22.12.3/.kde-ci.yml 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/.kde-ci.yml 2023-04-11 06:38:26.000000000 +0200 @@ -2,10 +2,15 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'macOS/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'pim/pimcommon' : '@same' +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'macOS/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'pim/pimcommon' : '@latest-kf6' + Options: require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/CMakeLists.txt new/libgravatar-23.04.0/CMakeLists.txt --- old/libgravatar-22.12.3/CMakeLists.txt 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/CMakeLists.txt 2023-04-11 06:38:26.000000000 +0200 @@ -1,13 +1,13 @@ # 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(gravatar VERSION ${PIM_VERSION}) -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(ECMAddTests) 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)") @@ -37,20 +38,25 @@ set(QT_REQUIRED_VERSION "5.15.2") if (QT_MAJOR_VERSION STREQUAL "6") set(QT_REQUIRED_VERSION "6.4.0") + set(KF_MIN_VERSION "5.240.0") + set(KF_MAJOR_VERSION "6") +else() + set(KF_MIN_VERSION "5.100.0") + set(KF_MAJOR_VERSION "5") endif() set(LIBGRAVATAR_LIB_VERSION ${PIM_VERSION}) -set(PIMCOMMON_LIB_VERSION "5.22.3") +set(PIMCOMMON_LIB_VERSION "5.23.0") find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) -find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}Config ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}WidgetsAddons ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}KIO ${KF_MIN_VERSION} CONFIG REQUIRED) find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED) ecm_setup_version(PROJECT VARIABLE_PREFIX GRAVATAR VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/gravatar_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5GravatarConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GravatarConfigVersion.cmake" SOVERSION 5 ) @@ -58,7 +64,7 @@ ########### Targets ########### -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) @@ -68,31 +74,63 @@ set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() ########### CMake Config Files ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Gravatar") - +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Gravatar") +set(GRAVATAR_KF5_COMPAT FALSE) configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5GravatarConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5GravatarConfig.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/KPimGravatarConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GravatarConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5GravatarConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5GravatarConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GravatarConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GravatarConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KF5GravatarTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5GravatarTargets.cmake NAMESPACE KF5::) +install(EXPORT KPim${KF_MAJOR_VERSION}GravatarTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE KPim${KF_MAJOR_VERSION}GravatarTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gravatar_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Gravatar COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Gravatar COMPONENT Devel ) if(BUILD_TESTING) add_definitions(-DBUILD_TESTING) 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}/KF5Gravatar") +set(GRAVATAR_KF5_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimGravatarConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5GravatarConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5GravatarConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GravatarConfigVersion.cmake" + RENAME "KF5GravatarConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}GravatarTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + FILE KPim${KF_MAJOR_VERSION}GravatarTargets.cmake + NAMESPACE KF5:: +) +endif() +endif() add_subdirectory(src) if (BUILD_TESTING) find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) @@ -102,12 +140,12 @@ if (BUILD_QCH) ecm_install_qch_export( - TARGETS KF5Gravatar_QCH - FILE KF5GravatarQchTargets.cmake + TARGETS KPim${KF_MAJOR_VERSION}Gravatar_QCH + FILE KPim${KF_MAJOR_VERSION}GravatarQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5GravatarQchTargets.cmake\")") + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}GravatarQchTargets.cmake\")") endif() kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/CMakePresets.json new/libgravatar-23.04.0/CMakePresets.json --- old/libgravatar-22.12.3/CMakePresets.json 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/CMakePresets.json 2023-04-11 06:38: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/libgravatar-22.12.3/CMakePresets.json.license new/libgravatar-23.04.0/CMakePresets.json.license --- old/libgravatar-22.12.3/CMakePresets.json.license 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/CMakePresets.json.license 2023-04-11 06:38: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/libgravatar-22.12.3/KF5GravatarConfig.cmake.in new/libgravatar-23.04.0/KF5GravatarConfig.cmake.in --- old/libgravatar-22.12.3/KF5GravatarConfig.cmake.in 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/KF5GravatarConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: 2014 Montel Laurent <mon...@kde.org> -# SPDX-License-Identifier: BSD-3-Clause -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/KF5GravatarTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/KPimGravatarConfig.cmake.in new/libgravatar-23.04.0/KPimGravatarConfig.cmake.in --- old/libgravatar-22.12.3/KPimGravatarConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libgravatar-23.04.0/KPimGravatarConfig.cmake.in 2023-04-11 06:38:26.000000000 +0200 @@ -0,0 +1,15 @@ +# SPDX-FileCopyrightText: 2014 Montel Laurent <mon...@kde.org> +# SPDX-License-Identifier: BSD-3-Clause +@PACKAGE_INIT@ + +if (@GRAVATAR_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5Gravatar) and KF5::Gravatar targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@Gravatar) and KPim@KF_MAJOR_VERSION@::Gravatar instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@KF_MAJOR_VERSION@GravatarTargets.cmake") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/CMakeLists.txt new/libgravatar-23.04.0/autotests/CMakeLists.txt --- old/libgravatar-22.12.3/autotests/CMakeLists.txt 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/CMakeLists.txt 2023-04-11 06:38:26.000000000 +0200 @@ -6,7 +6,7 @@ add_executable( ${_name} ${_test} ${_name}.h) add_test(NAME ${_name} COMMAND ${_name} ) ecm_mark_as_test(${_name}) - target_link_libraries( ${_name} KF5::PimCommon Qt::Test KF5::Gravatar KF5::TextWidgets) + target_link_libraries( ${_name} KF5::PimCommon Qt::Test KPim${KF_MAJOR_VERSION}::Gravatar KF${KF_MAJOR_VERSION}::TextWidgets) endmacro () add_gravatar_unittest( gravatarcachetest.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarcachetest.cpp new/libgravatar-23.04.0/autotests/gravatarcachetest.cpp --- old/libgravatar-22.12.3/autotests/gravatarcachetest.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarcachetest.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarcachetest.h new/libgravatar-23.04.0/autotests/gravatarcachetest.h --- old/libgravatar-22.12.3/autotests/gravatarcachetest.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarcachetest.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarconfiguresettingsdialogtest.cpp new/libgravatar-23.04.0/autotests/gravatarconfiguresettingsdialogtest.cpp --- old/libgravatar-22.12.3/autotests/gravatarconfiguresettingsdialogtest.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarconfiguresettingsdialogtest.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarconfiguresettingsdialogtest.h new/libgravatar-23.04.0/autotests/gravatarconfiguresettingsdialogtest.h --- old/libgravatar-22.12.3/autotests/gravatarconfiguresettingsdialogtest.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarconfiguresettingsdialogtest.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarconfiguresettingswidgettest.cpp new/libgravatar-23.04.0/autotests/gravatarconfiguresettingswidgettest.cpp --- old/libgravatar-22.12.3/autotests/gravatarconfiguresettingswidgettest.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarconfiguresettingswidgettest.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2019-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2019-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarconfiguresettingswidgettest.h new/libgravatar-23.04.0/autotests/gravatarconfiguresettingswidgettest.h --- old/libgravatar-22.12.3/autotests/gravatarconfiguresettingswidgettest.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarconfiguresettingswidgettest.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2019-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2019-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarconfigwidgettest.cpp new/libgravatar-23.04.0/autotests/gravatarconfigwidgettest.cpp --- old/libgravatar-22.12.3/autotests/gravatarconfigwidgettest.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarconfigwidgettest.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarconfigwidgettest.h new/libgravatar-23.04.0/autotests/gravatarconfigwidgettest.h --- old/libgravatar-22.12.3/autotests/gravatarconfigwidgettest.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarconfigwidgettest.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatardownloadpixmapdialogtest.cpp new/libgravatar-23.04.0/autotests/gravatardownloadpixmapdialogtest.cpp --- old/libgravatar-22.12.3/autotests/gravatardownloadpixmapdialogtest.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatardownloadpixmapdialogtest.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatardownloadpixmapdialogtest.h new/libgravatar-23.04.0/autotests/gravatardownloadpixmapdialogtest.h --- old/libgravatar-22.12.3/autotests/gravatardownloadpixmapdialogtest.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatardownloadpixmapdialogtest.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatardownloadpixmapwidgettest.cpp new/libgravatar-23.04.0/autotests/gravatardownloadpixmapwidgettest.cpp --- old/libgravatar-22.12.3/autotests/gravatardownloadpixmapwidgettest.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatardownloadpixmapwidgettest.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatardownloadpixmapwidgettest.h new/libgravatar-23.04.0/autotests/gravatardownloadpixmapwidgettest.h --- old/libgravatar-22.12.3/autotests/gravatardownloadpixmapwidgettest.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatardownloadpixmapwidgettest.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarresolvurljobtest.cpp new/libgravatar-23.04.0/autotests/gravatarresolvurljobtest.cpp --- old/libgravatar-22.12.3/autotests/gravatarresolvurljobtest.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarresolvurljobtest.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/autotests/gravatarresolvurljobtest.h new/libgravatar-23.04.0/autotests/gravatarresolvurljobtest.h --- old/libgravatar-22.12.3/autotests/gravatarresolvurljobtest.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/autotests/gravatarresolvurljobtest.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/po/ar/libgravatar.po new/libgravatar-23.04.0/po/ar/libgravatar.po --- old/libgravatar-22.12.3/po/ar/libgravatar.po 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/po/ar/libgravatar.po 2023-04-11 06:38:26.000000000 +0200 @@ -23,7 +23,7 @@ #, kde-format msgctxt "@title:window" msgid "Configure Gravatar" -msgstr "اضبط «غراڤاتار»" +msgstr "اضبط «غراÙاتار»" #: widgets/gravatarconfiguresettingswidget.cpp:28 #, kde-format @@ -40,12 +40,12 @@ #: widgets/gravatardownloadpixmapwidget.cpp:36 #, kde-format msgid "Fallback to Gravatar" -msgstr "استخد٠«غراڤاتار» ÙاØتÙاط" +msgstr "استخد٠«غراÙاتار» ÙاØتÙاط" #: widgets/gravatarconfiguresettingswidget.cpp:44 #, kde-format msgid "Gravatar Cache Size:" -msgstr "Øج٠خبÙئة «غراڤاتار»:" +msgstr "Øج٠خبÙئة «غراÙاتار»:" #: widgets/gravatarconfiguresettingswidget.cpp:51 #, kde-format @@ -62,12 +62,12 @@ #: widgets/gravatarconfiguresettingswidget.cpp:62 #, kde-format msgid "Clear Gravatar Cache" -msgstr "Ø§Ù Ø³Ø Ø®Ø¨Ùئة «غراڤاتار»" +msgstr "Ø§Ù Ø³Ø Ø®Ø¨Ùئة «غراÙاتار»" #: widgets/gravatarconfigwidget.cpp:37 #, kde-format msgid "Enable Gravatar Support" -msgstr "ÙعÙ٠دع٠«غراڤاتار»" +msgstr "ÙعÙ٠دع٠«غراÙاتار»" #: widgets/gravatarconfigwidget.cpp:42 #, kde-format @@ -87,4 +87,4 @@ #: widgets/gravatardownloadpixmapwidget.cpp:69 #, kde-format msgid "No Gravatar found." -msgstr "ÙÙ ÙÙعثر عÙ٠«غراڤاتار»." +msgstr "ÙÙ ÙÙعثر عÙ٠«غراÙاتار»." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/po/zh_CN/libgravatar.po new/libgravatar-23.04.0/po/zh_CN/libgravatar.po --- old/libgravatar-22.12.3/po/zh_CN/libgravatar.po 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/po/zh_CN/libgravatar.po 2023-04-11 06:38: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-24 00:29+0000\n" -"PO-Revision-Date: 2023-02-24 12:59\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/libgravatar-22.12.3/po/zh_TW/libgravatar.po new/libgravatar-23.04.0/po/zh_TW/libgravatar.po --- old/libgravatar-22.12.3/po/zh_TW/libgravatar.po 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/po/zh_TW/libgravatar.po 2023-04-11 06:38:26.000000000 +0200 @@ -7,15 +7,15 @@ "Project-Id-Version: libgravatar\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-11-24 00:29+0000\n" -"PO-Revision-Date: 2023-02-19 06:55+0900\n" +"PO-Revision-Date: 2023-01-15 20:34+0800\n" "Last-Translator: Kisaragi Hiu <m...@kisaragi-hiu.com>\n" -"Language-Team: Chinese <zh-l...@linux.org.tw>\n" +"Language-Team: Traditional Chinese <zh-l...@linux.org.tw>\n" "Language: Traditional Chinese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 22.12.2\n" +"X-Generator: Lokalize 22.12.0\n" #: widgets/gravatarconfiguresettingsdialog.cpp:24 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/sanitizers.supp new/libgravatar-23.04.0/sanitizers.supp --- old/libgravatar-22.12.3/sanitizers.supp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/sanitizers.supp 2023-04-11 06:38: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/libgravatar-22.12.3/src/CMakeLists.txt new/libgravatar-23.04.0/src/CMakeLists.txt --- old/libgravatar-22.12.3/src/CMakeLists.txt 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/CMakeLists.txt 2023-04-11 06:38:26.000000000 +0200 @@ -1,10 +1,12 @@ # SPDX-FileCopyrightText: none # SPDX-License-Identifier: BSD-3-Clause add_definitions(-DTRANSLATION_DOMAIN=\"libgravatar\") -add_library(KF5Gravatar) -add_library(KF5::Gravatar ALIAS KF5Gravatar) +add_library(KPim${KF_MAJOR_VERSION}Gravatar) +add_library(KPim${KF_MAJOR_VERSION}::Gravatar ALIAS KPim${KF_MAJOR_VERSION}Gravatar) +add_library(KF5::Gravatar ALIAS KPim${KF_MAJOR_VERSION}Gravatar) -target_sources(KF5Gravatar PRIVATE + +target_sources(KPim${KF_MAJOR_VERSION}Gravatar PRIVATE misc/gravatarcache.cpp misc/hash.cpp widgets/gravatardownloadpixmapwidget.cpp @@ -25,42 +27,42 @@ ) -ecm_qt_declare_logging_category(KF5Gravatar HEADER gravatar_debug.h IDENTIFIER GRAVATAR_LOG CATEGORY_NAME org.kde.pim.gravatar +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}Gravatar HEADER gravatar_debug.h IDENTIFIER GRAVATAR_LOG CATEGORY_NAME org.kde.pim.gravatar OLD_CATEGORY_NAMES log_gravatar DESCRIPTION "libgravatar (libgravatar)" EXPORT GRAVATAR) -kconfig_add_kcfg_files(KF5Gravatar +kconfig_add_kcfg_files(KPim${KF_MAJOR_VERSION}Gravatar settings/gravatarsettings.kcfgc ) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) - set_target_properties(KF5Gravatar PROPERTIES UNITY_BUILD ON) + set_target_properties(KPim${KF_MAJOR_VERSION}Gravatar PROPERTIES UNITY_BUILD ON) endif() -generate_export_header(KF5Gravatar BASE_NAME gravatar) +generate_export_header(KPim${KF_MAJOR_VERSION}Gravatar BASE_NAME gravatar) -target_link_libraries(KF5Gravatar +target_link_libraries(KPim${KF_MAJOR_VERSION}Gravatar PRIVATE - KF5::ConfigCore - KF5::I18n - KF5::WidgetsAddons - KF5::ConfigGui + KF${KF_MAJOR_VERSION}::ConfigCore + KF${KF_MAJOR_VERSION}::I18n + KF${KF_MAJOR_VERSION}::WidgetsAddons + KF${KF_MAJOR_VERSION}::ConfigGui KF5::PimCommon - KF5::TextWidgets + KF${KF_MAJOR_VERSION}::TextWidgets ) -target_include_directories(KF5Gravatar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/Gravatar/>") +target_include_directories(KPim${KF_MAJOR_VERSION}Gravatar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Gravatar/>") -target_include_directories(KF5Gravatar PUBLIC "$<BUILD_INTERFACE:${gravatar_SOURCE_DIR}/src;${gravatar_BINARY_DIR}/src>") +target_include_directories(KPim${KF_MAJOR_VERSION}Gravatar PUBLIC "$<BUILD_INTERFACE:${gravatar_SOURCE_DIR}/src;${gravatar_BINARY_DIR}/src>") -set_target_properties(KF5Gravatar PROPERTIES +set_target_properties(KPim${KF_MAJOR_VERSION}Gravatar PROPERTIES VERSION ${GRAVATAR_VERSION} SOVERSION ${GRAVATAR_SOVERSION} EXPORT_NAME Gravatar ) install(TARGETS - KF5Gravatar - EXPORT KF5GravatarTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} + KPim${KF_MAJOR_VERSION}Gravatar + EXPORT KPim${KF_MAJOR_VERSION}GravatarTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} ) ecm_generate_headers(Gravatar_Camelcase_job_HEADERS @@ -92,15 +94,15 @@ ecm_generate_pri_file(BASE_NAME Gravatar - LIB_NAME KF5Gravatar - DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/Gravatar/Gravatar + LIB_NAME KPim${KF_MAJOR_VERSION}Gravatar + DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Gravatar/Gravatar ) install(FILES ${Gravatar_Camelcase_widgets_HEADERS} ${Gravatar_Camelcase_job_HEADERS} ${Gravatar_Camelcase_misc_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Gravatar/Gravatar + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Gravatar/Gravatar COMPONENT Devel ) @@ -110,7 +112,7 @@ ${Gravatar_misc_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/gravatar_export.h ${CMAKE_CURRENT_BINARY_DIR}/gravatarsettings.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Gravatar/gravatar + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Gravatar/gravatar COMPONENT Devel ) @@ -123,9 +125,9 @@ if (BUILD_QCH) ecm_add_qch( - KF5Gravatar_QCH - NAME KF5Gravatar - BASE_NAME KF5Gravatar + KPim${KF_MAJOR_VERSION}Gravatar_QCH + NAME KPim${KF_MAJOR_VERSION}Gravatar + BASE_NAME KPim${KF_MAJOR_VERSION}Gravatar VERSION ${PIM_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API @@ -135,9 +137,9 @@ MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" LINK_QCHS - Qt5Core_QCH - Qt5Gui_QCH - Qt5Widgets_QCH + Qt${QT_MAJOR_VERSION}Core_QCH + Qt${QT_MAJOR_VERSION}Gui_QCH + Qt${QT_MAJOR_VERSION}Widgets_QCH Qt5Networks_QCH INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/gravatar_private_export.h new/libgravatar-23.04.0/src/gravatar_private_export.h --- old/libgravatar-22.12.3/src/gravatar_private_export.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/gravatar_private_export.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2017-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2017-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/job/gravatarresolvurljob.cpp new/libgravatar-23.04.0/src/job/gravatarresolvurljob.cpp --- old/libgravatar-22.12.3/src/job/gravatarresolvurljob.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/job/gravatarresolvurljob.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/job/gravatarresolvurljob.h new/libgravatar-23.04.0/src/job/gravatarresolvurljob.h --- old/libgravatar-22.12.3/src/job/gravatarresolvurljob.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/job/gravatarresolvurljob.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/misc/gravatarcache.cpp new/libgravatar-23.04.0/src/misc/gravatarcache.cpp --- old/libgravatar-22.12.3/src/misc/gravatarcache.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/misc/gravatarcache.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/misc/gravatarcache.h new/libgravatar-23.04.0/src/misc/gravatarcache.h --- old/libgravatar-22.12.3/src/misc/gravatarcache.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/misc/gravatarcache.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingsdialog.cpp new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingsdialog.cpp --- old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingsdialog.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingsdialog.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingsdialog.h new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingsdialog.h --- old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingsdialog.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingsdialog.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingswidget.cpp new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingswidget.cpp --- old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingswidget.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingswidget.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2019-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2019-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingswidget.h new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingswidget.h --- old/libgravatar-22.12.3/src/widgets/gravatarconfiguresettingswidget.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatarconfiguresettingswidget.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2019-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2019-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatarconfigwidget.cpp new/libgravatar-23.04.0/src/widgets/gravatarconfigwidget.cpp --- old/libgravatar-22.12.3/src/widgets/gravatarconfigwidget.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatarconfigwidget.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatarconfigwidget.h new/libgravatar-23.04.0/src/widgets/gravatarconfigwidget.h --- old/libgravatar-22.12.3/src/widgets/gravatarconfigwidget.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatarconfigwidget.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapdialog.cpp new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapdialog.cpp --- old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapdialog.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapdialog.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapdialog.h new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapdialog.h --- old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapdialog.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapdialog.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapwidget.cpp new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapwidget.cpp --- old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapwidget.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapwidget.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapwidget.h new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapwidget.h --- old/libgravatar-22.12.3/src/widgets/gravatardownloadpixmapwidget.h 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/src/widgets/gravatardownloadpixmapwidget.h 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/tests/CMakeLists.txt new/libgravatar-23.04.0/tests/CMakeLists.txt --- old/libgravatar-22.12.3/tests/CMakeLists.txt 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/tests/CMakeLists.txt 2023-04-11 06:38:26.000000000 +0200 @@ -5,9 +5,9 @@ target_link_libraries(gravatarwidget_gui Qt::Core Qt::Gui - KF5::Gravatar - KF5::I18n + KPim${KF_MAJOR_VERSION}::Gravatar + KF${KF_MAJOR_VERSION}::I18n Qt::Widgets - KF5::CoreAddons + KF${KF_MAJOR_VERSION}::CoreAddons ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-22.12.3/tests/gravatarwidget_gui.cpp new/libgravatar-23.04.0/tests/gravatarwidget_gui.cpp --- old/libgravatar-22.12.3/tests/gravatarwidget_gui.cpp 2023-02-25 06:18:26.000000000 +0100 +++ new/libgravatar-23.04.0/tests/gravatarwidget_gui.cpp 2023-04-11 06:38:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2015-2022 Laurent Montel <mon...@kde.org> + SPDX-FileCopyrightText: 2015-2023 Laurent Montel <mon...@kde.org> SPDX-License-Identifier: LGPL-2.0-or-later */
