Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grantleetheme for openSUSE:Factory checked in at 2023-04-23 22:44:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantleetheme (Old) and /work/SRC/openSUSE:Factory/.grantleetheme.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantleetheme" Sun Apr 23 22:44:53 2023 rev:86 rq:1081181 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/grantleetheme/grantleetheme.changes 2023-03-03 22:25:30.874762222 +0100 +++ /work/SRC/openSUSE:Factory/.grantleetheme.new.1533/grantleetheme.changes 2023-04-23 22:46:33.706405736 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:45:21 UTC 2023 - Christophe Marin <[email protected]> + +- 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:39 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:43:01 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- grantleetheme-22.12.3.tar.xz grantleetheme-22.12.3.tar.xz.sig New: ---- grantleetheme-23.04.0.tar.xz grantleetheme-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantleetheme.spec ++++++ --- /var/tmp/diff_new_pack.e0Gt4G/_old 2023-04-23 22:46:34.230408696 +0200 +++ /var/tmp/diff_new_pack.e0Gt4G/_new 2023-04-23 22:46:34.234408719 +0200 @@ -16,11 +16,9 @@ # -# 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 Name: grantleetheme -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: Grantlee theme support License: GPL-2.0-only @@ -33,10 +31,12 @@ BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: cmake(Grantlee5) +BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5NewStuff) +BuildRequires: cmake(KF5XmlGui) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) @@ -47,18 +47,20 @@ %description the grantleetheme library adds Grantlee theme support for PIM applications. -%package -n libKF5GrantleeTheme5 +%package -n libKPim5GrantleeTheme5 Summary: GrantleeTheme library for KDE PIM applications License: LGPL-2.1-or-later -Requires: grantleetheme = %{version} +%if %{with released} +%requires_eq grantleetheme +%endif -%description -n libKF5GrantleeTheme5 +%description -n libKPim5GrantleeTheme5 The GrantleeTheme library %package devel Summary: Development package for grantleetheme License: LGPL-2.1-or-later -Requires: libKF5GrantleeTheme5 = %{version} +Requires: libKPim5GrantleeTheme5 = %{version} %description devel The development package for the grantleetheme library @@ -80,13 +82,7 @@ %global grantlee_shortver %(rpm -q --queryformat=%%{VERSION} grantlee5 | cut -d . -f 1-2) -%ldconfig_scriptlets -n libKF5GrantleeTheme5 - -%files devel -%{_kf5_cmakedir}/KF5GrantleeTheme/ -%{_kf5_includedir}/GrantleeTheme/ -%{_kf5_libdir}/libKF5GrantleeTheme.so -%{_kf5_mkspecsdir}/qt_GrantleeTheme.pri +%ldconfig_scriptlets -n libKPim5GrantleeTheme5 %files %dir %{_kf5_libdir}/grantlee/ @@ -95,9 +91,17 @@ %{_kf5_debugdir}/grantleetheme.renamecategories %{_kf5_libdir}/grantlee/%{grantlee_shortver}/kde_grantlee_plugin.so -%files -n libKF5GrantleeTheme5 +%files -n libKPim5GrantleeTheme5 %license LICENSES/* -%{_kf5_libdir}/libKF5GrantleeTheme.so.* +%{_kf5_libdir}/libKPim5GrantleeTheme.so.* + +%files devel +%dir %{_includedir}/KPim5 +%{_includedir}/KPim5/GrantleeTheme/ +%{_kf5_cmakedir}/KF5GrantleeTheme/ +%{_kf5_cmakedir}/KPim5GrantleeTheme/ +%{_kf5_libdir}/libKPim5GrantleeTheme.so +%{_kf5_mkspecsdir}/qt_GrantleeTheme.pri %files lang -f %{name}.lang ++++++ grantleetheme-22.12.3.tar.xz -> grantleetheme-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/.gitlab-ci.yml new/grantleetheme-23.04.0/.gitlab-ci.yml --- old/grantleetheme-22.12.3/.gitlab-ci.yml 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/.gitlab-ci.yml 2023-04-11 06:35:15.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2020-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/.kde-ci.yml new/grantleetheme-23.04.0/.kde-ci.yml --- old/grantleetheme-22.12.3/.kde-ci.yml 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/.kde-ci.yml 2023-04-11 06:35:15.000000000 +0200 @@ -2,13 +2,23 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'frameworks/kguiaddons': '@latest' 'frameworks/ki18n': '@latest' 'frameworks/kiconthemes': '@latest' 'frameworks/knewstuff': '@latest' + 'frameworks/kxmlgui': '@latest' + +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/kguiaddons': '@latest-kf6' + 'frameworks/ki18n': '@latest-kf6' + 'frameworks/kiconthemes': '@latest-kf6' + 'frameworks/knewstuff': '@latest-kf6' + 'frameworks/kxmlgui': '@latest-kf6' - 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] 'require': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/CMakeLists.txt new/grantleetheme-23.04.0/CMakeLists.txt --- old/grantleetheme-22.12.3/CMakeLists.txt 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/CMakeLists.txt 2023-04-11 06:35:15.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(KF5_MIN_VERSION "5.99.0") -set(PIM_VERSION "5.22.3") +set(KF_MIN_VERSION "5.103.0") +set(PIM_VERSION "5.23.0") project(GrantleeTheme VERSION ${PIM_VERSION}) -find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${GrantleeTheme_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) include(KDEInstallDirs) @@ -35,65 +35,103 @@ set(QT_REQUIRED_VERSION "5.15.2") if (QT_MAJOR_VERSION STREQUAL "6") - set(QT_REQUIRED_VERSION "6.4.0") + 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() -set(GRANTLEE_VERSION "5.2") + +set(GRANTLEE_VERSION "5.3") find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) -find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5NewStuff ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}GuiAddons ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}IconThemes ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}NewStuff ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}XmlGui ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}ConfigWidgets ${KF_MIN_VERSION} CONFIG REQUIRED) if (QT_MAJOR_VERSION STREQUAL "5") find_package(Grantlee5 ${GRANTLEE_VERSION} CONFIG REQUIRED) set(MAIN_LIB Grantlee5::Templates) else() find_package(KF6TextTemplate CONFIG REQUIRED) - set(MAIN_LIB KF6TextTemplate::Templates) + set(MAIN_LIB KF6::TextTemplate) endif() ecm_setup_version(PROJECT VARIABLE_PREFIX GRANTLEETHEME VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/grantleetheme_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfigVersion.cmake" SOVERSION 5 ) ########### Targets ########### -ecm_set_disabled_deprecation_versions(QT 5.14.0 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) +option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will allow to co-install lib)" ON) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if (USE_UNITY_CMAKE_SUPPORT) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() ########### CMake Config Files ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5GrantleeTheme") - +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}GrantleeTheme") +set(GRANTLEETHEME_KF5_COMPAT FALSE) configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5GrantleeThemeConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfig.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/KPimGrantleeThemeConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KF5GrantleeThemeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5GrantleeThemeTargets.cmake NAMESPACE KF5::) +install(EXPORT KPim${KF_MAJOR_VERSION}GrantleeThemeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}GrantleeThemeTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grantleetheme_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/GrantleeTheme COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/GrantleeTheme COMPONENT Devel ) +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}/KF5GrantleeTheme") +set(GRANTLEETHEME_KF5_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimGrantleeThemeConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5GrantleeThemeConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}GrantleeThemeConfigVersion.cmake" + RENAME "KF5GrantleeThemeConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}GrantleeThemeTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + FILE KPim${KF_MAJOR_VERSION}GrantleeThemeTargets.cmake + NAMESPACE KF5:: +) +endif() +endif() add_subdirectory(src) if (BUILD_TESTING) find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/CMakePresets.json new/grantleetheme-23.04.0/CMakePresets.json --- old/grantleetheme-22.12.3/CMakePresets.json 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/CMakePresets.json 2023-04-11 06:35:15.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/grantleetheme-22.12.3/CMakePresets.json.license new/grantleetheme-23.04.0/CMakePresets.json.license --- old/grantleetheme-22.12.3/CMakePresets.json.license 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/CMakePresets.json.license 2023-04-11 06:35:15.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/KF5GrantleeThemeConfig.cmake.in new/grantleetheme-23.04.0/KF5GrantleeThemeConfig.cmake.in --- old/grantleetheme-22.12.3/KF5GrantleeThemeConfig.cmake.in 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/KF5GrantleeThemeConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) - -if ("@QT_MAJOR_VERSION@" STREQUAL "5") - find_dependency(Grantlee5 @GRANTLEE_VERSION@) -else() - find_dependency(KF6TextTemplate) -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/KF5GrantleeThemeTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/KPimGrantleeThemeConfig.cmake.in new/grantleetheme-23.04.0/KPimGrantleeThemeConfig.cmake.in --- old/grantleetheme-22.12.3/KPimGrantleeThemeConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-23.04.0/KPimGrantleeThemeConfig.cmake.in 2023-04-11 06:35:15.000000000 +0200 @@ -0,0 +1,21 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +if ("@QT_MAJOR_VERSION@" STREQUAL "5") + find_dependency(Grantlee5 @GRANTLEE_VERSION@) +else() + find_dependency(KF6TextTemplate) +endif() + +if (@GRANTLEETHEME_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5GrantleeTheme) and KF5::GrantleeTheme targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@GrantleeTheme) and KPim@KF_MAJOR_VERSION@::GrantleeTheme instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/autotest/CMakeLists.txt new/grantleetheme-23.04.0/autotest/CMakeLists.txt --- old/grantleetheme-22.12.3/autotest/CMakeLists.txt 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/autotest/CMakeLists.txt 2023-04-11 06:35:15.000000000 +0200 @@ -2,9 +2,9 @@ add_definitions( -DGRANTLEETHEME_DATA_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/data" ) ecm_add_test(grantleethemetest.cpp NAME_PREFIX "grantleetheme-" - LINK_LIBRARIES Qt::Test KF5::GrantleeTheme KF5::ConfigCore Qt::Gui KF5::ConfigWidgets + LINK_LIBRARIES Qt::Test KPim${KF_MAJOR_VERSION}::GrantleeTheme KF${KF_MAJOR_VERSION}::ConfigCore Qt::Gui KF${KF_MAJOR_VERSION}::ConfigWidgets ) ecm_add_test(grantleethememanagertest.cpp NAME_PREFIX "grantleetheme-" - LINK_LIBRARIES Qt::Test KF5::GrantleeTheme KF5::ConfigCore KF5::XmlGui + LINK_LIBRARIES Qt::Test KPim${KF_MAJOR_VERSION}::GrantleeTheme KF${KF_MAJOR_VERSION}::ConfigCore KF${KF_MAJOR_VERSION}::XmlGui ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/autotest/data/themes/color/color_expected.html new/grantleetheme-23.04.0/autotest/data/themes/color/color_expected.html --- old/grantleetheme-22.12.3/autotest/data/themes/color/color_expected.html 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/autotest/data/themes/color/color_expected.html 2023-04-11 06:35:15.000000000 +0200 @@ -24,9 +24,9 @@ Mix filtered: rgba(64, 0, 64, 1) ## Color scheme -Normal background: #fcfcfc -Link background: #e4eef7 -Normal text: #232627 +Normal background: #ffffff +Link background: #e8f0f8 +Normal text: #232629 Link text: #2980b9 Hover color: #93cee9 Focus color: #3daee9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/autotest/grantleethemetest.cpp new/grantleetheme-23.04.0/autotest/grantleethemetest.cpp --- old/grantleetheme-22.12.3/autotest/grantleethemetest.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/autotest/grantleethemetest.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2014-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2014-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: LGPL-2.1-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/autotest/grantleethemetest.h new/grantleetheme-23.04.0/autotest/grantleethemetest.h --- old/grantleetheme-22.12.3/autotest/grantleethemetest.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/autotest/grantleethemetest.h 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2014-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2014-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: LGPL-2.1-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/po/ca/libgrantleetheme.po new/grantleetheme-23.04.0/po/ca/libgrantleetheme.po --- old/grantleetheme-22.12.3/po/ca/libgrantleetheme.po 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/po/ca/libgrantleetheme.po 2023-04-11 06:35:15.000000000 +0200 @@ -50,3 +50,6 @@ #, kde-format msgid "Download new Templates..." msgstr "Baixa plantilles noves..." + +#~ msgid "Download New Themes..." +#~ msgstr "Baixa temes nous..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/po/zh_CN/libgrantleetheme.po new/grantleetheme-23.04.0/po/zh_CN/libgrantleetheme.po --- old/grantleetheme-22.12.3/po/zh_CN/libgrantleetheme.po 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/po/zh_CN/libgrantleetheme.po 2023-04-11 06:35:15.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-05-17 00:45+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/grantleetheme-22.12.3/sanitizers.supp new/grantleetheme-23.04.0/sanitizers.supp --- old/grantleetheme-22.12.3/sanitizers.supp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/sanitizers.supp 2023-04-11 06:35:15.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/CMakeLists.txt new/grantleetheme-23.04.0/src/CMakeLists.txt --- old/grantleetheme-22.12.3/src/CMakeLists.txt 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/CMakeLists.txt 2023-04-11 06:35:15.000000000 +0200 @@ -1,12 +1,13 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libgrantleetheme\") -add_library(KF5GrantleeTheme) -add_library(KF5::GrantleeTheme ALIAS KF5GrantleeTheme) +add_library(KPim${KF_MAJOR_VERSION}GrantleeTheme) +add_library(KPim${KF_MAJOR_VERSION}::GrantleeTheme ALIAS KPim${KF_MAJOR_VERSION}GrantleeTheme) +add_library(KF5::GrantleeTheme ALIAS KPim${KF_MAJOR_VERSION}GrantleeTheme) add_subdirectory(plugin) -target_sources(KF5GrantleeTheme PRIVATE +target_sources(KPim${KF_MAJOR_VERSION}GrantleeTheme PRIVATE genericformatter.cpp grantleetheme.cpp grantleethememanager.cpp @@ -24,36 +25,38 @@ configure_file(config-grantleetheme.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-grantleetheme.h) -ecm_qt_declare_logging_category(KF5GrantleeTheme HEADER grantleetheme_debug.h IDENTIFIER GRANTLEETHEME_LOG CATEGORY_NAME org.kde.pim.grantleetheme +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}GrantleeTheme HEADER grantleetheme_debug.h IDENTIFIER GRANTLEETHEME_LOG CATEGORY_NAME org.kde.pim.grantleetheme OLD_CATEGORY_NAMES log_grantleetheme DESCRIPTION "kdepim (grantleetheme)" EXPORT LIBGRANTLEETHEME) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) - set_target_properties(KF5GrantleeTheme PROPERTIES UNITY_BUILD ON) + set_target_properties(KPim${KF_MAJOR_VERSION}GrantleeTheme PROPERTIES UNITY_BUILD ON) endif() -generate_export_header(KF5GrantleeTheme BASE_NAME grantleetheme) +generate_export_header(KPim${KF_MAJOR_VERSION}GrantleeTheme BASE_NAME grantleetheme) -target_include_directories(KF5GrantleeTheme INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/GrantleeTheme/>") -target_include_directories(KF5GrantleeTheme PUBLIC "$<BUILD_INTERFACE:${GrantleeTheme_SOURCE_DIR}/src;${GrantleeTheme_BINARY_DIR}/src;>") +target_include_directories(KPim${KF_MAJOR_VERSION}GrantleeTheme INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/GrantleeTheme/>") +target_include_directories(KPim${KF_MAJOR_VERSION}GrantleeTheme PUBLIC "$<BUILD_INTERFACE:${GrantleeTheme_SOURCE_DIR}/src;${GrantleeTheme_BINARY_DIR}/src;>") -target_link_libraries(KF5GrantleeTheme +target_link_libraries(KPim${KF_MAJOR_VERSION}GrantleeTheme PUBLIC ${MAIN_LIB} PRIVATE - KF5::NewStuff - KF5::I18n - KF5::NewStuffWidgets + KF${KF_MAJOR_VERSION}::NewStuffCore + KF${KF_MAJOR_VERSION}::I18n + KF${KF_MAJOR_VERSION}::NewStuffWidgets + KF${KF_MAJOR_VERSION}::ConfigCore + KF${KF_MAJOR_VERSION}::XmlGui ) -set_target_properties(KF5GrantleeTheme PROPERTIES +set_target_properties(KPim${KF_MAJOR_VERSION}GrantleeTheme PROPERTIES VERSION ${GRANTLEETHEME_VERSION} SOVERSION ${GRANTLEETHEME_SOVERSION} EXPORT_NAME GrantleeTheme ) install(TARGETS - KF5GrantleeTheme - EXPORT KF5GrantleeThemeTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} + KPim${KF_MAJOR_VERSION}GrantleeTheme + EXPORT KPim${KF_MAJOR_VERSION}GrantleeThemeTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} ) ecm_generate_headers(GrantleeTheme_CamelCase_HEADERS @@ -69,14 +72,14 @@ ) ecm_generate_pri_file(BASE_NAME GrantleeTheme - LIB_NAME KF5GrantleeTheme - DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/GrantleeTheme + LIB_NAME KPim${KF_MAJOR_VERSION}GrantleeTheme + DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/GrantleeTheme ) install(FILES ${GrantleeTheme_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/GrantleeTheme/GrantleeTheme + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/GrantleeTheme/GrantleeTheme COMPONENT Devel ) @@ -84,7 +87,7 @@ ${GrantleeTheme_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/grantleetheme_export.h ${GrantleeTheme_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/GrantleeTheme/grantleetheme + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/GrantleeTheme/grantleetheme COMPONENT Devel ) install(FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/genericformatter.cpp new/grantleetheme-23.04.0/src/genericformatter.cpp --- old/grantleetheme-22.12.3/src/genericformatter.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/genericformatter.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2016-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2016-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/genericformatter.h new/grantleetheme-23.04.0/src/genericformatter.h --- old/grantleetheme-22.12.3/src/genericformatter.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/genericformatter.h 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2016-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2016-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: GPL-2.0-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleeki18nlocalizer.cpp new/grantleetheme-23.04.0/src/grantleeki18nlocalizer.cpp --- old/grantleetheme-22.12.3/src/grantleeki18nlocalizer.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleeki18nlocalizer.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -12,7 +12,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/safestring.h> #else -#include <KTextTemplate/safestring.h> +#include <KTextTemplate/SafeString> #endif #include <KLocalizedString> @@ -33,6 +33,7 @@ { KLocalizedString str = kstr; for (auto iter = arguments.cbegin(), end = arguments.cend(); iter != end; ++iter) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) switch (iter->type()) { case QVariant::String: str = str.subs(iter->toString()); @@ -56,22 +57,50 @@ str = str.subs(iter->toDouble()); break; case QVariant::UserType: -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (iter->canConvert<Grantlee::SafeString>()) { str = str.subs(iter->value<Grantlee::SafeString>().get()); break; } + // fall-through + default: + qCWarning(GRANTLEETHEME_LOG) << "Unknown type" << iter->typeName() << "(" << iter->type() << ")"; + break; + } #else + switch (iter->userType()) { + case QMetaType::QString: + str = str.subs(iter->toString()); + break; + case QMetaType::Int: + str = str.subs(iter->toInt()); + break; + case QMetaType::UInt: + str = str.subs(iter->toUInt()); + break; + case QMetaType::LongLong: + str = str.subs(iter->toLongLong()); + break; + case QMetaType::ULongLong: + str = str.subs(iter->toULongLong()); + break; + case QMetaType::Char: + str = str.subs(iter->toChar()); + break; + case QMetaType::Double: + str = str.subs(iter->toDouble()); + break; + case QMetaType::User: if (iter->canConvert<KTextTemplate::SafeString>()) { str = str.subs(iter->value<KTextTemplate::SafeString>().get()); break; } -#endif // fall-through default: - qCWarning(GRANTLEETHEME_LOG) << "Unknown type" << iter->typeName() << "(" << iter->type() << ")"; + qCWarning(GRANTLEETHEME_LOG) << "Unknown type" << iter->typeName() << "(" << iter->userType() << ")"; break; } + +#endif } // Return localized in the currenctly active locale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleeki18nlocalizer.h new/grantleetheme-23.04.0/src/grantleeki18nlocalizer.h --- old/grantleetheme-22.12.3/src/grantleeki18nlocalizer.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleeki18nlocalizer.h 2023-04-11 06:35:15.000000000 +0200 @@ -11,7 +11,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/qtlocalizer.h> #else -#include <KTextTemplate/qtlocalizer.h> +#include <KTextTemplate/QtLocalizer> #endif #include <QLocale> @@ -52,7 +52,7 @@ void setApplicationDomain(const QByteArray &domain); private: - QString processArguments(const KLocalizedString &str, const QVariantList &arguments) const; + Q_REQUIRED_RESULT QString processArguments(const KLocalizedString &str, const QVariantList &arguments) const; QByteArray mApplicationDomain; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleetheme.cpp new/grantleetheme-23.04.0/src/grantleetheme.cpp --- old/grantleetheme-22.12.3/src/grantleetheme.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleetheme.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2013-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2013-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: LGPL-2.1-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleetheme.h new/grantleetheme-23.04.0/src/grantleetheme.h --- old/grantleetheme-22.12.3/src/grantleetheme.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleetheme.h 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2013-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2013-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: LGPL-2.1-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleetheme_p.h new/grantleetheme-23.04.0/src/grantleetheme_p.h --- old/grantleetheme-22.12.3/src/grantleetheme_p.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleetheme_p.h 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2013-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2013-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: LGPL-2.1-or-later */ @@ -13,9 +13,9 @@ #include <grantlee/template.h> #include <grantlee/templateloader.h> #else -#include <KTextTemplate/engine.h> -#include <KTextTemplate/template.h> -#include <KTextTemplate/templateloader.h> +#include <KTextTemplate/Engine> +#include <KTextTemplate/Template> +#include <KTextTemplate/TemplateLoader> #endif namespace GrantleeTheme diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleethemeengine.cpp new/grantleetheme-23.04.0/src/grantleethemeengine.cpp --- old/grantleetheme-22.12.3/src/grantleethemeengine.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleethemeengine.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -36,7 +36,11 @@ addDefaultLibrary(QStringLiteral("ktexttemplate_i18ntags")); #endif addDefaultLibrary(QStringLiteral("kde_grantlee_plugin")); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) addDefaultLibrary(QStringLiteral("grantlee_scriptabletags")); +#else + addDefaultLibrary(QStringLiteral("ktexttemplate_scriptabletags")); +#endif setSmartTrimEnabled(true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleethemeengine.h new/grantleetheme-23.04.0/src/grantleethemeengine.h --- old/grantleetheme-22.12.3/src/grantleethemeengine.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleethemeengine.h 2023-04-11 06:35:15.000000000 +0200 @@ -10,7 +10,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/engine.h> #else -#include <KTextTemplate/engine.h> +#include <KTextTemplate/Engine> #endif #include "grantleetheme_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleethememanager.cpp new/grantleetheme-23.04.0/src/grantleethememanager.cpp --- old/grantleetheme-22.12.3/src/grantleethememanager.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleethememanager.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2013-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2013-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: LGPL-2.1-or-later */ @@ -319,7 +319,9 @@ void ThemeManager::setDownloadNewStuffConfigFile(const QString &configFileName) { - d->downloadThemesAction->setConfigFile(configFileName); + if (d->downloadThemesAction) { + d->downloadThemesAction->setConfigFile(configFileName); + } } QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QString &themeName, const QString &defaultDesktopFileName) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/grantleethememanager.h new/grantleetheme-23.04.0/src/grantleethememanager.h --- old/grantleetheme-22.12.3/src/grantleethememanager.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/grantleethememanager.h 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - SPDX-FileCopyrightText: 2013-2022 Laurent Montel <[email protected]> + SPDX-FileCopyrightText: 2013-2023 Laurent Montel <[email protected]> SPDX-License-Identifier: LGPL-2.1-or-later */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/CMakeLists.txt new/grantleetheme-23.04.0/src/plugin/CMakeLists.txt --- old/grantleetheme-22.12.3/src/plugin/CMakeLists.txt 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/CMakeLists.txt 2023-04-11 06:35:15.000000000 +0200 @@ -22,9 +22,9 @@ kpim_grantlee_adjust_plugin_name(kde_grantlee_plugin) target_link_libraries(kde_grantlee_plugin ${MAIN_LIB} - KF5::IconThemes - KF5::GuiAddons - KF5::ConfigWidgets + KF${KF_MAJOR_VERSION}::IconThemes + KF${KF_MAJOR_VERSION}::GuiAddons + KF${KF_MAJOR_VERSION}::ConfigWidgets ) if (QT_MAJOR_VERSION STREQUAL "5") @@ -33,6 +33,6 @@ ) else() install(TARGETS kde_grantlee_plugin - LIBRARY DESTINATION ${KDE_INSTALL_LIBDIR}/KTextTemplate/${KF5_MIN_VERSION}/ + LIBRARY DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/ktexttemplate/ ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/color.cpp new/grantleetheme-23.04.0/src/plugin/color.cpp --- old/grantleetheme-22.12.3/src/plugin/color.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/color.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -11,10 +11,10 @@ #include <grantlee/parser.h> #include <grantlee/variable.h> #else -#include <KTextTemplate/exception.h> -#include <KTextTemplate/metatype.h> -#include <KTextTemplate/parser.h> -#include <KTextTemplate/variable.h> +#include <KTextTemplate/Exception> +#include <KTextTemplate/MetaType> +#include <KTextTemplate/Parser> +#include <KTextTemplate/Variable> #endif #include <KColorUtils> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/color.h new/grantleetheme-23.04.0/src/plugin/color.h --- old/grantleetheme-22.12.3/src/plugin/color.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/color.h 2023-04-11 06:35:15.000000000 +0200 @@ -10,8 +10,8 @@ #include <grantlee/filter.h> #include <grantlee/node.h> #else -#include <KTextTemplate/filter.h> -#include <KTextTemplate/node.h> +#include <KTextTemplate/Filter> +#include <KTextTemplate/Node> #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/colorscheme.cpp new/grantleetheme-23.04.0/src/plugin/colorscheme.cpp --- old/grantleetheme-22.12.3/src/plugin/colorscheme.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/colorscheme.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -9,7 +9,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/metatype.h> #else -#include <KTextTemplate/metatype.h> +#include <KTextTemplate/MetaType> #endif #include <KColorScheme> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/icon.cpp new/grantleetheme-23.04.0/src/plugin/icon.cpp --- old/grantleetheme-22.12.3/src/plugin/icon.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/icon.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -11,9 +11,9 @@ #include <grantlee/parser.h> #include <grantlee/variable.h> #else -#include <KTextTemplate/exception.h> -#include <KTextTemplate/parser.h> -#include <KTextTemplate/variable.h> +#include <KTextTemplate/Exception> +#include <KTextTemplate/Parser> +#include <KTextTemplate/Variable> #endif #include <KIconLoader> @@ -36,11 +36,9 @@ { Q_UNUSED(p) - static QHash<QString, int> sizeOrGroupLookup = {{QStringLiteral("desktop"), KIconLoader::Desktop}, - {QStringLiteral("toolbar"), KIconLoader::Toolbar}, + static QHash<QString, int> sizeOrGroupLookup = {{QStringLiteral("toolbar"), KIconLoader::Toolbar}, {QStringLiteral("maintoolbar"), KIconLoader::MainToolbar}, {QStringLiteral("small"), KIconLoader::Small}, - {QStringLiteral("panel"), KIconLoader::Panel}, {QStringLiteral("dialog"), KIconLoader::Dialog}, {QStringLiteral("sizesmall"), KIconLoader::SizeSmall}, {QStringLiteral("sizesmallmedium"), KIconLoader::SizeSmallMedium}, @@ -130,7 +128,11 @@ #else const QVariant val = KTextTemplate::Variable(mIconName).resolve(c); #endif +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (val.type() == QVariant::String) { +#else + if (val.metaType().id() == QMetaType::QString) { +#endif iconName = val.toString(); } else { #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/icon.h new/grantleetheme-23.04.0/src/plugin/icon.h --- old/grantleetheme-22.12.3/src/plugin/icon.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/icon.h 2023-04-11 06:35:15.000000000 +0200 @@ -10,7 +10,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/node.h> #else -#include <KTextTemplate/node.h> +#include <KTextTemplate/Node> #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/kdegrantleeplugin.h new/grantleetheme-23.04.0/src/plugin/kdegrantleeplugin.h --- old/grantleetheme-22.12.3/src/plugin/kdegrantleeplugin.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/kdegrantleeplugin.h 2023-04-11 06:35:15.000000000 +0200 @@ -10,7 +10,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/taglibraryinterface.h> #else -#include <KTextTemplate/taglibraryinterface.h> +#include <KTextTemplate/TagLibraryInterface> #endif #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) class KDEGrantleePlugin : public QObject, public Grantlee::TagLibraryInterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/plugin/palette.cpp new/grantleetheme-23.04.0/src/plugin/palette.cpp --- old/grantleetheme-22.12.3/src/plugin/palette.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/plugin/palette.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -9,7 +9,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/metatype.h> #else -#include <KTextTemplate/metatype.h> +#include <KTextTemplate/MetaType> #endif #include <QPalette> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/qtresourcetemplateloader.cpp new/grantleetheme-23.04.0/src/qtresourcetemplateloader.cpp --- old/grantleetheme-22.12.3/src/qtresourcetemplateloader.cpp 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/qtresourcetemplateloader.cpp 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2016-2022 Laurent Montel <[email protected]> + * SPDX-FileCopyrightText: 2016-2023 Laurent Montel <[email protected]> * * SPDX-License-Identifier: LGPL-2.1-or-later * @@ -12,7 +12,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/engine.h> #else -#include <KTextTemplate/engine.h> +#include <KTextTemplate/Engine> #endif // TODO: remove this class when Grantlee support it using namespace GrantleeTheme; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-22.12.3/src/qtresourcetemplateloader.h new/grantleetheme-23.04.0/src/qtresourcetemplateloader.h --- old/grantleetheme-22.12.3/src/qtresourcetemplateloader.h 2023-02-25 05:54:55.000000000 +0100 +++ new/grantleetheme-23.04.0/src/qtresourcetemplateloader.h 2023-04-11 06:35:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2016-2022 Laurent Montel <[email protected]> + * SPDX-FileCopyrightText: 2016-2023 Laurent Montel <[email protected]> * * SPDX-License-Identifier: LGPL-2.1-or-later * @@ -10,7 +10,7 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <grantlee/templateloader.h> #else -#include <KTextTemplate/templateloader.h> +#include <KTextTemplate/TemplateLoader> #endif #include "grantleetheme_export.h"
