Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2023-03-12 16:23:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Sun Mar 12 16:23:10 2023 rev:94 rq:1070888 version:5.104.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2023-02-13 16:40:12.691089997 +0100 +++ /work/SRC/openSUSE:Factory/.kholidays.new.31432/kholidays.changes 2023-03-12 16:24:59.612962311 +0100 @@ -1,0 +2,12 @@ +Mon Mar 6 09:07:50 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 5.104.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.104.0 +- Changes since 5.103.0: + * Add holidays for Dominican Rebublic (kde#HolidayRegionTest::testRegions(), kde#This, kde#regionCode, kde#=, kde#"do_es") + * Kf5 add cuba holidays (kde#HolidayRegionTest::testRegions()) + * holidayregion variable 'regionCode' shadows outer function + +------------------------------------------------------------------- Old: ---- kholidays-5.103.0.tar.xz kholidays-5.103.0.tar.xz.sig New: ---- kholidays-5.104.0.tar.xz kholidays-5.104.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.pdSJ2k/_old 2023-03-12 16:25:00.128964583 +0100 +++ /var/tmp/diff_new_pack.pdSJ2k/_new 2023-03-12 16:25:00.132964600 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Holidays5 -%define _tar_path 5.103 +%define _tar_path 5.104 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kholidays -Version: 5.103.0 +Version: 5.104.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later ++++++ kholidays-5.103.0.tar.xz -> kholidays-5.104.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/CMakeLists.txt new/kholidays-5.104.0/CMakeLists.txt --- old/kholidays-5.103.0/CMakeLists.txt 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/CMakeLists.txt 2023-03-04 11:03:25.000000000 +0100 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.103.0") +set(KF_VERSION "5.104.0") project(KHolidays VERSION ${KF_VERSION}) -find_package(ECM 5.103.0 REQUIRED NO_MODULE) +find_package(ECM 5.104.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_AUTORCC ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/README.md new/kholidays-5.104.0/README.md --- old/kholidays-5.103.0/README.md 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/README.md 2023-03-04 11:03:25.000000000 +0100 @@ -13,7 +13,7 @@ * Edit the holidays/holidays.qrc file accordingly. ``` % cd <builddir> -% make install && QT_LOGGING_RULES="*.debug=true" ./bin/testholidayregion >& foo.txt +% make 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-5.103.0/autotests/testholidayregion.cpp new/kholidays-5.104.0/autotests/testholidayregion.cpp --- old/kholidays-5.103.0/autotests/testholidayregion.cpp 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/autotests/testholidayregion.cpp 2023-03-04 11:03:25.000000000 +0100 @@ -235,3 +235,35 @@ parseRawRegionDateRange(region, QDate(2020, 12, 25), QDate(2021, 7, 2)); parseRawRegionDateRange(region, QDate(2020, 12, 25), QDate(2022, 1, 2)); } + +void HolidayRegionTest::testDominicanRepublicDiadelaConstitucion() +{ + KHolidays::HolidayRegion region(QStringLiteral("do_es")); + printMetadata(region); + auto holidays = region.rawHolidays(QDate(2020, 10, 20), QDate(2020, 12, 15)); + QCOMPARE(holidays.first().observedStartDate(), QDate(2020, 11, 9)); + holidays = region.rawHolidays(QDate(2021, 10, 20), QDate(2021, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2021, 11, 6)); + holidays = region.rawHolidays(QDate(2022, 10, 20), QDate(2022, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2022, 11, 6)); + holidays = region.rawHolidays(QDate(2023, 10, 20), QDate(2023, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2023, 11, 6)); + holidays = region.rawHolidays(QDate(2024, 10, 20), QDate(2024, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2024, 11, 4)); + holidays = region.rawHolidays(QDate(2025, 10, 20), QDate(2025, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2025, 11, 10)); + holidays = region.rawHolidays(QDate(2026, 10, 20), QDate(2026, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2026, 11, 9)); + holidays = region.rawHolidays(QDate(2027, 10, 20), QDate(2027, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2027, 11, 6)); + holidays = region.rawHolidays(QDate(2028, 10, 20), QDate(2028, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2028, 11, 6)); + holidays = region.rawHolidays(QDate(2029, 10, 20), QDate(2029, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2029, 11, 5)); + holidays = region.rawHolidays(QDate(2030, 10, 20), QDate(2030, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2030, 11, 4)); + holidays = region.rawHolidays(QDate(2031, 10, 20), QDate(2031, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2031, 11, 10)); + holidays = region.rawHolidays(QDate(2035, 10, 20), QDate(2035, 12, 15), QLatin1String("public")); + QCOMPARE(holidays.first().observedStartDate(), QDate(2035, 11, 5)); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/autotests/testholidayregion.h new/kholidays-5.104.0/autotests/testholidayregion.h --- old/kholidays-5.103.0/autotests/testholidayregion.h 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/autotests/testholidayregion.h 2023-03-04 11:03:25.000000000 +0100 @@ -29,6 +29,7 @@ void testDefaultRegions(); void testSolistaleInHolidays(); void testLoadFileCalendarSystemsForPlasma(); + void testDominicanRepublicDiadelaConstitucion(); private: void printMetadata(const KHolidays::HolidayRegion ®ion); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/holidays/holidays.qrc new/kholidays-5.104.0/holidays/holidays.qrc --- old/kholidays-5.103.0/holidays/holidays.qrc 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/holidays/holidays.qrc 2023-03-04 11:03:25.000000000 +0100 @@ -37,6 +37,8 @@ <file>plan2/holiday_co_es</file> <file>plan2/holiday_cr_en</file> <file>plan2/holiday_cr_es</file> + <file>plan2/holiday_cu_en</file> + <file>plan2/holiday_cu_es</file> <file>plan2/holiday_cz_cs</file> <file>plan2/holiday_de-bb_de</file> <file>plan2/holiday_de-be_de</file> @@ -54,6 +56,7 @@ <file>plan2/holiday_de-th_de</file> <file>plan2/holiday_de_de</file> <file>plan2/holiday_dk_da</file> + <file>plan2/holiday_do_es</file> <file>plan2/holiday_dz_ar</file> <file>plan2/holiday_dz_fr</file> <file>plan2/holiday_ee_et</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/holidays/plan2/holiday_cu_en new/kholidays-5.104.0/holidays/plan2/holiday_cu_en --- old/kholidays-5.103.0/holidays/plan2/holiday_cu_en 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.104.0/holidays/plan2/holiday_cu_en 2023-03-04 11:03:25.000000000 +0100 @@ -0,0 +1,50 @@ +:: +:: Country: Cuba +:: +:: Language: English +:: +:: Author: Alois Spitzbart <[email protected]> +:: +:: Updated: 12-FEB-2023 +:: +:: Source: https://bugs.kde.org/show_bug.cgi?id=461282 +:: https://www.timeanddate.com/holidays/cuba/ +:: https://en.wikipedia.org/wiki/Public_holidays_in_Cuba +:: https://es.wikipedia.org/wiki/Cuba + +:: Metadata +country "CU" +language "en" +:name "Cuba" +description "State holiday file for Cuba" + +:: Public Holidays +"Liberation Day" public on january 1 +"Victory Day" public on january 2 +"International Workers Day" public on may 1 +"Commemoration of the Assault on Cuartel Moncada" public on july 25 +"National Rebellion Day" public on july 26 +"Commemoration of the Assault on Cuartel Moncada" public on july 27 +"Independence Day" public on october 10 +"End of the Year" public on december 31 + +:: Religious +"Good Friday" public religious easter minus 2 +"Christmas" public religious on december 25 + +:: Financial + +:: Cultural +"Mother's Day" cultural on second sunday in may +"Father's Day" cultural on third sunday in july +"Children's Day" cultural on third sunday in june + +:: School + +:: Daylight Saving +"Daylight Saving Start" seasonal on second sunday in march +"Daylight Saving End" seasonal on first sunday in november + +:: Seasons + +:: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/holidays/plan2/holiday_cu_es new/kholidays-5.104.0/holidays/plan2/holiday_cu_es --- old/kholidays-5.103.0/holidays/plan2/holiday_cu_es 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.104.0/holidays/plan2/holiday_cu_es 2023-03-04 11:03:25.000000000 +0100 @@ -0,0 +1,50 @@ +:: +:: Country: Cuba +:: +:: Language: Spanish +:: +:: Author: Alois Spitzbart <[email protected]> +:: +:: Updated: 12-FEB-2023 +:: +:: Source: https://bugs.kde.org/show_bug.cgi?id=461282 +:: https://www.timeanddate.com/holidays/cuba/ +:: https://en.wikipedia.org/wiki/Public_holidays_in_Cuba +:: https://es.wikipedia.org/wiki/Cuba + +:: Metadata +country "CU" +language "es" +:name "Cuba" +description "DÃas Feriados de Cuba" + +:: Public Holidays +"DÃa de la Liberación" public on january 1 +"DÃa de la Victoria" public on january 2 +"DÃa internacional de los trabajadores" public on may 1 +"Conmemoración del Asalto al Cuartel Moncada" public on july 25 +"DÃa de la RebeldÃa Nacional" public on july 26 +"Conmemoración del Asalto al Cuartel Moncada" public on july 27 +"DÃa de la Independencia" public on october 10 +"Fin de año" public on december 31 + +:: Religious +"Viernes Santo" public religious easter minus 2 +"Navidad" public religious on december 25 + +:: Financial + +:: Cultural +"DÃa de las madres" cultural on second sunday in may +"DÃa de los niños" cultural on third sunday in july +"DÃa de los padres" cultural on third sunday in june + +:: School + +:: Daylight Saving +"Inicio del horario de verano" seasonal on second sunday in march +"Fin del horario de verano" seasonal on first sunday in november + +:: Seasons + +:: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/holidays/plan2/holiday_do_es new/kholidays-5.104.0/holidays/plan2/holiday_do_es --- old/kholidays-5.103.0/holidays/plan2/holiday_do_es 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.104.0/holidays/plan2/holiday_do_es 2023-03-04 11:03:25.000000000 +0100 @@ -0,0 +1,74 @@ +:: +:: Country: Dominican Republic +:: +:: Language: Spanish +:: +:: Author: Alois Spitzbart <[email protected]> +:: +:: Updated: +:: +:: Source: : https://www.timeanddate.com/holidays/dominican-republic/ +:: https://www.consuladordholanda.com/dias-festivos-en-republica-dominicana/ +:: https://es.wikipedia.org/wiki/Rep%C3%BAblica_Dominicana#D%C3%ADas_festivos_nacionales +:: https://en.wikipedia.org/wiki/Public_holidays_in_the_Dominican_Republic +:: + +:: Metadata +country "DO" +language "es" +name "República Dominicana" +description "DÃas Feriados de República Dominicana" + +:: Public Holidays +"Año nuevo" public on january 1 +"DÃa de Reyes" public on ((year > 2023) ? [january 9] : noop) +"Virgen de la Altagracia" public on january 21 +"DÃa padre de la patrÃa Juan Pablo Duarte" public on (([january 26] == [tuesday after ([january 25])] || + [january 26] == [wednesday after ([january 25])]) ? + [monday before ([january 26])] : + (([january 26] == [thursday after ([january 25])] || + [january 26] == [friday after ([january 25])]) ? + [monday after ([january 26])] : noop )) +"DÃa padre de la patrÃa Juan Pablo Duarte" cultural on (([january 26] == [tuesday after ([january 25])] || + [january 26] == [wednesday after ([january 25])]) ? + [january 26] : + (([january 26] == [thursday after ([january 25])] || + [january 26] == [friday after ([january 25])]) ? + [january 26] : noop )) +"DÃa padre de la patrÃa Juan Pablo Duarte" public on (([january 26] == [saturday after ([january 26])] || + [january 26] == [sunday after ([january 26])] || + [january 26] == [monday after ([january 26])]) ? + [january 26] : noop ) +"Independencia Nacional" public on february 27 +"Viernes Santo" public religious on easter minus 2 days +"DÃa del Trabajo" public on may 1 +"DÃa del Trabajo" public on (([may 1] == [saturday after ([may 1])]) ? + [friday before ([may 1])] : noop) +"DÃa del Trabajo" public on (([may 1] == [sunday after ([may 1])]) ? + [monday after ([may 1])] : noop) +"Jueves Corpus Cristi" public religious on easter plus 60 days +"DÃa de la Restauración" public on august 16 +"Virgen de las Mercedes" public on september 24 +"DÃa de la Constitución" public on (([november 6] == [tuesday after ([november 5])] || + [november 6] == [wednesday after ([november 5])]) ? + [monday before ([november 6])] : + (([november 6] == [thursday after ([november 5])] || + [november 6] == [friday after ([november 5])] )? + [monday after ([november 6])] : [november 6])) +"DÃa de Navidad" public on december 25 + +:: Religious Holidays + +:: Financial + +:: Cultural +"DÃa de las madres" cultural on second sunday in may +"DÃa de los padres" cultural on third sunday in june +"Laborable hasta el mediodÃa" public on december 24 +"Fin de año" cultural on december 31 + +:; School + +:: Daylight Saving + +:: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/poqm/ia/libkholidays5_qt.po new/kholidays-5.104.0/poqm/ia/libkholidays5_qt.po --- old/kholidays-5.103.0/poqm/ia/libkholidays5_qt.po 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/poqm/ia/libkholidays5_qt.po 2023-03-04 11:03:25.000000000 +0100 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# g.sora <[email protected]>, 2011, 2012, 2019, 2020, 2021, 2022. +# g.sora <[email protected]>, 2011, 2012, 2019, 2020, 2021, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2022-12-14 16:24+0100\n" +"PO-Revision-Date: 2023-02-08 22:19+0100\n" "Last-Translator: giovanni <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 21.12.3\n" +"X-Generator: Lokalize 22.12.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" @@ -368,22 +368,22 @@ #: lunarphase.cpp:35 msgctxt "LunarPhase|" msgid "Waxing Crescent" -msgstr "" +msgstr "Medie Luna crescente" #: lunarphase.cpp:37 msgctxt "LunarPhase|" msgid "Waxing Gibbous" -msgstr "" +msgstr "Luna Crescente" #: lunarphase.cpp:39 msgctxt "LunarPhase|" msgid "Waning Gibbous" -msgstr "" +msgstr "Luna descendente" #: lunarphase.cpp:41 msgctxt "LunarPhase|" msgid "Waning Crescent" -msgstr "" +msgstr "Medie Luna descendente" #: zodiac.cpp:66 msgctxt "Zodiac|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.103.0/poqm/zh_CN/libkholidays5_qt.po new/kholidays-5.104.0/poqm/zh_CN/libkholidays5_qt.po --- old/kholidays-5.103.0/poqm/zh_CN/libkholidays5_qt.po 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/poqm/zh_CN/libkholidays5_qt.po 2023-03-04 11:03:25.000000000 +0100 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2023-01-12 10:30\n" +"PO-Revision-Date: 2023-02-24 12:43\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/kholidays-5.103.0/src/holidayregion.cpp new/kholidays-5.104.0/src/holidayregion.cpp --- old/kholidays-5.103.0/src/holidayregion.cpp 2023-02-05 10:21:54.000000000 +0100 +++ new/kholidays-5.104.0/src/holidayregion.cpp 2023-03-04 11:03:25.000000000 +0100 @@ -1190,8 +1190,8 @@ QString languageSubdivisionOnlyMatch; const QStringList regionList = KHolidays::HolidayRegion::regionCodes(); - for (const QString ®ionCode : regionList) { - const auto hr = KHolidays::HolidayRegion(regionCode); + for (const QString &aRegionCode : regionList) { + const auto hr = KHolidays::HolidayRegion(aRegionCode); QString regionCountry = hr.countryCode().toLower(); QString regionSubdivisionCountry; if (regionCountry.split(QLatin1Char('-')).count() > 1) { @@ -1203,37 +1203,37 @@ if (regionCountry == localeCountry && regionLanguage == localeLanguage) { // exact match so don't look further - return regionCode; + return aRegionCode; } else if (regionCountry == localeSubdivision && regionLanguage == localeLanguage) { - countryAndLanguageMatch = regionCode; + countryAndLanguageMatch = aRegionCode; } else if (regionCountry == localeCountry) { if (countryOnlyMatch.isEmpty()) { - countryOnlyMatch = regionCode; + countryOnlyMatch = aRegionCode; } } else if (!regionSubdivisionCountry.isEmpty() && regionSubdivisionCountry == localeSubdivision && regionLanguage == localeLanguage) { if (subdivisionAndLanguageMatch.isEmpty()) { - subdivisionAndLanguageMatch = regionCode; + subdivisionAndLanguageMatch = aRegionCode; } } else if (!regionSubdivisionCountry.isEmpty() && regionSubdivisionCountry == localeSubdivision) { if (subdivisionOnlyMatch.isEmpty()) { - subdivisionOnlyMatch = regionCode; + subdivisionOnlyMatch = aRegionCode; } } else if (!localeLanguageCountry.isEmpty() && regionCountry == localeLanguageCountry && regionLanguage == localeLanguage) { if (languageCountryAndLanguageMatch.isEmpty()) { - languageCountryAndLanguageMatch = regionCode; + languageCountryAndLanguageMatch = aRegionCode; } } else if (!localeLanguageCountry.isEmpty() && regionCountry == localeLanguageCountry) { if (languageCountryOnlyMatch.isEmpty()) { - languageCountryOnlyMatch = regionCode; + languageCountryOnlyMatch = aRegionCode; } } else if (!regionSubdivisionCountry.isEmpty() && !localeLanguageCountry.isEmpty() && regionSubdivisionCountry == localeLanguageCountry && regionLanguage == localeLanguage) { if (languageSubdivisionAndLanguageMatch.isEmpty()) { - languageSubdivisionAndLanguageMatch = regionCode; + languageSubdivisionAndLanguageMatch = aRegionCode; } } else if (!regionSubdivisionCountry.isEmpty() && !localeLanguageCountry.isEmpty() && regionSubdivisionCountry == localeLanguageCountry) { if (languageSubdivisionOnlyMatch.isEmpty()) { - languageSubdivisionOnlyMatch = regionCode; + languageSubdivisionOnlyMatch = aRegionCode; } } }
