Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-kholidays for openSUSE:Factory checked in at 2026-04-11 22:24:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-kholidays (Old) and /work/SRC/openSUSE:Factory/.kf6-kholidays.new.21863 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kholidays" Sat Apr 11 22:24:01 2026 rev:26 rq:1345889 version:6.25.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-kholidays/kf6-kholidays.changes 2026-03-16 14:18:08.151271451 +0100 +++ /work/SRC/openSUSE:Factory/.kf6-kholidays.new.21863/kf6-kholidays.changes 2026-04-11 22:28:02.988500079 +0200 @@ -1,0 +2,19 @@ +Tue Apr 7 19:19:05 UTC 2026 - Christophe Marin <[email protected]> + +- Update to 6.25.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.25.0 +- Changes since 6.24.0: + * Update dependency version to 6.25.0 + * Update holidays of 2026 for Taiwan. + * CI - add pre-commit support + * Use markdownlint-cli2 to format markdown files + * Use gersemi to format CMake files + * .codespellrc - allow "lightening" + * clang-format fixes + * clean whitespace issues + * Edit portuguese holidays + * Update version to 6.25.0 + +------------------------------------------------------------------- Old: ---- kholidays-6.24.0.tar.xz kholidays-6.24.0.tar.xz.sig New: ---- kholidays-6.25.0.tar.xz kholidays-6.25.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kholidays.spec ++++++ --- /var/tmp/diff_new_pack.psCjSQ/_old 2026-04-11 22:28:03.528522196 +0200 +++ /var/tmp/diff_new_pack.psCjSQ/_new 2026-04-11 22:28:03.532522360 +0200 @@ -19,11 +19,11 @@ %define qt6_version 6.8.0 %define rname kholidays -# Full KF6 version (e.g. 6.24.0) +# Full KF6 version (e.g. 6.25.0) %{!?_kf6_version: %global _kf6_version %{version}} %bcond_without released Name: kf6-kholidays -Version: 6.24.0 +Version: 6.25.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later ++++++ kholidays-6.24.0.tar.xz -> kholidays-6.25.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/.clang-format-pre-commit new/kholidays-6.25.0/.clang-format-pre-commit --- old/kholidays-6.24.0/.clang-format-pre-commit 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-6.25.0/.clang-format-pre-commit 2026-04-03 19:09:04.000000000 +0200 @@ -0,0 +1,95 @@ +--- +# SPDX-FileCopyrightText: 2019 Christoph Cullmann <[email protected]> +# SPDX-FileCopyrightText: 2019 Gernot Gebhard <[email protected]> +# +# 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/kholidays-6.24.0/.codespellrc new/kholidays-6.25.0/.codespellrc --- old/kholidays-6.24.0/.codespellrc 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/.codespellrc 2026-04-03 19:09:04.000000000 +0200 @@ -2,7 +2,7 @@ skip = ./build*,.git,*.notifyrc,*.desktop,*.json,*.xml,./poqm,./holidays/plan2 interactive = 0 #ignore camelCase, regardless. also mixed case words with correct spelling -ignore-regex = \b([a-z]+[A-Z0-9][a-z0-9]*|LEAPYEAR|leapyear|Claus|claus)\b -#uri-ignore-words = +ignore-regex = \b([a-z]+[A-Z0-9][a-z0-9]*|LEAPYEAR|leapyear|Claus|claus|lightening)\b +#uri-ignore-words = #ampersand and semicolon also breaks words regex = [\w\-'’&(amp\;)]+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/.gersemirc new/kholidays-6.25.0/.gersemirc --- old/kholidays-6.24.0/.gersemirc 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-6.25.0/.gersemirc 2026-04-03 19:09:04.000000000 +0200 @@ -0,0 +1,4 @@ +indent: 4 +line_length: 120 +list_expansion: favour-expansion +warn_about_unknown_commands: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/.gitlab-ci.yml new/kholidays-6.25.0/.gitlab-ci.yml --- old/kholidays-6.24.0/.gitlab-ci.yml 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/.gitlab-ci.yml 2026-04-03 19:09:04.000000000 +0200 @@ -11,5 +11,4 @@ - /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/windows-qt6.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/kholidays-6.24.0/.markdownlint.json new/kholidays-6.25.0/.markdownlint.json --- old/kholidays-6.24.0/.markdownlint.json 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-6.25.0/.markdownlint.json 2026-04-03 19:09:04.000000000 +0200 @@ -0,0 +1,16 @@ +{ + "default": true, + "MD007": { + "indent": 2, + "start_indented": false + }, + "MD013": { + "line_length": 120, + "tables": false, + "code_blocks": false + }, + "MD029": { + "style": "ordered" + }, + "MD033": false +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/.pre-commit-config.yaml new/kholidays-6.25.0/.pre-commit-config.yaml --- old/kholidays-6.24.0/.pre-commit-config.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-6.25.0/.pre-commit-config.yaml 2026-04-03 19:09:04.000000000 +0200 @@ -0,0 +1,42 @@ +# 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/|^poqm/|^holidays/plan2/|.desktop|Messages.sh) +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v6.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: v22.1.1 + 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/codespell-project/codespell + rev: v2.4.2 + hooks: + - id: codespell + - repo: https://github.com/BlankSpruce/gersemi + rev: 0.26.1 + hooks: + - id: gersemi + - repo: https://github.com/DavidAnson/markdownlint-cli2 + rev: v0.22.0 + hooks: + - id: markdownlint-cli2 + files: \.(md|mdown|markdown)$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/CMakeLists.txt new/kholidays-6.25.0/CMakeLists.txt --- old/kholidays-6.24.0/CMakeLists.txt 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/CMakeLists.txt 2026-04-03 19:09:04.000000000 +0200 @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.27) +cmake_minimum_required(VERSION 3.29) -set(KF_VERSION "6.24.0") +set(KF_VERSION "6.25.0") project(KHolidays VERSION ${KF_VERSION}) -find_package(ECM 6.24.0 REQUIRED NO_MODULE) +find_package(ECM 6.25.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_AUTORCC ON) @@ -26,23 +26,38 @@ include(ECMGenerateQDoc) find_package(FLEX REQUIRED) -set_package_properties(FLEX PROPERTIES - URL "http://flex.sourceforge.net"; - DESCRIPTION "Fast Lexical Analyzer" - TYPE REQUIRED - PURPOSE "Required to generate the plan2 parser" +set_package_properties( + FLEX + PROPERTIES + URL + "http://flex.sourceforge.net"; + DESCRIPTION + "Fast Lexical Analyzer" + TYPE + REQUIRED + PURPOSE + "Required to generate the plan2 parser" ) find_package(BISON 3.3.2 REQUIRED) -set_package_properties(BISON PROPERTIES - URL "http://www.gnu.org/software/bison"; - DESCRIPTION "general-purpose parser generator" - TYPE REQUIRED - PURPOSE - "Required to generate the plan2 parser" +set_package_properties( + BISON + PROPERTIES + URL + "http://www.gnu.org/software/bison"; + DESCRIPTION + "general-purpose parser generator" + TYPE + REQUIRED + PURPOSE + "Required to generate the plan2 parser" ) set(KHOLIDAYS_LIB_VERSION ${KF_VERSION}) -set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT + 0 + CACHE STRING + "Control the range of deprecated API excluded from the build [default=0]." +) set(kholidays_version_header "${CMAKE_CURRENT_BINARY_DIR}/src/kholidays_version.h") ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS @@ -52,10 +67,20 @@ ) ########### Find packages ########### -set(REQUIRED_QT_VERSION 6.8.0) -find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Qml) +set(REQUIRED_QT_VERSION 6.9.0) +find_package( + Qt6 + ${REQUIRED_QT_VERSION} + CONFIG + REQUIRED + Core + Qml +) -remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_TO_ASCII +) ecm_set_disabled_deprecation_versions( QT 6.11 ) @@ -64,7 +89,7 @@ add_subdirectory(src) if(BUILD_TESTING) - add_subdirectory(autotests) + add_subdirectory(autotests) endif() ecm_install_po_files_as_qm(poqm) @@ -73,25 +98,28 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6Holidays") configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF6HolidaysConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF6HolidaysConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + "${CMAKE_CURRENT_SOURCE_DIR}/KF6HolidaysConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF6HolidaysConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF6HolidaysConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF6HolidaysConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF6HolidaysConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KF6HolidaysConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel ) -install(EXPORT KF6HolidaysTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF6HolidaysTargets.cmake NAMESPACE KF6::) - -install(FILES - ${kholidays_version_header} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KHolidays COMPONENT Devel +install( + EXPORT KF6HolidaysTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE KF6HolidaysTargets.cmake + NAMESPACE KF6:: ) +install(FILES ${kholidays_version_header} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KHolidays COMPONENT Devel) + include(ECMFeatureSummary) ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/DESIGN new/kholidays-6.25.0/DESIGN --- old/kholidays-6.24.0/DESIGN 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/DESIGN 2026-04-03 19:09:04.000000000 +0200 @@ -21,7 +21,7 @@ We hope that the new kholidays library will: A. allow KOrganizer to replace the holidays plugin with a KOCore - implementation that links to the kholidays library. + implementation that links to the kholidays library. B. allow KOrganizer to support the holidays of many religions (through plugins if desired) @@ -35,7 +35,7 @@ III. Definitions Holiday: any day that may have special significance to a fairly large - number of people. A "holy day" can be a holiday, a "day-off" for + number of people. A "holy day" can be a holiday, a "day-off" for all public employees can be a holiday. Also, the remembrance of an historical event can be a holiday. @@ -53,7 +53,7 @@ Religious Holiday: a special day in a religion and not bounded to any political region. Religions can have holidays that range in - devotion to those were work/school are forbidden, days of + devotion to those were work/school are forbidden, days of prayer obligation, to historical remembrances, etc. Governments often have public holidays for some religious holidays. @@ -74,7 +74,7 @@ a first name and persons with that name celebrate that day as their "Name Day". We will require Name Days to be bounded to a political region. - + Noteworthy Event: a day of interest. eg. Daylight Savings Time Start/Stop, Election Day, ... @@ -131,7 +131,7 @@ particularly applies to religious holidays in calendar systems where the number of months and days in months can vary more than in Gregorian. ] - * Be able to specify holidays with compound dates; i.e, be able to + * Be able to specify holidays with compound dates; i.e, be able to combine specifications. For example: "First Monday after May 1" * Support lunar phases for the new moon, first quarter moon, @@ -178,7 +178,7 @@ the governments have religious, public holidays. A religious holiday that is also a public, work/school day-off should be specified in government (political) holiday files. - + * Be able to activate more than one region/locale at a time and more than one religion at a time. @@ -239,7 +239,7 @@ * B. A KGetNewStuff mechanism will be implemented so that holiday files - can be donated to the project and installed by using this common + can be donated to the project and installed by using this common PIM mechanism. @@ -312,10 +312,10 @@ Other special dates of interest: + start/end daylight savings time + election day - + + + See Reinhold's XML DTD (holiday.dtd) -[Reinhold: I didn't check the DTD at all, so it might be completely wrong +[Reinhold: I didn't check the DTD at all, so it might be completely wrong or breaks with all XML specs or whatever. Basically, currently it's meant only to develop a nice structure of the files, not for real use in code yet.] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/KF6HolidaysConfig.cmake.in new/kholidays-6.25.0/KF6HolidaysConfig.cmake.in --- old/kholidays-6.24.0/KF6HolidaysConfig.cmake.in 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/KF6HolidaysConfig.cmake.in 2026-04-03 19:09:04.000000000 +0200 @@ -1,6 +1,9 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt6Core @REQUIRED_QT_VERSION@) +find_dependency( + Qt6Core + @REQUIRED_QT_VERSION@ +) include("${CMAKE_CURRENT_LIST_DIR}/KF6HolidaysTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/README.md new/kholidays-6.25.0/README.md --- old/kholidays-6.24.0/README.md 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/README.md 2026-04-03 19:09:04.000000000 +0200 @@ -1,4 +1,4 @@ -# KHolidays # +# KHolidays Dates for holidays and other special events @@ -11,11 +11,11 @@ * Put the new file in place under holidays/plan2. * Edit the holidays/holidays.qrc file accordingly. -``` + +```shell % cd <builddir> % cmake --install . && QT_LOGGING_RULES="*.debug=true" ./bin/testholidayregion -maxwarnings 0 >& foo.txt ``` + * Look for lines containing "syntax error" in foo.txt. * Fix any such syntax errors and then you can commit. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/autotests/CMakeLists.txt new/kholidays-6.25.0/autotests/CMakeLists.txt --- old/kholidays-6.24.0/autotests/CMakeLists.txt 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/autotests/CMakeLists.txt 2026-04-03 19:09:04.000000000 +0200 @@ -4,44 +4,93 @@ ########### next target ############### -add_executable(testlunar testlunar.cpp testlunar.h) +add_executable( + testlunar + testlunar.cpp + testlunar.h +) add_test(NAME testlunar COMMAND testlunar) ecm_mark_as_test(testlunar) -target_link_libraries(testlunar KF6Holidays Qt6::Test) +target_link_libraries( + testlunar + KF6Holidays + Qt6::Test +) ########### next target ############### -add_executable(testseasons testseasons.cpp testseasons.h) +add_executable( + testseasons + testseasons.cpp + testseasons.h +) add_test(NAME testseasons COMMAND testseasons) ecm_mark_as_test(testseasons) -target_link_libraries(testseasons KF6Holidays Qt6::Test) +target_link_libraries( + testseasons + KF6Holidays + Qt6::Test +) ########### next target ############### -add_executable(testsunriseset testsunriseset.cpp testsunriseset.h) +add_executable( + testsunriseset + testsunriseset.cpp + testsunriseset.h +) add_test(NAME testsunriseset COMMAND testsunriseset) ecm_mark_as_test(testsunriseset) -target_link_libraries(testsunriseset KF6Holidays Qt6::Test) +target_link_libraries( + testsunriseset + KF6Holidays + Qt6::Test +) ########### next target ############### add_executable(testzodiac testzodiac.cpp) add_test(NAME testzodiac COMMAND testzodiac) ecm_mark_as_test(testzodiac) -target_link_libraries(testzodiac KF6Holidays Qt6::Test) +target_link_libraries( + testzodiac + KF6Holidays + Qt6::Test +) ########### next target ############### -add_executable(testholidayregion testholidayregion.cpp testholidayregion.h) +add_executable( + testholidayregion + testholidayregion.cpp + testholidayregion.h +) add_test(NAME testholidayregion COMMAND testholidayregion) -set_target_properties(testholidayregion PROPERTIES COMPILE_FLAGS -DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"") +set_target_properties( + testholidayregion + PROPERTIES + COMPILE_FLAGS + -DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"" +) ecm_mark_as_test(testholidayregion) -target_link_libraries(testholidayregion KF6Holidays Qt6::Test) +target_link_libraries( + testholidayregion + KF6Holidays + Qt6::Test +) ########### next target ############### -add_executable(testsunevents testsunevents.cpp testsunevents.h) +add_executable( + testsunevents + testsunevents.cpp + testsunevents.h +) add_test(NAME testsunevents COMMAND testsunevents) ecm_mark_as_test(testsunevents) -target_link_libraries(testsunevents KF6Holidays Qt6::Test) +target_link_libraries( + testsunevents + KF6Holidays + Qt6::Test +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/autotests/holiday_calendar_systems new/kholidays-6.25.0/autotests/holiday_calendar_systems --- old/kholidays-6.24.0/autotests/holiday_calendar_systems 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/autotests/holiday_calendar_systems 2026-04-03 19:09:04.000000000 +0200 @@ -18,5 +18,3 @@ "New Years Day00" public religious seasonal cultural civil on 1/1 "New Years Day01 seasonal" seasonal public on 1/1 "Bangla New Year" public cultural indiannational vaishakh 1 - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/autotests/holiday_gb-eaw_en-gb_Test new/kholidays-6.25.0/autotests/holiday_gb-eaw_en-gb_Test --- old/kholidays-6.24.0/autotests/holiday_gb-eaw_en-gb_Test 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/autotests/holiday_gb-eaw_en-gb_Test 2026-04-03 19:09:04.000000000 +0200 @@ -49,4 +49,3 @@ "Fête des mères" civil ( ( [last sunday in may] == ([easter] + 49 days) ) ? [first sunday in june] : [last sunday in may] ) "Vendredi saint" religious on friday before ([easter]) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/autotests/holiday_solstice_in_holidays new/kholidays-6.25.0/autotests/holiday_solstice_in_holidays --- old/kholidays-6.24.0/autotests/holiday_solstice_in_holidays 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/autotests/holiday_solstice_in_holidays 2026-04-03 19:09:04.000000000 +0200 @@ -16,5 +16,3 @@ : Holiday List Section "New Years" public on 1/1 - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_au-sa_en-gb new/kholidays-6.25.0/holidays/plan2/holiday_au-sa_en-gb --- old/kholidays-6.24.0/holidays/plan2/holiday_au-sa_en-gb 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_au-sa_en-gb 2026-04-03 19:09:04.000000000 +0200 @@ -52,4 +52,3 @@ :: Seasons :: Name Days - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_bg_bg new/kholidays-6.25.0/holidays/plan2/holiday_bg_bg --- old/kholidays-6.24.0/holidays/plan2/holiday_bg_bg 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_bg_bg 2026-04-03 19:09:04.000000000 +0200 @@ -75,7 +75,7 @@ "Евлоги, Зоя (Св. Евлогий, архиепископ Александрийски)" nameday on february 13 "Трифонов ден (стар стил), Св. Валентин" nameday on february 14 "Евстати, Евстатия" nameday on february 21 -"баба Марта (Евдокия, Марта, Мартин)" nameday on march 1 +"баба Марта (Евдокия, Марта, Мартин)" nameday on march 1 "Гера, Герасим, Герчо" nameday on march 4 "Красимир, Красимира" nameday on march 6 "Младен, Горян" nameday on march 9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_cm_en new/kholidays-6.25.0/holidays/plan2/holiday_cm_en --- old/kholidays-6.24.0/holidays/plan2/holiday_cm_en 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_cm_en 2026-04-03 19:09:04.000000000 +0200 @@ -8,12 +8,12 @@ :: Updated: 2016-03-26 :: :: Source: http://www.minfopra.gov.cm/textes/REPARATIONS/LOI%20N%C2%B0%2073-5%20DU%207%20DEC%201973.pdf -:: http://www.mintour.gov.cm/infos-pratiques/fetes-legales-et-feries/ +:: http://www.mintour.gov.cm/infos-pratiques/fetes-legales-et-feries/ :: https://yaounde.usembassy.gov/holidays.html :: http://www.ambafrance-cm.org/Histoire-du-Cameroon :: https://www.francophonie.org/Statut-et-date-d-adhesion-des.html -:: -:: Missing: Missing muslim religious holidays due to their indeterminate date +:: +:: Missing: Missing muslim religious holidays due to their indeterminate date :: :: Metadata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_cm_fr new/kholidays-6.25.0/holidays/plan2/holiday_cm_fr --- old/kholidays-6.24.0/holidays/plan2/holiday_cm_fr 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_cm_fr 2026-04-03 19:09:04.000000000 +0200 @@ -8,12 +8,12 @@ :: Updated: 2016-03-26 :: :: Source: http://www.minfopra.gov.cm/textes/REPARATIONS/LOI%20N%C2%B0%2073-5%20DU%207%20DEC%201973.pdf -:: http://www.mintour.gov.cm/infos-pratiques/fetes-legales-et-feries/ +:: http://www.mintour.gov.cm/infos-pratiques/fetes-legales-et-feries/ :: https://french.yaounde.usembassy.gov/holidays-fr.html :: http://www.ambafrance-cm.org/Histoire-du-Cameroun :: https://www.francophonie.org/Statut-et-date-d-adhesion-des.html -:: -:: Missing: Missing muslim religious holidays due to their indeterminate date +:: +:: Missing: Missing muslim religious holidays due to their indeterminate date :: :: Metadata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_hk_en-gb new/kholidays-6.25.0/holidays/plan2/holiday_hk_en-gb --- old/kholidays-6.24.0/holidays/plan2/holiday_hk_en-gb 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_hk_en-gb 2026-04-03 19:09:04.000000000 +0200 @@ -40,13 +40,13 @@ "Supplementary holiday for Labour Day" public on ( (year >= 1999 && [may 1] == [sunday after ([may 1])]) ? [monday after ([may 1])] : noop ) - + : Hong Kong SAR Establishment Day (or if that day is a Sunday, then the following day) "Hong Kong SAR Establishment Day" public on july 1 "Supplementary holiday for Hong Kong SAR Establishment Day" public on ( ( [july 1] == [sunday after ([july 1])]) ? [monday after ([july 1])] : noop ) - + : National Day (or if that day is a Sunday, then the following day) "National Day" public on october 1 "Supplementary holiday for National Day" public on ( ( [october 1] == [sunday after ([october 1])]) ? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_hk_zh-cn new/kholidays-6.25.0/holidays/plan2/holiday_hk_zh-cn --- old/kholidays-6.24.0/holidays/plan2/holiday_hk_zh-cn 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_hk_zh-cn 2026-04-03 19:09:04.000000000 +0200 @@ -40,13 +40,13 @@ "勞動節補假" public on ( (year >= 1999 && [may 1] == [sunday after ([may 1])]) ? [monday after ([may 1])] : noop ) - + : 香港特別行政區成立紀念日（如該日為星期日，則為翌日） "香港特別行政區成立紀念日" public on july 1 "香港特別行政區成立紀念日補假" public on ( ( [july 1] == [sunday after ([july 1])]) ? [monday after ([july 1])] : noop ) - + : 國慶日（如該日為星期日，則為翌日） "國慶日" public on october 1 "國慶日補假" public on ( ( [october 1] == [sunday after ([october 1])]) ? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_id_en-us new/kholidays-6.25.0/holidays/plan2/holiday_id_en-us --- old/kholidays-6.24.0/holidays/plan2/holiday_id_en-us 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_id_en-us 2026-04-03 19:09:04.000000000 +0200 @@ -1,4 +1,4 @@ - + :: :: Country: Indonesia :: @@ -165,7 +165,7 @@ "National Sports Day" civil on september 9 : Hari Kesaktian Pancasila "Pancasila Sanctity Day" civil on october 1 -: Hari Batik +: Hari Batik "Batik Day" civil on october 2 : Hari Tentara Nasional Indonesia "Indonesian National Armed Forces Day" civil on october 5 @@ -199,6 +199,3 @@ "Joint leave for Christmas" public on december 24 2012 : Cuti bersama Tahun Baru 2013 "Joint leave for 2013 New Year's Day" public on december 31 2012 - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_id_id new/kholidays-6.25.0/holidays/plan2/holiday_id_id --- old/kholidays-6.24.0/holidays/plan2/holiday_id_id 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_id_id 2026-04-03 19:09:04.000000000 +0200 @@ -1,4 +1,4 @@ - + :: :: Country: Indonesia :: @@ -143,7 +143,7 @@ "Hari Kartini" civil on april 21 : Earth day "Hari Bumi" civil on april 22 -: Labor day +: Labor day "Hari Buruh" civil on may 1 : National Education Day "Hari Pendidikan Nasional" civil on may 2 @@ -167,15 +167,15 @@ "Hari Olahraga Nasional" civil on september 9 : Pancasila Sanctity Day "Hari Kesaktian Pancasila" civil on october 1 -: Batik Day +: Batik Day "Hari Batik" civil on october 2 : Indonesian National Armed Forces Day "Hari Tentara Nasional Indonesia" civil on october 5 -: Youth Pledge Day +: Youth Pledge Day "Hari Sumpah Pemuda" civil on october 28 -: Civil Servant Corps Day +: Civil Servant Corps Day "Hari Korps Pegawai Republik Indonesia" civil on october 29 -: Heroes' Day +: Heroes' Day "Hari Pahlawan" civil on november 10 : Teacher's Day "Hari Guru" civil on november 25 @@ -183,7 +183,7 @@ "Hari AIDS Sedunia" civil on december 1 : National Social Solidarity Day "Hari Kesetiakawanan Sosial Nasional" civil on december 20 -: Mother's Day +: Mother's Day "Hari Ibu" civil on december 22 @@ -200,4 +200,3 @@ "Cuti Bersama Tahun Baru Hijriyah" public on december 24 2012 : Joint leave for 2013 New Year's Day "Cuti bersama Tahun Baru 2013" public on december 31 2012 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_in_en-gb new/kholidays-6.25.0/holidays/plan2/holiday_in_en-gb --- old/kholidays-6.24.0/holidays/plan2/holiday_in_en-gb 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_in_en-gb 2026-04-03 19:09:04.000000000 +0200 @@ -14,7 +14,7 @@ :: The future dates have been taken from multiple sources, which may vary from :: the official dates, when announced, and changes may have to be made for the same. :: The reader is requested to contribute to expand the list and accuracy, -:: request to the kde developers to add support for hindu calendar. If possible attempt can +:: request to the kde developers to add support for hindu calendar. If possible attempt can :: be made to define dates as per hebrew calendar :: submitted via bug report on https://bugs.kde.org/show_bug.cgi?id=392503 @@ -35,7 +35,7 @@ "Christmas" public religious on december 25 -"Maha Shivratri" public religious on february 13 2018 +"Maha Shivratri" public religious on february 13 2018 "Maha Shivratri" public religious on march 4 2019 "Maha Shivratri" public religious on february 21 2020 "Maha Shivratri" public religious on march 11 2021 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_lk_si new/kholidays-6.25.0/holidays/plan2/holiday_lk_si --- old/kholidays-6.24.0/holidays/plan2/holiday_lk_si 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_lk_si 2026-04-03 19:09:04.000000000 +0200 @@ -58,4 +58,4 @@ "දීපවාලී උත්සව දිනය" public religious on october 29 2027 "දීපවාලී උත්සව දිනය" public religious on october 17 2028 "දීපවාලී උත්සව දිනය" public religious on november 5 2029 -"දීපවාලී උත්සව දිනය" public religious on october 26 2030 \ No newline at end of file +"දීපවාලී උත්සව දිනය" public religious on october 26 2030 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_lt_lt new/kholidays-6.25.0/holidays/plan2/holiday_lt_lt --- old/kholidays-6.24.0/holidays/plan2/holiday_lt_lt 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_lt_lt 2026-04-03 19:09:04.000000000 +0200 @@ -54,6 +54,3 @@ :: Seasons :: Name Days - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_lu_lb new/kholidays-6.25.0/holidays/plan2/holiday_lu_lb --- old/kholidays-6.24.0/holidays/plan2/holiday_lu_lb 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_lu_lb 2026-04-03 19:09:04.000000000 +0200 @@ -43,5 +43,3 @@ :: Seasons :: Name Days - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_mx_es new/kholidays-6.25.0/holidays/plan2/holiday_mx_es --- old/kholidays-6.24.0/holidays/plan2/holiday_mx_es 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_mx_es 2026-04-03 19:09:04.000000000 +0200 @@ -77,4 +77,3 @@ "Fin del horario de verano" seasonal on last sunday in october "Inicio del horario de verano en la franja fronteriza" seasonal on second sunday in march "Fin del horario de verano en la franja fronteriza" seasonal on first sunday in november - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_na_en-gb new/kholidays-6.25.0/holidays/plan2/holiday_na_en-gb --- old/kholidays-6.24.0/holidays/plan2/holiday_na_en-gb 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_na_en-gb 2026-04-03 19:09:04.000000000 +0200 @@ -43,5 +43,3 @@ :: Seasons :: Name Days - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_pk_en new/kholidays-6.25.0/holidays/plan2/holiday_pk_en --- old/kholidays-6.24.0/holidays/plan2/holiday_pk_en 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_pk_en 2026-04-03 19:09:04.000000000 +0200 @@ -25,7 +25,7 @@ "Quaid-e-Azam Day" public on december 25 -:: Religious +:: Religious "Ashura" religious on hijri muharram 10 "Eid Milad un Nabi" public religious on hijri rabialawal 12 "Eid ul Fitr" public religious on hijri shawwal 1 length 3 days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_pr_en-us new/kholidays-6.25.0/holidays/plan2/holiday_pr_en-us --- old/kholidays-6.24.0/holidays/plan2/holiday_pr_en-us 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_pr_en-us 2026-04-03 19:09:04.000000000 +0200 @@ -4,7 +4,7 @@ :: Language: US English :: :: Author: Tatiana de la Cruz Monserrate <[email protected]> -:: +:: :: :: Updated: October 5, 2025 :: @@ -65,5 +65,3 @@ "Grito de Lares" school on september 23 :: Daylight Saving - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_pr_es new/kholidays-6.25.0/holidays/plan2/holiday_pr_es --- old/kholidays-6.24.0/holidays/plan2/holiday_pr_es 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_pr_es 2026-04-03 19:09:04.000000000 +0200 @@ -9,7 +9,7 @@ :: :: Source: https://camarapr.org/wp-content/uploads/Dias-Feriados-2025.pdf :: https://en.wikipedia.org/wiki/Public_holidays_in_Puerto_Rico -:: +:: :: Metadata country "PR" @@ -57,7 +57,7 @@ "Jueves Santo" religious on easter minus 3 days "Viernes Santo" public religious on easter minus 2 days "Sábado de Gloria" religious on easter minus 1 days -"Domingo de Pascua" religious on easter +"Domingo de Pascua" religious on easter "Noche buena" religious cultural on december 24 "Navidad" public religious on december 25 @@ -65,4 +65,3 @@ "Grito de Lares" school on september 23 :: Daylight Saving - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_pt_pt new/kholidays-6.25.0/holidays/plan2/holiday_pt_pt --- old/kholidays-6.24.0/holidays/plan2/holiday_pt_pt 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_pt_pt 2026-04-03 19:09:04.000000000 +0200 @@ -7,7 +7,7 @@ :: :: Updated: :: -:: Source: http://www.infocid.pt/infocid/0_116.htm +:: Source: https://pt.wikipedia.org/wiki/Feriados_em_Portugal :: :: Metadata @@ -17,22 +17,22 @@ :description "(please add description in source language) National holiday file for Portugal" :: Public Holidays -"Ano Novo" public on january 1 -"6ª feira santa" public religious on easter minus 2 days -"25 de Abril" public on april 25 -"1º de Maio" public on may 1 -"10 de Junho" public on june 10 -"Assunção" public on august 15 -"Nª Senhora Conceição" public religious on december 8 -"Natal" public religious on december 25 +"Ano Novo" public on january 1 +"Carnaval" public religious on easter minus 47 days +"6ª feira santa" public religious on easter minus 2 days +"Páscoa" public religious on easter +"25 de Abril" public on april 25 +"1º de Maio" public on may 1 +"Corpo de Deus" public religious on easter plus 60 days +"Dia de Portugal" public on june 10 +"Assunção de Nossa Senhora" public on august 15 +"Implantação da república" public on october 5 +"Todos os Santos" public religious on november 1 +"Restauração da Indepedência" public on december 1 +"Nª Senhora Conceição" public religious on december 8 +"Natal" public religious on december 25 :: Religious -"Carnaval" religious on easter minus 50 days length 4 days -"4ª feira de cinzas" religious on easter minus 46 days -"Páscoa" religious on easter -"Ascension" religious on easter plus 39 days -"Trinity" religious on easter plus 56 days -"Pentecostes" religious on easter plus 49 days :: Financial @@ -42,13 +42,6 @@ :: Daylight Saving -:: Removed holidays -:: "Corpo de Deus" public on easter plus 60 days -:: "República" public on october 5 -:: "Todos os Santos" public on november 1 -:: "Restauração" public on december 1 - - :: Name Days @@ -176,7 +169,7 @@ :: "Horta" on june 24 :: "Idanha-a-Nova" on easter plus 15 days :: "Ílhavo" on easter plus 1 day -:: : "Lajes das Flores" on segunda-feira após o 3. fim de semana de Julho ?? +:: "Lajes das Flores" on segunda-feira após o 3. fim de semana de Julho ?? :: "Lajes das Flores" on third sunday in july plus 1 day :: "Lajes do Pico" on june 29 :: "Lagoa (Açores)" on april 11 @@ -260,7 +253,7 @@ :: "Peso da Régua" on august 16 :: "Pinhel" on august 25 :: "Pombal" on november 11 -:: : "Ponta Delgada" on segunda-feira do Senhor Santo Cristo em Maio ??? +:: "Ponta Delgada" on segunda-feira do Senhor Santo Cristo em Maio ??? :: "Ponta do Sol" on september 8 :: "Ponte da Barca" on august 24 :: "Ponte de Lima" on september 20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_sg_en-gb new/kholidays-6.25.0/holidays/plan2/holiday_sg_en-gb --- old/kholidays-6.24.0/holidays/plan2/holiday_sg_en-gb 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_sg_en-gb 2026-04-03 19:09:04.000000000 +0200 @@ -11,7 +11,7 @@ :: :: Source: http://www.mom.gov.sg/employment-practices/employment-rights-conditions/leave-and-holiday/Pages/PublicHolidays2012.aspx :: http://www.mom.gov.sg/employment-practices/employment-rights-conditions/leave-and-holiday/pages/publicholidays2013.aspx -:: http://www.officeholidays.com/countries/singapore/2014.html +:: http://www.officeholidays.com/countries/singapore/2014.html :: https://www.mom.gov.sg/employment-practices/public-holidays#Year-2024 :: https://www.moe.gov.sg/news/press-releases/20230807-school-terms-and-holidays-for-2024 :: https://publicholidays.sg/2025-dates/ (estimated) @@ -88,4 +88,3 @@ :: Name Days "SAF Day" nameday on july 1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_si_sl new/kholidays-6.25.0/holidays/plan2/holiday_si_sl --- old/kholidays-6.24.0/holidays/plan2/holiday_si_sl 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_si_sl 2026-04-03 19:09:04.000000000 +0200 @@ -64,6 +64,3 @@ :: To be sorted - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_tw_zh-tw new/kholidays-6.25.0/holidays/plan2/holiday_tw_zh-tw --- old/kholidays-6.24.0/holidays/plan2/holiday_tw_zh-tw 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_tw_zh-tw 2026-04-03 19:09:04.000000000 +0200 @@ -1,105 +1,167 @@ :: -:: 國家：中華民國（臺灣） +:: Country: Taiwan :: -:: 語言：中文 +:: Language: Traditional Chinese :: -:: 作者：Ricky Lindén <[email protected]> +:: Authors: Ricky Lindén <[email protected]> +:: kuanyui <[email protected]> :: -:: 更新日期：2022-01-17 +:: Updated: 2026-03-24 :: -:: 來源：https://law.moj.gov.tw/LawClass/LawAll.aspx?pcode=D0020033 +:: Sources: https://law.moj.gov.tw/LawClass/LawAll.aspx?pcode=D0020033 +:: https://www.asiaa.sinica.edu.tw/guide/holiday_c.php +:: https://www.dgpa.gov.tw/information?uid=41&pid=12573 :: -:: 元資料 +:: Metadata country "TW" language "zh_TW" -:name "可選 - 預設為國家名" -description "中華民國（臺灣）紀念日及節日" +:name "optional - defaults to country name" +description "臺灣（中華民國）紀念日及節日" -:: 應放假之紀念日及節日 +:: ====================================================================== +:: Holidays (Solar Calendar) +:: 應放假之紀念日及節日（國曆） +:: ====================================================================== -: Republic Day/New Year's Day -"中華民國開國紀念日" public commemorative on January 1 - -: Peace Memorial Day +"中華民國開國紀念日（元旦）" public commemorative on January 1 "和平紀念日" public commemorative on ((year >= 1997) ? [February 28] : noop) - -: Children's Day -"兒童節" public on ((year >= 2011) ? [April 4] : noop) - -: National Day +"兒童節" public commemorative on ((year >= 2011) ? [April 4] : noop) "國慶日" public commemorative on October 10 -:: 應放假之紀念日及節日（以農曆為基礎） +:: ----------- +:: [Status Changed] According to 2025/05/28 「紀念日及節日實施條例」, these commemorative days becomes public: +"孔子誕辰紀念日（教師節）" commemorative on ((year < 2025) ? [September 28] : noop) +"臺灣光復節" commemorative on ((year < 2025) ? [October 25] : noop) +"行憲紀念日" commemorative on ((year < 2025) ? [December 25] : noop) +"勞動節" commemorative on ((year < 2025) ? [May 1] : noop) + +"孔子誕辰紀念日（教師節）" public commemorative on ((year >= 2025) ? [September 28] : noop) +"臺灣光復節" public commemorative on ((year >= 2025) ? [October 25] : noop) +"行憲紀念日" public commemorative on ((year >= 2025) ? [December 25] : noop) +"勞動節" public commemorative on ((year >= 2025) ? [May 1] : noop) +:: ----------- + +:: ====================================================================== +:: Substitute Holidays (Solar Calendar) +:: 補假（國曆） +:: ====================================================================== + +::: 2020 +"兒童節（補假）" public on 3 April 2020 +"民族掃墓節（補假）" public on 2 April 2020 + +::: 2021 +"和平紀念日（補假）" public on 1 March 2021 +"兒童節（補假）" public on 2 April 2021 +"民族掃墓節（補假）" public on 5 April 2021 +"國慶日（補假）" public on 11 October 2021 +"中華民國開國紀念日（補假）" public on 31 December 2021 + +::: 2026 +"和平紀念日 (補假)" public on 27 February 2026 +"兒童節 (補假)" public on 3 April 2026 +"國慶日 (補假)" public on 9 October 2026 +"臺灣光復節 (補假)" public on 26 October 2026 + +:: ====================================================================== +:: Holidays + Substitute Holiday (Lunar Calendar. As Lunar dates shift every year, group their substitute holidays together for easier maintenance) +:: 應放假之紀念日及節日 + 補假（由於以農曆為基礎，每年不固定，為了維護方便故將其對應的補假列在一起） +:: ====================================================================== -: Chinese New Year's Eve +::: 2020 "農曆除夕" public cultural on 24 January 2020 -: Spring Festival "春節" public cultural on 25 January 2020 length 5 days -: Tomb Sweeping Day "民族掃墓節" public cultural on 4 April 2020 -: Dragon Boat Festival "端午節" public cultural on 25 June 2020 -: Mid-Autumn Festival "中秋節" public cultural on 1 October 2020 +::: 2021 "農曆除夕" public cultural on 11 February 2021 "春節" public cultural on 12 February 2021 length 5 days "民族掃墓節" public cultural on 4 April 2021 "端午節" public cultural on 14 June 2021 "中秋節" public cultural on 21 September 2021 +::: 2022 "農曆除夕" public cultural on 31 January 2022 "春節" public cultural on 1 February 2022 length 3 days "民族掃墓節" public cultural on 5 April 2022 "端午節" public cultural on 3 June 2022 "中秋節" public cultural on 10 September 2022 +"中秋節（補假）" public cultural on 9 September 2022 -:: Substitute holidays -:: 補假 - -"兒童節補假" public on 3 April 2020 -"民族掃墓節補假" public on 2 April 2020 - -"和平紀念日補假" public on 1 March 2021 -"兒童節補假" public on 2 April 2021 -"民族掃墓節補假" public on 5 April 2021 -"國慶日補假" public on 11 October 2021 -"中華民國開國紀念日補假" public on 31 December 2021 - -"中秋節補假" public cultural on 9 September 2022 - -:: 其他紀念日 +::: 2026 +"小年夜" public cultural on 15 February 2026 +"農曆除夕" public cultural on 16 February 2026 +"春節" public cultural on 17 February 2026 length 4 days +"民族掃墓節" public cultural on 5 April 2026 +"民族掃墓節（補假）" public cultural on 6 April 2026 +"端午節" public cultural on 19 June 2026 +"中秋節" public cultural on 25 September 2026 + + +:: ====================================================================== +:: Other Observances or Awareness Days / Sector-specific Holidays +:: 其他完全不放假、或部份群體放假的紀念日 +:: ====================================================================== + +:: ------------------------ +:: 歷史政治相關 +:: ------------------------ "國父逝世紀念日" commemorative on March 12 -"植樹節" commemorative on March 12 "反侵略日" commemorative on ((year >= 2006) ? [March 14] : noop) "革命先烈紀念日" commemorative on March 29 "解嚴紀念日" commemorative on ((year >= 2007) ? [July 15] : noop) -"孔子誕辰紀念日" commemorative on September 28 -"臺灣聯合國日" commemorative on October 24 -"國父誕辰紀念日" commemorative on November 12 -"行憲紀念日" commemorative on December 25 +"臺灣聯合國日" commemorative on 24 October +"國父誕辰紀念日" commemorative on 12 November +"中華文化復興節" commemorative on 12 November + +:: ------------------------ +:: 家族相關 +:: ------------------------ + +"母親節" cultural on second Sunday in May +"父親節" cultural on 8 August +"祖父母節" cultural on fourth Sunday in August + +:: ------------------------ +:: 其他 +:: ------------------------ + +"消防節" commemorative on 19 January +"國際婦女節" commemorative on 8 March +"植樹節" commemorative on 12 March +"青年節" commemorative on 29 March +"國際醫師節" commemorative on 30 March +"國際護理師節" commemorative on 12 May +"警察節" commemorative on 15 June +"漁民節" commemorative on 1 July +"軍人節" commemorative on 3 September +"教師節" commemorative on 28 September +"海巡節" commemorative on 8 November +"國際身心障礙者日" commemorative on 3 December +"國際人權日" commemorative on 10 December + +:: ====================================================================== +:: Religious +:: 宗教節日（目前皆為農曆） +:: ====================================================================== +:: 佛誕：農曆四月八日 "佛陀誕辰紀念日" commemorative religious on 30 April 2020 "佛陀誕辰紀念日" commemorative religious on 19 May 2021 "佛陀誕辰紀念日" commemorative religious on 8 May 2022 -:: 其他節日 - -"婦女節" commemorative on March 8 -"青年節" commemorative on March 29 -"勞動節" commemorative on May 1 -"軍人節" commemorative on September 3 -"教師節" commemorative on September 28 -"臺灣光復節" commemorative on October 25 -"中華文化復興節" commemorative on November 12 - -"道教節" commemorative on 25 January 2020 -"道教節" commemorative on 12 February 2021 -"道教節" commemorative on 1 February 2022 - -:: Historical -:: 已廢除假期 +:: 道教節：農曆一月一日 +"道教節" commemorative religious on 25 January 2020 +"道教節" commemorative religious on 12 February 2021 +"道教節" commemorative religious on 1 February 2022 + +:: ====================================================================== +:: Historical / Deprecated +:: 已廢除的歷史上的假期 +:: ====================================================================== "婦女節、兒童節合併假期" public on ((year >= 1991) && (year <= 1997) ? [April 4] : noop) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_uy_es new/kholidays-6.25.0/holidays/plan2/holiday_uy_es --- old/kholidays-6.24.0/holidays/plan2/holiday_uy_es 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_uy_es 2026-04-03 19:09:04.000000000 +0200 @@ -54,4 +54,3 @@ "Batalla de las Piedras" civil on may 18 "Natalicio de Artigas" civil on june 19 "Día de las Américas" civil on october 18 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_vn_en new/kholidays-6.25.0/holidays/plan2/holiday_vn_en --- old/kholidays-6.24.0/holidays/plan2/holiday_vn_en 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_vn_en 2026-04-03 19:09:04.000000000 +0200 @@ -36,7 +36,7 @@ "Supplementary holiday for International Workers' Day" public on ( (year >= 2000 && [may 1] == [sunday after ([may 1])]) ? [monday after ([may 1])] : noop ) - + : Independence Day (or if that day is a Sunday, then the following day) "Independence Day" public on ( (year >= 2000) ? [september 2] : noop ) "Supplementary holiday for Independence Day" public on ( (year >= 2000 && [september 2] == [sunday after ([september 2])]) ? @@ -474,4 +474,4 @@ "Hung Kings' Festival" public on 20 april 2040 "Buddha's Birthday" public on 25 may 2040 "Ghost Festival" public on 22 august 2040 -"Mid-Autumn Festival" public on 20 september 2040 \ No newline at end of file +"Mid-Autumn Festival" public on 20 september 2040 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/holidays/plan2/holiday_vn_vi new/kholidays-6.25.0/holidays/plan2/holiday_vn_vi --- old/kholidays-6.24.0/holidays/plan2/holiday_vn_vi 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/holidays/plan2/holiday_vn_vi 2026-04-03 19:09:04.000000000 +0200 @@ -36,7 +36,7 @@ "Ngày Quốc tế Lao động (ngày lễ bổ sung)" public on ( (year >= 2000 && [may 1] == [sunday after ([may 1])]) ? [monday after ([may 1])] : noop ) - + : Independence Day (or if that day is a Sunday, then the following day) "Quốc khánh" public on ( (year >= 2000) ? [september 2] : noop ) "Quốc khánh (ngày lễ bổ sung)" public on ( (year >= 2000 && [september 2] == [sunday after ([september 2])]) ? @@ -432,4 +432,4 @@ "Giỗ Tổ Hùng Vương" public on 20 april 2040 "Lễ Phật Đản" public on 25 may 2040 "Lễ Vu Lan" public on 22 august 2040 -"Tết Trung Thu" public on 20 september 2040 \ No newline at end of file +"Tết Trung Thu" public on 20 september 2040 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/src/CMakeLists.txt new/kholidays-6.25.0/src/CMakeLists.txt --- old/kholidays-6.24.0/src/CMakeLists.txt 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/src/CMakeLists.txt 2026-04-03 19:09:04.000000000 +0200 @@ -2,44 +2,44 @@ add_library(KF6::Holidays ALIAS KF6Holidays) set_target_properties( - KF6Holidays - PROPERTIES - VERSION - ${KHOLIDAYS_VERSION} - SOVERSION - ${KHOLIDAYS_SOVERSION} - EXPORT_NAME - Holidays + KF6Holidays + PROPERTIES + VERSION + ${KHOLIDAYS_VERSION} + SOVERSION + ${KHOLIDAYS_SOVERSION} + EXPORT_NAME + Holidays ) target_sources( - KF6Holidays - PRIVATE - astroseasons.cpp - astroseasons.h - holiday.cpp - holiday.h - holiday_p.h - holidayregion.cpp - holidayregion.h - lunarphase.cpp - lunarphase.h - parsers/holidayparserdriver.cpp - parsers/holidayparserdriver_p.h - parsers/plan2/FlexLexer.h - parsers/plan2/holidayparserdriverplan.cpp - parsers/plan2/holidayparserdriverplan_p.h - parsers/plan2/holidayscannerplan_p.h - parsers/qcalendarsystem.cpp - parsers/qcalendarsystem_p.h - sunevents_p.h - sunevents.cpp - sunevents.h - sunriseset.cpp - sunriseset.h - zodiac.cpp - zodiac.h - ../holidays/holidays.qrc + KF6Holidays + PRIVATE + astroseasons.cpp + astroseasons.h + holiday.cpp + holiday.h + holiday_p.h + holidayregion.cpp + holidayregion.h + lunarphase.cpp + lunarphase.h + parsers/holidayparserdriver.cpp + parsers/holidayparserdriver_p.h + parsers/plan2/FlexLexer.h + parsers/plan2/holidayparserdriverplan.cpp + parsers/plan2/holidayparserdriverplan_p.h + parsers/plan2/holidayscannerplan_p.h + parsers/qcalendarsystem.cpp + parsers/qcalendarsystem_p.h + sunevents_p.h + sunevents.cpp + sunevents.h + sunriseset.cpp + sunriseset.h + zodiac.cpp + zodiac.h + ../holidays/holidays.qrc ) bison_target( KF6HolidaysParser @@ -53,14 +53,14 @@ COMPILE_FLAGS "-i -B" ) add_flex_bison_dependency( - KF6HolidaysLexer - KF6HolidaysParser + KF6HolidaysLexer + KF6HolidaysParser ) target_sources( KF6Holidays PRIVATE - ${BISON_KF6HolidaysParser_OUTPUTS} - ${FLEX_KF6HolidaysLexer_OUTPUTS} + ${BISON_KF6HolidaysParser_OUTPUTS} + ${FLEX_KF6HolidaysLexer_OUTPUTS} ) ecm_create_qm_loader(KF6Holidays libkholidays6_qt) @@ -106,18 +106,18 @@ ########### install files ############### install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/kholidays_export.h - ${KHolidays_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KHolidays/kholidays - COMPONENT Devel + FILES + ${CMAKE_CURRENT_BINARY_DIR}/kholidays_export.h + ${KHolidays_HEADERS} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KHolidays/kholidays + COMPONENT Devel ) install( - FILES - ${KHolidays_CamelCase_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KHolidays/KHolidays - COMPONENT Devel + FILES + ${KHolidays_CamelCase_HEADERS} + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KHolidays/KHolidays + COMPONENT Devel ) add_subdirectory(declarative) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/src/declarative/CMakeLists.txt new/kholidays-6.25.0/src/declarative/CMakeLists.txt --- old/kholidays-6.24.0/src/declarative/CMakeLists.txt 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/src/declarative/CMakeLists.txt 2026-04-03 19:09:04.000000000 +0200 @@ -1,16 +1,20 @@ ecm_add_qml_module(kholidaysdeclarativeplugin URI "org.kde.kholidays") -target_sources(kholidaysdeclarativeplugin PRIVATE - kholidaysdeclarativeplugin.cpp - holidayregionsmodel.cpp - kholidaysdeclarativeplugin.h - holidayregionsmodel.h +target_sources( + kholidaysdeclarativeplugin + PRIVATE + kholidaysdeclarativeplugin.cpp + holidayregionsmodel.cpp + kholidaysdeclarativeplugin.h + holidayregionsmodel.h ) -target_link_libraries(kholidaysdeclarativeplugin PRIVATE - Qt6::Qml - Qt6::Core - KF6Holidays +target_link_libraries( + kholidaysdeclarativeplugin + PRIVATE + Qt6::Qml + Qt6::Core + KF6Holidays ) ecm_finalize_qml_module(kholidaysdeclarativeplugin DESTINATION ${KDE_INSTALL_QMLDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/src/declarative/holidayregionsmodel.h new/kholidays-6.25.0/src/declarative/holidayregionsmodel.h --- old/kholidays-6.24.0/src/declarative/holidayregionsmodel.h 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/src/declarative/holidayregionsmodel.h 2026-04-03 19:09:04.000000000 +0200 @@ -25,7 +25,11 @@ NameRole, DescriptionRole, }; - enum Columns { RegionColumn, NameColumn, DescriptionColumn }; + enum Columns { + RegionColumn, + NameColumn, + DescriptionColumn + }; explicit HolidayRegionsDeclarativeModel(QObject *parent = nullptr); ~HolidayRegionsDeclarativeModel() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/src/sunevents.cpp new/kholidays-6.25.0/src/sunevents.cpp --- old/kholidays-6.24.0/src/sunevents.cpp 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/src/sunevents.cpp 2026-04-03 19:09:04.000000000 +0200 @@ -57,8 +57,8 @@ static double equationOfCenter(double jcent) { const double anomaly = sunGeometricMeanAnomaly(jcent); - return qDegreesToRadians(std::sin(anomaly) * (1.914602 - jcent * (0.004817 + 0.000014 * jcent)) - + std::sin(2 * anomaly) * (0.019993 - 0.000101 * jcent) + std::sin(3 * anomaly) * 0.000289); + return qDegreesToRadians(std::sin(anomaly) * (1.914602 - jcent * (0.004817 + 0.000014 * jcent)) + std::sin(2 * anomaly) * (0.019993 - 0.000101 * jcent) + + std::sin(3 * anomaly) * 0.000289); } static double sunTrueLongitude(double jcent) @@ -96,10 +96,8 @@ const double meanAnomaly = sunGeometricMeanAnomaly(jcent); const double varY = std::pow(std::tan(obliquityCorrection(jcent) / 2), 2); - return varY * std::sin(2 * meanLongitude) - - 2 * eccentricity * std::sin(meanAnomaly) - + 4 * eccentricity * varY * std::sin(meanAnomaly) * std::cos(2 * meanLongitude) - - 0.5 * varY * varY * std::sin(4 * meanLongitude) + return varY * std::sin(2 * meanLongitude) - 2 * eccentricity * std::sin(meanAnomaly) + + 4 * eccentricity * varY * std::sin(meanAnomaly) * std::cos(2 * meanLongitude) - 0.5 * varY * varY * std::sin(4 * meanLongitude) - 1.25 * eccentricity * eccentricity * std::sin(2 * meanAnomaly); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-6.24.0/src/sunriseset.cpp new/kholidays-6.25.0/src/sunriseset.cpp --- old/kholidays-6.24.0/src/sunriseset.cpp 2026-03-07 21:30:39.000000000 +0100 +++ new/kholidays-6.25.0/src/sunriseset.cpp 2026-04-03 19:09:04.000000000 +0200 @@ -28,7 +28,7 @@ } } -template <typename Event> +template<typename Event> static QTime timeOfEvent(const QDate &date, double latitude, double longitude, Event event) { const QDateTime referenceDateTime(date, QTime(12, 0), QTimeZone::utc());
