Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grantleetheme for openSUSE:Factory checked in at 2025-08-16 20:35:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantleetheme (Old) and /work/SRC/openSUSE:Factory/.grantleetheme.new.1085 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantleetheme" Sat Aug 16 20:35:56 2025 rev:114 rq:1299552 version:25.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/grantleetheme/grantleetheme.changes 2025-07-06 17:01:23.622761487 +0200 +++ /work/SRC/openSUSE:Factory/.grantleetheme.new.1085/grantleetheme.changes 2025-08-16 20:36:18.816613971 +0200 @@ -1,0 +2,24 @@ +Fri Aug 8 07:47:10 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 25.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/25.08.0/ +- No code change since 25.07.80 + +------------------------------------------------------------------- +Mon Jul 14 14:24:56 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 25.07.80 + * New feature release +- Changes since 25.04.3: + * .gersemirc - CMake formatting with gersemi config + * .pre-commit-config.yaml - autoupdate and gersemi config + * Add .gersemirc + * It compiles fine without qt 6.10 deprecated methods + * Activate yaml pre-commit support + * Add pre-commit CI support + * Add tests-run-in-parallel + * Not necessary initialize base class + +------------------------------------------------------------------- Old: ---- grantleetheme-25.04.3.tar.xz grantleetheme-25.04.3.tar.xz.sig New: ---- grantleetheme-25.08.0.tar.xz grantleetheme-25.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantleetheme.spec ++++++ --- /var/tmp/diff_new_pack.oKxLIQ/_old 2025-08-16 20:36:19.340635449 +0200 +++ /var/tmp/diff_new_pack.oKxLIQ/_new 2025-08-16 20:36:19.340635449 +0200 @@ -1,7 +1,7 @@ # # spec file for package grantleetheme # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,12 @@ # -%define kf6_version 6.6.0 -%define qt6_version 6.6.0 +%define kf6_version 6.14.0 +%define qt6_version 6.8.0 %bcond_without released Name: grantleetheme -Version: 25.04.3 +Version: 25.08.0 Release: 0 Summary: Grantlee theme support License: GPL-2.0-only ++++++ grantleetheme-25.04.3.tar.xz -> grantleetheme-25.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/.clang-format-pre-commit new/grantleetheme-25.08.0/.clang-format-pre-commit --- old/grantleetheme-25.04.3/.clang-format-pre-commit 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-25.08.0/.clang-format-pre-commit 2025-07-27 09:10:59.000000000 +0200 @@ -0,0 +1,95 @@ +--- +# SPDX-FileCopyrightText: 2019 Christoph Cullmann <cullm...@kde.org> +# SPDX-FileCopyrightText: 2019 Gernot Gebhard <gebh...@absint.com> +# +# SPDX-License-Identifier: MIT + +# This file got automatically created by ECM, do not edit +# See https://clang.llvm.org/docs/ClangFormatStyleOptions.html for the config options +# and https://community.kde.org/Policies/Frameworks_Coding_Style#Clang-format_automatic_code_formatting +# for clang-format tips & tricks +--- +Language: JavaScript +DisableFormat: true +--- +Language: Json +DisableFormat: false +IndentWidth: 4 +--- + +# Style for C++ +Language: Cpp + +# base is WebKit coding style: https://webkit.org/code-style-guidelines/ +# below are only things set that diverge from this style! +BasedOnStyle: WebKit + +# enforce C++11 (e.g. for std::vector<std::vector<lala>> +Standard: Cpp11 + +# 4 spaces indent +TabWidth: 4 + +# 2 * 80 wide lines +ColumnLimit: 160 + +# sort includes inside line separated groups +SortIncludes: true + +# break before braces on function, namespace and class definitions. +BreakBeforeBraces: Linux + +# CrlInstruction *a; +PointerAlignment: Right + +# horizontally aligns arguments after an open bracket. +AlignAfterOpenBracket: Align + +# don't move all parameters to new line +AllowAllParametersOfDeclarationOnNextLine: false + +# no single line functions +AllowShortFunctionsOnASingleLine: None + +# no single line enums +AllowShortEnumsOnASingleLine: false + +# always break before you encounter multi line strings +AlwaysBreakBeforeMultilineStrings: true + +# don't move arguments to own lines if they are not all on the same +BinPackArguments: false + +# don't move parameters to own lines if they are not all on the same +BinPackParameters: false + +# In case we have an if statement with multiple lines the operator should be at the beginning of the line +# but we do not want to break assignments +BreakBeforeBinaryOperators: NonAssignment + +# format C++11 braced lists like function calls +Cpp11BracedListStyle: true + +# do not put a space before C++11 braced lists +SpaceBeforeCpp11BracedList: false + +# remove empty lines +KeepEmptyLinesAtTheStartOfBlocks: false + +# no namespace indentation to keep indent level low +NamespaceIndentation: None + +# we use template< without space. +SpaceAfterTemplateKeyword: false + +# Always break after template declaration +AlwaysBreakTemplateDeclarations: true + +# macros for which the opening brace stays attached. +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE , wl_resource_for_each, wl_resource_for_each_safe ] + +# keep lambda formatting multi-line if not empty +AllowShortLambdasOnASingleLine: Empty + +# We do not want clang-format to put all arguments on a new line +AllowAllArgumentsOnNextLine: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/.gersemirc new/grantleetheme-25.08.0/.gersemirc --- old/grantleetheme-25.04.3/.gersemirc 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-25.08.0/.gersemirc 2025-07-27 09:10:59.000000000 +0200 @@ -0,0 +1,3 @@ +indent: 4 +line_length: 120 +list_expansion: favour-expansion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/.gitlab-ci.yml new/grantleetheme-25.08.0/.gitlab-ci.yml --- old/grantleetheme-25.04.3/.gitlab-ci.yml 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/.gitlab-ci.yml 2025-07-27 09:10:59.000000000 +0200 @@ -6,11 +6,8 @@ file: - /gitlab-templates/linux-qt6.yml - /gitlab-templates/linux-qt6-next.yml - - /gitlab-templates/json-validation.yml - /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/windows-qt6.yml - /gitlab-templates/cppcheck.yml - - /gitlab-templates/clang-format.yml - /gitlab-templates/alpine-qt6.yml - - /gitlab-templates/xml-lint.yml - - /gitlab-templates/yaml-lint.yml + - /gitlab-templates/pre-commit.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/.kde-ci.yml new/grantleetheme-25.08.0/.kde-ci.yml --- old/grantleetheme-25.04.3/.kde-ci.yml 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/.kde-ci.yml 2025-07-27 09:10:59.000000000 +0200 @@ -15,3 +15,4 @@ Options: require-passing-tests-on: ['@all'] + tests-run-in-parallel: True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/.pre-commit-config.yaml new/grantleetheme-25.08.0/.pre-commit-config.yaml --- old/grantleetheme-25.04.3/.pre-commit-config.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-25.08.0/.pre-commit-config.yaml 2025-07-27 09:10:59.000000000 +0200 @@ -0,0 +1,60 @@ +# SPDX-FileCopyrightText: none +# SPDX-License-Identifier: CC0-1.0 +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks + +exclude: (^po/|.desktop|Messages.sh) +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-added-large-files + - id: check-case-conflict + - id: check-xml + - id: check-yaml + args: [--allow-multiple-documents] + exclude: ^(.clang-tidy) + - id: check-json + - id: check-symlinks + - id: destroyed-symlinks + - id: check-executables-have-shebangs + - repo: https://github.com/pre-commit/mirrors-clang-format + rev: v20.1.7 + hooks: + - id: clang-format + # force using this project's configuration rather + # than the one provided by CI + args: ["--style=file:.clang-format-pre-commit"] + - repo: https://github.com/astral-sh/ruff-pre-commit + # Ruff version. + rev: v0.12.1 + hooks: + # Run the linter. + - id: ruff + # Run the formatter. + - id: ruff-format + - repo: https://github.com/codespell-project/codespell + rev: v2.4.1 + hooks: + - id: codespell + exclude: (textemoticons/core/data/emoji.json|textgrammarcheck/grammalecte/autotests/data/result1.json|texttranslator/translator/plugins/bergamot/autotests/data/modellanguages/models.json|textgrammarcheck/languagetool/autotests/data/test2.json|textautocorrection/core/autotests/data/custom-fr-ref.xml|textgrammarcheck/common/autotests/grammarresultutiltest.cpp|textautocorrection/core/autotests/data/custom-fr.xml) + - repo: https://github.com/BlankSpruce/gersemi + rev: 0.19.3 + hooks: + - id: gersemi + args: ["--no-warn-about-unknown-commands"] + - repo: https://github.com/DavidAnson/markdownlint-cli2 + rev: v0.18.1 + hooks: + - id: markdownlint-cli2 + files: \.(md|mdown|markdown)$ + - repo: https://github.com/scop/pre-commit-shfmt + rev: v3.11.0-1 + hooks: + - id: shfmt + - repo: https://github.com/shellcheck-py/shellcheck-py + rev: v0.10.0.1 + hooks: + - id: shellcheck diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/CMakeLists.txt new/grantleetheme-25.08.0/CMakeLists.txt --- old/grantleetheme-25.04.3/CMakeLists.txt 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/CMakeLists.txt 2025-07-27 09:10:59.000000000 +0200 @@ -1,11 +1,10 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(KF_MIN_VERSION "6.9.0") -set(PIM_VERSION "6.4.3") -set(QT_REQUIRED_VERSION "6.7.0") +set(KF_MIN_VERSION "6.14.0") +set(PIM_VERSION "6.5.0") +set(QT_REQUIRED_VERSION "6.8.0") project(GrantleeTheme VERSION ${PIM_VERSION}) - find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${GrantleeTheme_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) @@ -17,15 +16,28 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -include(KDEGitCommitHooks) -include(KDEClangFormat) -file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES -src/*.cpp -src/*.h -autotests/*.cpp -autotests/*.h -) -kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) +file( + GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES + src/*.cpp + src/*.h + autotests/*.cpp + autotests/*.h +) +set(PRE_COMMIT_INSTALLED FALSE) +if(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) + if(EXISTS "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit") + file(READ "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit" FILE_CONTENTS) + string(FIND "${FILE_CONTENTS}" "File generated by pre-commit" INDEX) + if(${INDEX} GREATER_EQUAL 0) + set(PRE_COMMIT_INSTALLED TRUE) + endif() + endif() +endif() +if(NOT ${PRE_COMMIT_INSTALLED}) + include(KDEGitCommitHooks) + include(KDEClangFormat) + kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) +endif() include(ECMQtDeclareLoggingCategory) include(ECMDeprecationSettings) @@ -33,19 +45,27 @@ include(ECMAddTests) include(ECMAddQch) include(KPIMGrantleeMacros) -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)") +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)" +) include(ECMCheckOutboundLicense) -file(GLOB_RECURSE ALL_SOURCE_FILES -src/*.cpp -src/*.h -autotests/*.cpp -autotests/*.h +file( + GLOB_RECURSE ALL_SOURCE_FILES + src/*.cpp + src/*.h + autotests/*.cpp + autotests/*.h ) ecm_check_outbound_license(LICENSES GPL-2.0-only FILES ${ALL_SOURCE_FILES}) - set(GRANTLEETHEME_LIB_VERSION ${PIM_VERSION}) find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) @@ -66,9 +86,13 @@ ########### Targets ########### add_definitions(-DQT_NO_CONTEXTLESS_CONNECT) -ecm_set_disabled_deprecation_versions(QT 6.9.0 KF 6.12.0) +ecm_set_disabled_deprecation_versions(QT 6.10.0 KF 6.16.0) -option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) +option( + USE_UNITY_CMAKE_SUPPORT + "Use UNITY cmake support (speedup compile time)" + OFF +) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if(USE_UNITY_CMAKE_SUPPORT) @@ -77,45 +101,53 @@ ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6GrantleeTheme") - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPim6GrantleeThemeConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KPim6GrantleeThemeConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel -) - -install(EXPORT KPim6GrantleeThemeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim6GrantleeThemeTargets.cmake NAMESPACE KPim6::) - -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/src/grantleetheme_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/GrantleeTheme COMPONENT Devel +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim6GrantleeThemeConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim6GrantleeThemeConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel +) + +install( + EXPORT KPim6GrantleeThemeTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE KPim6GrantleeThemeTargets.cmake + NAMESPACE KPim6:: +) + +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/src/grantleetheme_version.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/GrantleeTheme + COMPONENT Devel ) add_subdirectory(src) if(BUILD_TESTING) find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) - add_subdirectory(autotest) + add_subdirectory(autotest) endif() - if(BUILD_QCH) ecm_install_qch_export( TARGETS KPim6GrantleeTheme_QCH FILE KPim6GrantleeThemeQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel -) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6GrantleeThemeQchTargets.cmake\")") + ) + set(PACKAGE_INCLUDE_QCHTARGETS + "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6GrantleeThemeQchTargets.cmake\")" + ) endif() configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KPimGrantleeThemeConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KPim6GrantleeThemeConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + "${CMAKE_CURRENT_SOURCE_DIR}/KPimGrantleeThemeConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPim6GrantleeThemeConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) -kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) +if(DEFINED kde_configure_git_pre_commit_hook) + kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) +endif() ki18n_install(po) ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/CMakePresets.json new/grantleetheme-25.08.0/CMakePresets.json --- old/grantleetheme-25.04.3/CMakePresets.json 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/CMakePresets.json 2025-07-27 09:10:59.000000000 +0200 @@ -40,7 +40,7 @@ "displayName": "Build with Asan support.", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "ECM_ENABLE_SANITIZERS" : "'address;undefined'" + "ECM_ENABLE_SANITIZERS": "'address;undefined'" }, "inherits": [ "base" @@ -146,7 +146,7 @@ { "name": "ftime-trace", "configurePreset": "ftime-trace" - }, + }, { "name": "dev-mold", "configurePreset": "dev-mold" @@ -175,35 +175,55 @@ "name": "clazy", "configurePreset": "clazy", "environment": { - "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", - "CCACHE_DISABLE" : "ON" + "CLAZY_CHECKS": "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE": "ON" } } ], "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} - } - ] + { + "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-25.04.3/LICENSES/GPL-2.0-or-later.txt new/grantleetheme-25.08.0/LICENSES/GPL-2.0-or-later.txt --- old/grantleetheme-25.04.3/LICENSES/GPL-2.0-or-later.txt 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/LICENSES/GPL-2.0-or-later.txt 2025-07-27 09:10:59.000000000 +0200 @@ -2,7 +2,7 @@ Version 2, June 1991 -Copyright (C) 1989, 1991 Free Software Foundation, Inc. +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/LICENSES/MIT.txt new/grantleetheme-25.08.0/LICENSES/MIT.txt --- old/grantleetheme-25.04.3/LICENSES/MIT.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/grantleetheme-25.08.0/LICENSES/MIT.txt 2025-07-27 09:10:59.000000000 +0200 @@ -0,0 +1,19 @@ +MIT License Copyright (c) <year> <copyright holders> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS +OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/autotest/CMakeLists.txt new/grantleetheme-25.08.0/autotest/CMakeLists.txt --- old/grantleetheme-25.04.3/autotest/CMakeLists.txt 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/autotest/CMakeLists.txt 2025-07-27 09:10:59.000000000 +0200 @@ -1,5 +1,7 @@ add_definitions(-DGRANTLEETHEME_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data") -add_definitions(-DGRANTLEETHEME_DATA_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/data") +add_definitions( + -DGRANTLEETHEME_DATA_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}/data" +) ecm_add_test(grantleethemetest.cpp NAME_PREFIX "grantleetheme-" LINK_LIBRARIES Qt::Test KPim6::GrantleeTheme KF6::ConfigCore Qt::Gui KF6::ColorScheme diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/autotest/data/themes/valid/header.html new/grantleetheme-25.08.0/autotest/data/themes/valid/header.html --- old/grantleetheme-25.04.3/autotest/data/themes/valid/header.html 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/autotest/data/themes/valid/header.html 2025-07-27 09:10:59.000000000 +0200 @@ -7,4 +7,4 @@ <p>{{ subtext }}</p> </div> -{% endblock box %} \ No newline at end of file +{% endblock box %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/cmake/KPIMGrantleeMacros.cmake new/grantleetheme-25.08.0/cmake/KPIMGrantleeMacros.cmake --- old/grantleetheme-25.04.3/cmake/KPIMGrantleeMacros.cmake 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/cmake/KPIMGrantleeMacros.cmake 2025-07-27 09:10:59.000000000 +0200 @@ -1,19 +1,25 @@ - include(CMakeParseArguments) macro(kpim_grantlee_adjust_plugin_name pluginname) - set_target_properties(${pluginname} - PROPERTIES PREFIX "" - LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" - DEBUG_POSTFIX "d" - ) - foreach(cfg ${CMAKE_CONFIGURATION_TYPES}) - string(TOUPPER ${cfg} CFG) - set_target_properties(${pluginname} - PROPERTIES - LIBRARY_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" - RUNTIME_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" - ) - endforeach() + set_target_properties( + ${pluginname} + PROPERTIES + PREFIX "" + LIBRARY_OUTPUT_DIRECTORY + "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + RUNTIME_OUTPUT_DIRECTORY + "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + DEBUG_POSTFIX "d" + ) + foreach(cfg ${CMAKE_CONFIGURATION_TYPES}) + string(TOUPPER ${cfg} CFG) + set_target_properties( + ${pluginname} + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY_${CFG} + "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + RUNTIME_OUTPUT_DIRECTORY_${CFG} + "${CMAKE_BINARY_DIR}/bin/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + ) + endforeach() endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/docs/plugins_icon.md new/grantleetheme-25.08.0/docs/plugins_icon.md --- old/grantleetheme-25.04.3/docs/plugins_icon.md 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/docs/plugins_icon.md 2025-07-27 09:10:59.000000000 +0200 @@ -17,10 +17,11 @@ `sizemedium`, `sizelarge`, `sizehuge` or `sizeenormous`. Those strings map to values in KIconLoader::Group and KIconLoader::StdSizes enumerators. This argument is optional, the default value is `small`. -* *ALT_TEXT* A string to be used as an alt text for the image in the generated HTML code. - The string must be wrapped in localizer function (`_("Some string")`) or can be - a name of a context variable holding the string. This argument is optional. - +* *ALT_TEXT* A string to be used as an alt text for the image + in the generated HTML code. The string must be wrapped in + localizer function (`_("Some string")`) or can be a name of a context + variable holding the string. This argument is optional. + ## Examples Show an icon called "kontact", size medium, no alt text: @@ -35,8 +36,7 @@ {% icon edit-redo medium _("Redo") } -Show an icon as specified in `button.icon` context variable, size small, alt test specified in -`button.label` context variable: +Show an icon as specified in `button.icon` context variable, size small, +alt test specified in `button.label` context variable: {% icon button.icon small button.label } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/po/ar/libgrantleetheme6.po new/grantleetheme-25.08.0/po/ar/libgrantleetheme6.po --- old/grantleetheme-25.04.3/po/ar/libgrantleetheme6.po 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/po/ar/libgrantleetheme6.po 2025-07-27 09:10:59.000000000 +0200 @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" #: grantleetheme.cpp:74 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/po/ca/libgrantleetheme6.po new/grantleetheme-25.08.0/po/ca/libgrantleetheme6.po --- old/grantleetheme-25.04.3/po/ca/libgrantleetheme6.po 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/po/ca/libgrantleetheme6.po 2025-07-27 09:10:59.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-25.04.3/po/eu/libgrantleetheme6.po new/grantleetheme-25.08.0/po/eu/libgrantleetheme6.po --- old/grantleetheme-25.04.3/po/eu/libgrantleetheme6.po 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/po/eu/libgrantleetheme6.po 2025-07-27 09:10:59.000000000 +0200 @@ -1,7 +1,7 @@ # Translation for libgrantleetheme.po to Euskara/Basque (eu). # Copyright (C) 2020-2024, This file is copyright: # This file is distributed under the same license as the grantleetheme package. -# SPDX-FileCopyrightText: 2024 KDE euskaratzeko proiektuko arduraduna <xa...@ni.eus> +# SPDX-FileCopyrightText: 2024, 2025 KDE euskaratzeko proiektuko arduraduna <xa...@ni.eus> # # Translators: # Iñigo Salvador Azurmendi <xa...@ni.eus>, 2020, 2022, 2024. @@ -10,7 +10,7 @@ "Project-Id-Version: grantleetheme\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2024-06-18 00:39+0000\n" -"PO-Revision-Date: 2024-05-18 15:53+0200\n" +"PO-Revision-Date: 2025-07-23 13:58+0200\n" "Last-Translator: Iñigo Salvador Azurmendi <xa...@ni.eus>\n" "Language-Team: Basque <kde-i18n...@kde.org>\n" "Language: eu\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 24.02.2\n" +"X-Generator: Lokalize 25.04.3\n" #: grantleetheme.cpp:74 #, kde-format @@ -48,7 +48,7 @@ #: grantleethememanager.cpp:47 #, kde-format msgid "Download new Templates…" -msgstr "Zama-jaitsi txantiloi berriak..." +msgstr "Zama-jaitsi txantiloi berriak…" #~ msgid "Download New Themes..." #~ msgstr "Zama-jaitsi gai berria..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/readme-build-ftime.txt new/grantleetheme-25.08.0/readme-build-ftime.txt --- old/grantleetheme-25.04.3/readme-build-ftime.txt 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/readme-build-ftime.txt 2025-07-27 09:10:59.000000000 +0200 @@ -23,4 +23,3 @@ see https://aras-p.info/blog/2019/09/28/Clang-Build-Analyzer/ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/src/CMakeLists.txt new/grantleetheme-25.08.0/src/CMakeLists.txt --- old/grantleetheme-25.04.3/src/CMakeLists.txt 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/src/CMakeLists.txt 2025-07-27 09:10:59.000000000 +0200 @@ -3,30 +3,34 @@ add_library(KPim6GrantleeTheme) add_library(KPim6::GrantleeTheme ALIAS KPim6GrantleeTheme) - add_subdirectory(plugin) -target_sources(KPim6GrantleeTheme PRIVATE - genericformatter.cpp - grantleetheme.cpp - grantleethememanager.cpp - grantleethemeengine.cpp - grantleeki18nlocalizer.cpp - qtresourcetemplateloader.cpp - - genericformatter.h - grantleetheme.h - grantleethememanager.h - grantleethemeengine.h - grantleeki18nlocalizer.h - qtresourcetemplateloader.h +target_sources( + KPim6GrantleeTheme + PRIVATE + genericformatter.cpp + grantleetheme.cpp + grantleethememanager.cpp + grantleethemeengine.cpp + grantleeki18nlocalizer.cpp + qtresourcetemplateloader.cpp + genericformatter.h + grantleetheme.h + grantleethememanager.h + grantleethemeengine.h + grantleeki18nlocalizer.h + qtresourcetemplateloader.h +) + +configure_file( + config-grantleetheme.h.in + ${CMAKE_CURRENT_BINARY_DIR}/config-grantleetheme.h ) -configure_file(config-grantleetheme.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-grantleetheme.h) - ecm_qt_declare_logging_category(KPim6GrantleeTheme HEADER grantleetheme_debug.h IDENTIFIER GRANTLEETHEME_LOG CATEGORY_NAME org.kde.pim.grantleetheme OLD_CATEGORY_NAMES log_grantleetheme - DESCRIPTION "kdepim (grantleetheme)" EXPORT LIBGRANTLEETHEME) + DESCRIPTION "kdepim (grantleetheme)" EXPORT LIBGRANTLEETHEME +) if(COMPILE_WITH_UNITY_CMAKE_SUPPORT) set_target_properties(KPim6GrantleeTheme PROPERTIES UNITY_BUILD ON) @@ -38,28 +42,39 @@ USE_VERSION_HEADER ) -target_include_directories(KPim6GrantleeTheme INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/GrantleeTheme/>") -target_include_directories(KPim6GrantleeTheme PUBLIC "$<BUILD_INTERFACE:${GrantleeTheme_SOURCE_DIR}/src;${GrantleeTheme_BINARY_DIR}/src;>") - -target_link_libraries(KPim6GrantleeTheme +target_include_directories( + KPim6GrantleeTheme + INTERFACE + "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/GrantleeTheme/>" +) +target_include_directories( + KPim6GrantleeTheme PUBLIC - KF6::TextTemplate + "$<BUILD_INTERFACE:${GrantleeTheme_SOURCE_DIR}/src;${GrantleeTheme_BINARY_DIR}/src;>" +) + +target_link_libraries( + KPim6GrantleeTheme + PUBLIC KF6::TextTemplate PRIVATE - KF6::NewStuffCore - KF6::I18n - KF6::NewStuffWidgets - KF6::ConfigCore - KF6::XmlGui + KF6::NewStuffCore + KF6::I18n + KF6::NewStuffWidgets + KF6::ConfigCore + KF6::XmlGui ) -set_target_properties(KPim6GrantleeTheme PROPERTIES - VERSION ${GRANTLEETHEME_VERSION} - SOVERSION ${GRANTLEETHEME_SOVERSION} - EXPORT_NAME GrantleeTheme +set_target_properties( + KPim6GrantleeTheme + PROPERTIES + VERSION ${GRANTLEETHEME_VERSION} + SOVERSION ${GRANTLEETHEME_SOVERSION} + EXPORT_NAME GrantleeTheme ) -install(TARGETS - KPim6GrantleeTheme - EXPORT KPim6GrantleeThemeTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} +install( + TARGETS KPim6GrantleeTheme + EXPORT KPim6GrantleeThemeTargets + ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) ecm_generate_headers(GrantleeTheme_CamelCase_HEADERS @@ -74,17 +89,17 @@ PREFIX GrantleeTheme ) - -install(FILES - ${GrantleeTheme_CamelCase_HEADERS} +install( + FILES ${GrantleeTheme_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/GrantleeTheme/GrantleeTheme COMPONENT Devel ) -install(FILES - ${GrantleeTheme_HEADERS} - ${CMAKE_CURRENT_BINARY_DIR}/grantleetheme_export.h - ${GrantleeTheme_CamelCase_HEADERS} +install( + FILES + ${GrantleeTheme_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/grantleetheme_export.h + ${GrantleeTheme_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/GrantleeTheme/grantleetheme COMPONENT Devel ) @@ -109,7 +124,7 @@ TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel -) + ) endif() ecm_qt_install_logging_categories(EXPORT LIBGRANTLEETHEME FILE grantleetheme.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/src/config-grantleetheme.h.in new/grantleetheme-25.08.0/src/config-grantleetheme.h.in --- old/grantleetheme-25.04.3/src/config-grantleetheme.h.in 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/src/config-grantleetheme.h.in 2025-07-27 09:10:59.000000000 +0200 @@ -7,4 +7,3 @@ #pragma once #define GRANTLEE_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBDIR}" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/src/grantleeki18nlocalizer.cpp new/grantleetheme-25.08.0/src/grantleeki18nlocalizer.cpp --- old/grantleetheme-25.04.3/src/grantleeki18nlocalizer.cpp 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/src/grantleeki18nlocalizer.cpp 2025-07-27 09:10:59.000000000 +0200 @@ -15,7 +15,7 @@ using namespace GrantleeTheme; GrantleeKi18nLocalizer::GrantleeKi18nLocalizer() - : KTextTemplate::QtLocalizer() + { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/src/grantleetheme.cpp new/grantleetheme-25.08.0/src/grantleetheme.cpp --- old/grantleetheme-25.04.3/src/grantleetheme.cpp 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/src/grantleetheme.cpp 2025-07-27 09:10:59.000000000 +0200 @@ -24,7 +24,7 @@ KTextTemplate::Engine *GrantleeTheme::ThemePrivate::sEngine = nullptr; ThemePrivate::ThemePrivate() - : QSharedData() + { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/src/plugin/CMakeLists.txt new/grantleetheme-25.08.0/src/plugin/CMakeLists.txt --- old/grantleetheme-25.04.3/src/plugin/CMakeLists.txt 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/src/plugin/CMakeLists.txt 2025-07-27 09:10:59.000000000 +0200 @@ -1,32 +1,34 @@ kde_enable_exceptions() - add_library(kde_grantlee_plugin MODULE) -target_sources(kde_grantlee_plugin PRIVATE - kdegrantleeplugin.cpp - color.cpp - colorscheme.cpp - icon.cpp - palette.cpp - - kdegrantleeplugin.h - color.h - colorscheme.h - icon.h - palette.h +target_sources( + kde_grantlee_plugin + PRIVATE + kdegrantleeplugin.cpp + color.cpp + colorscheme.cpp + icon.cpp + palette.cpp + kdegrantleeplugin.h + color.h + colorscheme.h + icon.h + palette.h ) if(COMPILE_WITH_UNITY_CMAKE_SUPPORT) set_target_properties(kde_grantlee_plugin PROPERTIES UNITY_BUILD ON) endif() kpim_grantlee_adjust_plugin_name(kde_grantlee_plugin) -target_link_libraries(kde_grantlee_plugin +target_link_libraries( + kde_grantlee_plugin KF6::TextTemplate KF6::IconThemes KF6::GuiAddons KF6::ColorScheme ) -install(TARGETS kde_grantlee_plugin - LIBRARY DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/ktexttemplate/ +install( + TARGETS kde_grantlee_plugin + LIBRARY DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/ktexttemplate/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grantleetheme-25.04.3/src/plugin/icon.cpp new/grantleetheme-25.08.0/src/plugin/icon.cpp --- old/grantleetheme-25.04.3/src/plugin/icon.cpp 2025-06-06 06:54:47.000000000 +0200 +++ new/grantleetheme-25.08.0/src/plugin/icon.cpp 2025-07-27 09:10:59.000000000 +0200 @@ -50,7 +50,7 @@ // Try to convert to pixel size sizeOrGroup = sizeStr.toInt(&ok); if (!ok) { - // If failed, then try to map the string to one of tne enums + // If failed, then try to map the string to one of the enums const auto size = sizeOrGroupLookup.constFind(sizeStr); if (size == sizeOrGroupLookup.cend()) { // If it's not a valid size string, assume it's an alt text
