Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-kconfig for openSUSE:Factory checked in at 2024-05-11 18:19:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-kconfig (Old) and /work/SRC/openSUSE:Factory/.kf6-kconfig.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kconfig" Sat May 11 18:19:16 2024 rev:4 rq:1173123 version:6.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-kconfig/kf6-kconfig.changes 2024-04-15 20:14:34.351970518 +0200 +++ /work/SRC/openSUSE:Factory/.kf6-kconfig.new.1880/kf6-kconfig.changes 2024-05-11 18:22:13.520458854 +0200 @@ -1,0 +2,16 @@ +Mon May 6 12:22:24 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.2.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/6.2.0/ +- Changes since 6.1.0: + * avoid allocations while parsing int/float lists + * Adapt kdesktopfiletest to QTemporaryFile behavior change + * Guard header with an ifndef and include moc generates sources in the cpp file + * autotests: Don't use a timeout in testLocalDeletion + * Adjust kconfig_compiler autotests to include a version without kcfgc + * Add a CMake function to add a kcfg file without kcfgc + * gitignore: add VS Code dir + +------------------------------------------------------------------- Old: ---- kconfig-6.1.0.tar.xz kconfig-6.1.0.tar.xz.sig New: ---- kconfig-6.2.0.tar.xz kconfig-6.2.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kconfig.spec ++++++ --- /var/tmp/diff_new_pack.kCr7nn/_old 2024-05-11 18:22:14.028477353 +0200 +++ /var/tmp/diff_new_pack.kCr7nn/_new 2024-05-11 18:22:14.028477353 +0200 @@ -19,13 +19,13 @@ %define qt6_version 6.6.0 %define rname kconfig -# Full KF6 version (e.g. 6.1.0) +# Full KF6 version (e.g. 6.2.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-kconfig -Version: 6.1.0 +Version: 6.2.0 Release: 0 Summary: Advanced configuration system License: LGPL-2.1-or-later AND GPL-2.0-or-later ++++++ frameworks.keyring ++++++ Binary files /var/tmp/diff_new_pack.kCr7nn/_old and /var/tmp/diff_new_pack.kCr7nn/_new differ ++++++ kconfig-6.1.0.tar.xz -> kconfig-6.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/.gitignore new/kconfig-6.2.0/.gitignore --- old/kconfig-6.1.0/.gitignore 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/.gitignore 2024-05-03 14:23:56.000000000 +0200 @@ -17,6 +17,7 @@ avail random_seed /build*/ +/.vscode/ CMakeLists.txt.user* *.unc-backup* .cmake/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/CMakeLists.txt new/kconfig-6.2.0/CMakeLists.txt --- old/kconfig-6.1.0/CMakeLists.txt 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/CMakeLists.txt 2024-05-03 14:23:56.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.1.0") # handled by release scripts +set(KF_VERSION "6.2.0") # handled by release scripts project(KConfig VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 6.1.0 NO_MODULE) +find_package(ECM 6.2.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/KF6ConfigMacros.cmake new/kconfig-6.2.0/KF6ConfigMacros.cmake --- old/kconfig-6.1.0/KF6ConfigMacros.cmake 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/KF6ConfigMacros.cmake 2024-05-03 14:23:56.000000000 +0200 @@ -6,6 +6,44 @@ # relative path to the file. # <target> must not be an alias. # +# kconfig_target_kcfg_file(<target> FILE <kcfg file> CLASS_NAME <classname> ...) +# Add a kcfg file to a target without having a kcfgc file. The kcfgc file will +# be generated from the function arguments. Arguments correspond to the +# similarly names fields from the kcfgc file. +# +# TARGET should be a valid target. FILE is required and should be the name of +# a kcfg file. CLASS_NAME is required and should be the name of the C++ class +# that is generated. All the other arguments are optional. +# +# Option arguments are: +# MUTATORS +# SINGLETON +# CUSTOM_ADDITIONS +# NOTIFIERS +# DEFAULT_VALUE_GETTERS +# ITEM_ACCESSORS +# SET_USER_TEXTS +# GLOBAL_ENUMS +# USE_ENUM_TYPES +# FORCE_STRING_FILENAME +# GENERATE_PROPERTIES +# PARENT_IN_CONSTRUCTOR +# GENERATE_MOC +# Single value arguments are: +# FILE +# CLASS_NAME +# VISIBILITY +# HEADER_EXTENSION +# SOURCE_EXTENSION +# NAMESPACE +# INHERITS +# MEMBER_VARIABLES +# TRANSLATION_SYSTEM +# TRANSLATION_DOMAIN +# Multi value arguments are: +# INCLUDE_FILES +# SOURCE_INCLUDE_FILES +# # SPDX-FileCopyrightText: 2006-2009 Alexander Neundorf <neund...@kde.org> # SPDX-FileCopyrightText: 2006, 2007, Laurent Montel <mon...@kde.org> # SPDX-FileCopyrightText: 2007 Matthias Kretz <kr...@kde.org> @@ -118,3 +156,110 @@ endif() endfunction(KCONFIG_ADD_KCFG_FILES) + +function(_convert_to_camelcase ARG_INPUT ARG_OUTPUT) + string(TOLOWER "${ARG_INPUT}" _input_lc) + string(REPLACE "_" ";" _input_parts "${_input_lc}") + set(_result "") + foreach(_part ${_input_parts}) + string(SUBSTRING "${_part}" 0 1 _first) + string(TOUPPER "${_first}" _first_uc) + string(APPEND _result "${_first_uc}") + string(SUBSTRING "${_part}" 1 -1 _rest) + string(APPEND _result "${_rest}") + endforeach() + set(${ARG_OUTPUT} "${_result}" PARENT_SCOPE) +endfunction() + +function(kconfig_target_kcfg_file ARG_TARGET) + set(_options + MUTATORS + SINGLETON + CUSTOM_ADDITIONS + NOTIFIERS + DEFAULT_VALUE_GETTERS + ITEM_ACCESSORS + SET_USER_TEXTS + GLOBAL_ENUMS + USE_ENUM_TYPES + FORCE_STRING_FILENAME + GENERATE_PROPERTIES + PARENT_IN_CONSTRUCTOR + GENERATE_MOC + ) + set(_single_arguments + FILE + CLASS_NAME + VISIBILITY + HEADER_EXTENSION + SOURCE_EXTENSION + NAME_SPACE + INHERITS + MEMBER_VARIABLES + TRANSLATION_SYSTEM + TRANSLATION_DOMAIN + ) + set(_multi_arguments + INCLUDE_FILES + SOURCE_INCLUDE_FILES + ) + cmake_parse_arguments(PARSE_ARGV 1 ARG "${_options}" "${_single_arguments}" "${_multi_arguments}") + + if (NOT TARGET ${ARG_TARGET}) + message(FATAL_ERROR "${ARG_TARGET} not found") + endif() + + if (NOT EXISTS "${ARG_FILE}" AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_FILE}") + message(FATAL_ERROR "${ARG_FILE} not found") + endif() + + if ("${ARG_CLASS_NAME}" STREQUAL "") + message(FATAL_ERROR "CLASS_NAME is a required argument") + endif() + + set(_filepath "${ARG_FILE}") + get_filename_component(_filename ${ARG_FILE} NAME) + if (IS_ABSOLUTE ${ARG_FILE}) + set(ARG_FILE ${_filename}) + endif() + + set(_content "") + + foreach(_option ${_options}) + if("${_option}" STREQUAL "GENERATE_MOC") + continue() + endif() + + _convert_to_camelcase("${_option}" _entry) + if (ARG_${_option}) + string(APPEND _content "${_entry}=true\n") + endif() + endforeach() + + foreach(_argument ${_single_arguments}) + _convert_to_camelcase("${_argument}" _entry) + if (ARG_${_argument}) + string(APPEND _content "${_entry}=${ARG_${_argument}}\n") + endif() + endforeach() + + foreach(_argument ${_multi_arguments}) + _convert_to_camelcase("${_argument}" _entry) + if (ARG_${_argument}) + list(JOIN ARG_${_argument} ", " _joined) + string(APPEND _content "${_entry}=${_joined}\n") + endif() + endforeach() + + get_filename_component(_basename ${_filepath} NAME_WE) + set(_output "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kcfgc") + file(WRITE ${_output} "${_content}") + + configure_file(${_filepath} "${CMAKE_CURRENT_BINARY_DIR}/${_filename}" COPYONLY) + + if (${ARG_GENERATE_MOC}) + KCONFIG_ADD_KCFG_FILES(${ARG_TARGET} ${_output} GENERATE_MOC) + else() + KCONFIG_ADD_KCFG_FILES(${ARG_TARGET} ${_output}) + endif() +endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/autotests/kconfig_compiler/CMakeLists.txt new/kconfig-6.2.0/autotests/kconfig_compiler/CMakeLists.txt --- old/kconfig-6.1.0/autotests/kconfig_compiler/CMakeLists.txt 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/autotests/kconfig_compiler/CMakeLists.txt 2024-05-03 14:23:56.000000000 +0200 @@ -10,219 +10,80 @@ # make sure the generated headers can be found include_directories(${KCFG_OUTPUT_DIR}) +include(ECMMarkAsTest) include(${CMAKE_SOURCE_DIR}/KF6ConfigMacros.cmake) + macro(GEN_KCFG_TEST_SOURCE _testName _srcs) KCONFIG_ADD_KCFG_FILES(${_srcs} ${_testName}.kcfgc ${ARGN}) endmacro() -include(ECMMarkAsTest) - -########### next target ############### - -set(test1_SRCS test1main.cpp ) - - -gen_kcfg_test_source(test1 test1_SRCS) - -ecm_add_test(TEST_NAME test1 ${test1_SRCS}) -target_link_libraries(test1 KF6::ConfigGui) - - -########### next target ############### - -set(test2_SRCS test2main.cpp ) - - -gen_kcfg_test_source(test2 test2_SRCS) - -ecm_add_test(TEST_NAME test2 ${test2_SRCS}) -target_link_libraries(test2 KF6::ConfigGui) - - -########### next target ############### - -set(test3_SRCS test3main.cpp ) - - -gen_kcfg_test_source(test3 test3_SRCS) - -ecm_add_test(TEST_NAME test3 ${test3_SRCS}) -target_link_libraries(test3 KF6::ConfigGui) - - -########### next target ############### - -set(test3a_SRCS test3amain.cpp ) - - -gen_kcfg_test_source(test3a test3a_SRCS) - -ecm_add_test(TEST_NAME test3a ${test3a_SRCS}) -target_link_libraries(test3a KF6::ConfigGui) - - -########### next target ############### - -set(test4_SRCS test4main.cpp ) - - -gen_kcfg_test_source(test4 test4_SRCS) - -ecm_add_test(TEST_NAME test4 ${test4_SRCS}) -target_link_libraries(test4 KF6::ConfigGui) - - -########### next target ############### - -set(test5_SRCS test5main.cpp ) - - -gen_kcfg_test_source(test5 test5_SRCS) - -ecm_add_test(TEST_NAME test5 ${test5_SRCS}) -target_link_libraries(test5 KF6::ConfigGui) - - -########### next target ############### - -set(test6_SRCS test6main.cpp ) - - -gen_kcfg_test_source(test6 test6_SRCS) - -ecm_add_test(TEST_NAME test6 ${test6_SRCS}) -target_link_libraries(test6 KF6::ConfigGui) - - -########### next target ############### - -set(test7_SRCS test7main.cpp ) - - -gen_kcfg_test_source(test7 test7_SRCS) - -ecm_add_test(TEST_NAME test7 ${test7_SRCS}) -target_link_libraries(test7 KF6::ConfigGui) - - -########### next target ############### - -set(test8_SRCS test8main.cpp ) - - -gen_kcfg_test_source(test8a test8_SRCS) -gen_kcfg_test_source(test8b test8_SRCS) -gen_kcfg_test_source(test8c test8_SRCS) - -ecm_add_test(TEST_NAME test8 ${test8_SRCS}) -target_link_libraries(test8 KF6::ConfigGui) - - -########### next target ############### - -set(test9_SRCS test9main.cpp ) - - -gen_kcfg_test_source(test9 test9_SRCS) - -ecm_add_test(TEST_NAME test9 ${test9_SRCS}) -target_link_libraries(test9 KF6::ConfigGui) - - -########### next target ############### - -set(test10_SRCS test10main.cpp ) - - -gen_kcfg_test_source(test10 test10_SRCS) - -ecm_add_test(TEST_NAME test10 ${test10_SRCS}) -target_link_libraries(test10 KF6::ConfigGui) - - -########### next target ############### - -set(test11_SRCS test11main.cpp ) - - -gen_kcfg_test_source(test11 test11_SRCS) -gen_kcfg_test_source(test11a test11_SRCS) - -ecm_add_test(TEST_NAME test11 ${test11_SRCS}) -target_link_libraries(test11 KF6::ConfigGui) - - -########### next target ############### - -set(test12_SRCS test12main.cpp ) - -gen_kcfg_test_source(test12 test12_SRCS) - -ecm_add_test(TEST_NAME test12 ${test12_SRCS}) -target_link_libraries(test12 KF6::ConfigGui) - -########### next target ############### - -set(test13_SRCS test13main.cpp ) - -gen_kcfg_test_source(test13 test13_SRCS GENERATE_MOC) - -ecm_add_test(TEST_NAME test13 ${test13_SRCS}) -target_link_libraries(test13 KF6::ConfigGui) - -########### next target ############### - -set(test_state_config_SRCS test_state_config_main.cpp) - -gen_kcfg_test_source(test_state_config test_state_config_SRCS GENERATE_MOC) - -ecm_add_test(TEST_NAME test_state_config ${test_state_config_SRCS}) -target_link_libraries(test_state_config KF6::ConfigGui Qt6::Test) - -########### next target ############### - -set(test_emptyentries_SRCS test_emptyentries_main.cpp ) - -gen_kcfg_test_source(test_emptyentries test_emptyentries_SRCS GENERATE_MOC) - -ecm_add_test(TEST_NAME test_emptyentries ${test_emptyentries_SRCS}) -target_link_libraries(test_emptyentries KF6::ConfigGui) - -########### next target ############### - -set(test_subgroups_SRCS test_subgroups_main.cpp ) - -gen_kcfg_test_source(test_subgroups test_subgroups_SRCS GENERATE_MOC) - -ecm_add_test(TEST_NAME test_subgroups ${test_subgroups_SRCS}) -target_link_libraries(test_subgroups KF6::ConfigGui) - - -########### next target ############### - -set(test_dpointer_SRCS test_dpointer_main.cpp ) - -gen_kcfg_test_source(test_dpointer test_dpointer_SRCS) - -ecm_add_test(TEST_NAME test_dpointer ${test_dpointer_SRCS}) -target_link_libraries(test_dpointer KF6::ConfigGui) - - -########### next target ############### - -set(test_signal_SRCS test_signal_main.cpp ) -gen_kcfg_test_source(test_signal test_signal_SRCS GENERATE_MOC) -ecm_add_test(TEST_NAME test_signal ${test_signal_SRCS}) -target_link_libraries(test_signal KF6::ConfigGui) - - -########### next target ############### +function(kconfig_compiler_test ARG_NAME) + cmake_parse_arguments(PARSE_ARGV 1 ARG "GENERATE_MOC" "MAIN;CLASS_NAME;KCFG;KCFGC" "") -set(test_notifiers_SRCS test_notifiers_main.cpp ) -gen_kcfg_test_source(test_notifiers test_notifiers_SRCS) -ecm_add_test(TEST_NAME test_notifiers ${test_notifiers_SRCS}) -target_link_libraries(test_notifiers KF6::ConfigGui) + string(TOLOWER "${ARG_NAME}" _name_lc) + if ("${ARG_MAIN}" STREQUAL "") + set(ARG_MAIN "${_name_lc}main.cpp") + endif() + + if ("${ARG_CLASS_NAME}" STREQUAL "") + set(ARG_CLASS_NAME "${ARG_NAME}") + endif() + + if ("${ARG_KCFG}" STREQUAL "") + set(ARG_KCFG "${_name_lc}.kcfg") + endif() + + if ("${ARG_KCFGC}" STREQUAL "") + set(ARG_KCFGC "${_name_lc}.kcfgc") + endif() + + if (${ARG_GENERATE_MOC}) + set(_moc GENERATE_MOC) + endif() + + ecm_add_test(TEST_NAME ${ARG_NAME} ${ARG_MAIN}) + KCONFIG_ADD_KCFG_FILES(${ARG_NAME} "${ARG_KCFGC}" ${_moc}) + target_link_libraries(${ARG_NAME} Qt6::Test KF6::ConfigGui) + + ecm_add_test(TEST_NAME ${ARG_NAME}_cmake ${ARG_MAIN}) + get_filename_component(_kcfg_we "${ARG_KCFG}" NAME_WE) + configure_file("${ARG_KCFG}" "${_kcfg_we}_cmake.kcfg" COPYONLY) + kconfig_target_kcfg_file(${ARG_NAME}_cmake FILE "${CMAKE_CURRENT_BINARY_DIR}/${_kcfg_we}_cmake.kcfg" CLASS_NAME "${ARG_CLASS_NAME}" ${_moc} ${ARG_UNPARSED_ARGUMENTS}) + target_link_libraries(${ARG_NAME}_cmake Qt6::Test KF6::ConfigGui) +endfunction() + +kconfig_compiler_test(Test1 PARENT_IN_CONSTRUCTOR MUTATORS) +kconfig_compiler_test(Test2 MUTATORS GLOBAL_ENUMS ITEM_ACCESSORS SET_USER_TEXTS INHERITS MyPrefs INCLUDE_FILES myprefs.h MEMBER_VARIABLES public) +kconfig_compiler_test(Test3 MUTATORS GLOBAL_ENUMS ITEM_ACCESSORS NAME_SPACE TestNameSpace) +kconfig_compiler_test(Test3a MUTATORS GLOBAL_ENUMS ITEM_ACCESSORS NAME_SPACE TestNameSpace::InnerNameSpace) +kconfig_compiler_test(Test4 SINGLETON MUTATORS) +kconfig_compiler_test(Test5 PARENT_IN_CONSTRUCTOR SINGLETON MUTATORS GLOBAL_ENUMS) +kconfig_compiler_test(Test6 MUTATORS GLOBAL_ENUMS) +kconfig_compiler_test(Test7 MUTATORS GLOBAL_ENUMS) + +kconfig_compiler_test(Test8 KCFGC test8a.kcfgc KCFG test8a.kcfg CLASS_NAME Test8a PARENT_IN_CONSTRUCTOR MUTATORS) +KCONFIG_ADD_KCFG_FILES(Test8 test8c.kcfgc) +KCONFIG_ADD_KCFG_FILES(Test8 test8b.kcfgc) +kconfig_target_kcfg_file(Test8_cmake FILE test8b.kcfg CLASS_NAME Test8b SINGLETON MUTATORS INCLUDE_FILES test8a.h INHERITS Test8a) +kconfig_target_kcfg_file(Test8_cmake FILE test8c.kcfg CLASS_NAME Test8c SINGLETON PARENT_IN_CONSTRUCTOR MUTATORS) + +kconfig_compiler_test(Test9 MEMBER_VARIABLES public MUTATORS) +kconfig_compiler_test(Test10 SINGLETON) + +kconfig_compiler_test(Test11 PARENT_IN_CONSTRUCTOR MUTATORS INHERITS MyPrefs INCLUDE_FILES myprefs.h MEMBER_VARIABLES public ITEM_ACCESSORS SET_USER_TEXTS USE_ENUM_TYPES DEFAULT_VALUE_GETTERS) +KCONFIG_ADD_KCFG_FILES(Test11 test11a.kcfgc) +kconfig_target_kcfg_file(Test11_cmake FILE test11a.kcfg CLASS_NAME Test11a MUTATORS INHERITS MyPrefs INCLUDE_FILES myprefs.h MEMBER_VARIABLES public ITEM_ACCESSORS SET_USER_TEXTS USE_ENUM_TYPES DEFAULT_VALUE_GETTERS) + +kconfig_compiler_test(Test12 test12main.cpp) +kconfig_compiler_test(Test13 test13main.cpp MUTATORS GENERATE_PROPERTIES GENERATE_MOC) + +kconfig_compiler_test(test_state_config MAIN test_state_config_main.cpp CLASS_NAME MyStateConfig MUTATORS ITEM_ACCESSORS GENERATE_MOC) +kconfig_compiler_test(test_emptyentries MAIN test_emptyentries_main.cpp CLASS_NAME QMakeBuilderSettings SINGLETON GENERATE_MOC) +kconfig_compiler_test(test_subgroups MAIN test_subgroups_main.cpp CLASS_NAME TestSubgroups NOTIFIERS GENERATE_MOC) +kconfig_compiler_test(test_dpointer MAIN test_dpointer_main.cpp CLASS_NAME TestDPointer SINGLETON MUTATORS MEMBER_VARIABLES dpointer ITEM_ACCESSORS SET_USER_TEXTS) +kconfig_compiler_test(test_signal MAIN test_signal_main.cpp CLASS_NAME TestSignal SINGLETON MUTATORS MEMBER_VARIABLES private GENERATE_MOC) +kconfig_compiler_test(test_notifiers MAIN test_notifiers_main.cpp CLASS_NAME TestNotifiers MUTATORS GLOBAL_ENUMS NOTIFIERS) ########### next target ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp new/kconfig-6.2.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp --- old/kconfig-6.1.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/autotests/kconfig_compiler/kconfigcompiler_test.cpp 2024-05-03 14:23:56.000000000 +0200 @@ -77,20 +77,20 @@ "test_subgroups.h", nullptr}; -static CompilerTestSet testCasesToRun = {"test1", - "test2", - "test3", - "test3a", - "test4", - "test5", - "test6", - "test7", - "test8", - "test9", - "test10", - "test11", - "test12", - "test13", +static CompilerTestSet testCasesToRun = {"Test1", + "Test2", + "Test3", + "Test3a", + "Test4", + "Test5", + "Test6", + "Test7", + "Test8", + "Test9", + "Test10", + "Test11", + "Test12", + "Test13", "test_enums_and_properties", "test_dpointer", "test_qdebugcategory", @@ -102,6 +102,24 @@ "test_properties_minmax", "test_param_minmax", "test_subgroups", + "Test1_cmake", + "Test2_cmake", + "Test3_cmake", + "Test3a_cmake", + "Test4_cmake", + "Test5_cmake", + "Test6_cmake", + "Test7_cmake", + "Test8_cmake", + "Test9_cmake", + "Test10_cmake", + "Test11_cmake", + "Test12_cmake", + "Test13_cmake", + "test_dpointer_cmake", + "test_signal_cmake", + "test_emptyentries_cmake", + "test_subgroups_cmake", nullptr}; #if 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/autotests/kconfigtest.cpp new/kconfig-6.2.0/autotests/kconfigtest.cpp --- old/kconfig-6.1.0/autotests/kconfigtest.cpp 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/autotests/kconfigtest.cpp 2024-05-03 14:23:56.000000000 +0200 @@ -1754,8 +1754,8 @@ { KConfig mainConfig(s_kconfig_test_subdir); KConfigGroup mainGroup(&mainConfig, QStringLiteral("OwnTestGroup")); - QTRY_COMPARE_WITH_TIMEOUT(mainGroup.readEntry("GlobalKey", "Default"), QStringLiteral("Default"), 5000); // key is gone - QTRY_COMPARE_WITH_TIMEOUT(mainGroup.keyList(), expectedKeys, 5000); + QCOMPARE(mainGroup.readEntry("GlobalKey", "Default"), QStringLiteral("Default")); // key is gone + QCOMPARE(mainGroup.keyList(), expectedKeys); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/autotests/kdesktopfiletest.cpp new/kconfig-6.2.0/autotests/kdesktopfiletest.cpp --- old/kconfig-6.1.0/autotests/kdesktopfiletest.cpp 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/autotests/kdesktopfiletest.cpp 2024-05-03 14:23:56.000000000 +0200 @@ -12,7 +12,9 @@ #include "kdesktopfile.h" +#include <QLibraryInfo> #include <QTest> +#include <QVersionNumber> #if defined(Q_OS_UNIX) #include <unistd.h> @@ -20,6 +22,14 @@ QTEST_MAIN(KDesktopFileTest) +QString absoluteFileName(const QString &fileName) +{ + if (QLibraryInfo::version() < QVersionNumber(6, 7, 0)) { + return fileName; + } + return QDir::currentPath() + u'/' + fileName; +} + void KDesktopFileTest::initTestCase() { QStandardPaths::setTestModeEnabled(true); @@ -33,7 +43,7 @@ qputenv("TESTVAR", "value"); QTemporaryFile file(QStringLiteral("testReadXXXXXX.desktop")); QVERIFY(file.open()); - const QString fileName = file.fileName(); + const QString fileName = absoluteFileName(file.fileName()); QTextStream ts(&file); ts << "[Desktop Entry]\n" "Type= Application\n" @@ -83,7 +93,7 @@ { QTemporaryFile file(QStringLiteral("testReadLocalizedXXXXXX.desktop")); QVERIFY(file.open()); - const QString fileName = file.fileName(); + const QString fileName = absoluteFileName(file.fileName()); QTextStream ts(&file); ts << "[Desktop Entry]\n" "Type=Application\n" @@ -183,7 +193,7 @@ { QTemporaryFile file(QStringLiteral("testAuthXXXXXX.desktop")); QVERIFY(file.open()); - const QString fileName = file.fileName(); + const QString fileName = absoluteFileName(file.fileName()); QTextStream ts(&file); ts << "[Desktop Entry]\n" "Type=Application\n" @@ -225,7 +235,7 @@ { QTemporaryFile file(QStringLiteral("testAuthActionXXXXXX.desktop")); QVERIFY(file.open()); - const QString fileName = file.fileName(); + const QString fileName = absoluteFileName(file.fileName()); QTextStream ts(&file); ts << "[Desktop Entry]\n" "Type=Application\n" @@ -247,7 +257,7 @@ { QTemporaryFile file(QStringLiteral("testAuthActionXXXXXX.desktop")); QVERIFY(file.open()); - const QString fileName = file.fileName(); + const QString fileName = absoluteFileName(file.fileName()); QTextStream ts(&file); ts << "[Desktop Entry]\n" "Type=Application\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/poqm/sk/kconfig6_qt.po new/kconfig-6.2.0/poqm/sk/kconfig6_qt.po --- old/kconfig-6.1.0/poqm/sk/kconfig6_qt.po 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/poqm/sk/kconfig6_qt.po 2024-05-03 14:23:56.000000000 +0200 @@ -2,20 +2,20 @@ # Michal Sulek <misu...@gmail.com>, 2009. # Roman PaholÃk <wizzar...@gmail.com>, 2014, 2015, 2016, 2022, 2023. # Mthw <jari...@hotmail.com>, 2019. -# Matej Mrenica <matejm98m...@gmail.com>, 2019, 2020. +# SPDX-FileCopyrightText: 2019, 2020, 2024 Matej Mrenica <matejm98m...@gmail.com> msgid "" msgstr "" "Project-Id-Version: kwriteconfig\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-11 02:17+0000\n" -"PO-Revision-Date: 2023-03-11 15:15+0100\n" -"Last-Translator: Roman Paholik <wizzar...@gmail.com>\n" -"Language-Team: Slovak <kde...@linux.sk>\n" +"PO-Revision-Date: 2024-04-14 10:31+0200\n" +"Last-Translator: Matej Mrenica <matejm98m...@gmail.com>\n" +"Language-Team: Slovak <kde-i18n-...@kde.org>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 22.12.3\n" +"X-Generator: Lokalize 24.02.2\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Qt-Contexts: true\n" @@ -450,12 +450,12 @@ msgctxt "" "KStandardShortcut|@action referring to the menu bar or a hamburger menu" msgid "Open Main Menu" -msgstr "" +msgstr "OtvoriÅ¥ hlavnú ponuku" #: gui/kstandardshortcut.cpp:420 msgctxt "KStandardShortcut|@action" msgid "Open Context Menu" -msgstr "" +msgstr "OtvoriÅ¥ kontextovú ponuku" #: kconf_update/kconf_update.cpp:368 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/poqm/zh_CN/kconfig6_qt.po new/kconfig-6.2.0/poqm/zh_CN/kconfig6_qt.po --- old/kconfig-6.1.0/poqm/zh_CN/kconfig6_qt.po 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/poqm/zh_CN/kconfig6_qt.po 2024-05-03 14:23:56.000000000 +0200 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2024-04-03 19:13\n" +"PO-Revision-Date: 2024-04-22 15:58\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/src/core/kconfiggroup.cpp new/kconfig-6.2.0/src/core/kconfiggroup.cpp --- old/kconfig-6.1.0/src/core/kconfiggroup.cpp 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/src/core/kconfiggroup.cpp 2024-05-03 14:23:56.000000000 +0200 @@ -189,28 +189,30 @@ return value; } -static QList<int> asIntList(const QByteArray &string) +static QVarLengthArray<int, 8> asIntList(QByteArrayView string) { - const auto &splitString = string.split(','); - - QList<int> list; - list.reserve(splitString.count()); - for (const QByteArray &s : splitString) { - list << s.toInt(); + int start = 0; + int next = start; + QVarLengthArray<int, 8> ret; + while ((next = string.indexOf(',', start)) != -1) { + ret.push_back(string.sliced(start, next - start).toInt()); + start = next + 1; } - return list; + ret.push_back(string.sliced(start, string.size() - start).toInt()); + return ret; } -static QList<qreal> asRealList(const QByteArray &string) +static QVarLengthArray<qreal, 8> asRealList(QByteArrayView string) { - const auto &splitString = string.split(','); - - QList<qreal> list; - list.reserve(splitString.count()); - for (const QByteArray &s : splitString) { - list << s.toDouble(); + int start = 0; + int next = start; + QVarLengthArray<qreal, 8> ret; + while ((next = string.indexOf(',', start)) != -1) { + ret.push_back(string.sliced(start, next - start).toDouble()); + start = next + 1; } - return list; + ret.push_back(string.sliced(start, string.size() - start).toDouble()); + return ret; } static QString errString(const char *pKey, const QByteArray &value, const QVariant &aDefault) @@ -358,10 +360,8 @@ } case QMetaType::QDate: { auto list = asIntList(value); - if (list.count() == 6) { - list = list.mid(0, 3); // don't break config files that stored QDate as QDateTime - } - if (list.count() != 3) { + // list.count == 6 -> don't break config files that stored QDate as QDateTime + if (list.count() != 3 && list.count() != 6) { qCWarning(KCONFIG_CORE_LOG) << errString(pKey, value, aDefault) << formatError(3, list.count()); return aDefault; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/src/qml/types.cpp new/kconfig-6.2.0/src/qml/types.cpp --- old/kconfig-6.1.0/src/qml/types.cpp 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/src/qml/types.cpp 2024-05-03 14:23:56.000000000 +0200 @@ -1,4 +1,4 @@ // SPDX-FileCopyrightText: 2023 Nicolas Fella <nicolas.fe...@gmx.de> // SPDX-License-Identifier: LGPL-2.0-or-later -#include "types.h" +#include "moc_types.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfig-6.1.0/src/qml/types.h new/kconfig-6.2.0/src/qml/types.h --- old/kconfig-6.1.0/src/qml/types.h 2024-04-05 12:55:22.000000000 +0200 +++ new/kconfig-6.2.0/src/qml/types.h 2024-05-03 14:23:56.000000000 +0200 @@ -1,6 +1,9 @@ // SPDX-FileCopyrightText: 2023 Nicolas Fella <nicolas.fe...@gmx.de> // SPDX-License-Identifier: LGPL-2.0-or-later +#ifndef KCONFIGTYPES_H +#define KCONFIGTYPES_H + #include <QQmlEngine> #include <kauthorized.h> @@ -11,3 +14,5 @@ QML_SINGLETON QML_FOREIGN(KAuthorized) }; + +#endif
