Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2022-06-17 21:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Fri Jun 17 21:19:14 2022 rev:85 rq:982266 version:5.95.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2022-05-16 18:08:41.537284000 +0200 +++ /work/SRC/openSUSE:Factory/.kholidays.new.1548/kholidays.changes 2022-06-17 21:21:09.986729563 +0200 @@ -1,0 +2,10 @@ +Fri Jun 10 14:12:29 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.95.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.95.0 +- Changes since 5.94.0: + * Work around qmlplugindump crashing on gadget singletons + +------------------------------------------------------------------- Old: ---- kholidays-5.94.0.tar.xz kholidays-5.94.0.tar.xz.sig New: ---- kholidays-5.95.0.tar.xz kholidays-5.95.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.alPVL0/_old 2022-06-17 21:21:10.458729819 +0200 +++ /var/tmp/diff_new_pack.alPVL0/_new 2022-06-17 21:21:10.462729821 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Holidays5 -%define _tar_path 5.94 +%define _tar_path 5.95 # 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.94.0 +Version: 5.95.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later ++++++ kholidays-5.94.0.tar.xz -> kholidays-5.95.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.94.0/CMakeLists.txt new/kholidays-5.95.0/CMakeLists.txt --- old/kholidays-5.94.0/CMakeLists.txt 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/CMakeLists.txt 2022-06-09 23:19:45.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.94.0") +set(KF_VERSION "5.95.0") project(KHolidays VERSION ${KF_VERSION}) -find_package(ECM 5.93.0 REQUIRED NO_MODULE) +find_package(ECM 5.95.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.94.0/po/ca@valencia/libkholidays5_qt.po new/kholidays-5.95.0/po/ca@valencia/libkholidays5_qt.po --- old/kholidays-5.94.0/po/ca@valencia/libkholidays5_qt.po 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/po/ca@valencia/libkholidays5_qt.po 2022-06-09 23:19:45.000000000 +0200 @@ -128,7 +128,7 @@ #: holidayregion.cpp:920 msgctxt "HolidayRegion|UK Region" msgid "England and Wales" -msgstr "Anglaterra i Gal??les" +msgstr "Anglaterra i Gales" #: holidayregion.cpp:922 msgctxt "HolidayRegion|UK Region" @@ -138,7 +138,7 @@ #: holidayregion.cpp:924 msgctxt "HolidayRegion|UK Region" msgid "Wales" -msgstr "Gal??les" +msgstr "Gales" #: holidayregion.cpp:926 msgctxt "HolidayRegion|UK Region" @@ -158,7 +158,7 @@ #: holidayregion.cpp:932 msgctxt "HolidayRegion|" msgid "New South Wales" -msgstr "Nova Gal??les del sud" +msgstr "Nova Gales del sud" #: holidayregion.cpp:934 msgctxt "HolidayRegion|Australian Region" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.94.0/po/fi/libkholidays5_qt.po new/kholidays-5.95.0/po/fi/libkholidays5_qt.po --- old/kholidays-5.94.0/po/fi/libkholidays5_qt.po 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/po/fi/libkholidays5_qt.po 2022-06-09 23:19:45.000000000 +0200 @@ -4,13 +4,13 @@ # Ilpo Kantonen <i...@iki.fi>, 2005. # Mikko Piippo <pii...@cc.helsinki.fi>, 2007. # Lasse Liehu <lli...@kolumbus.fi>, 2011, 2013, 2014, 2015. -# Tommi Nieminen <transla...@legisign.org>, 2021. +# Tommi Nieminen <transla...@legisign.org>, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: libkholidays\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2021-01-04 19:26+0200\n" +"PO-Revision-Date: 2022-04-25 22:32+0300\n" "Last-Translator: Tommi Nieminen <transla...@legisign.org>\n" "Language-Team: Finnish <kde-i18n-...@kde.org>\n" "Language: fi\n" @@ -357,22 +357,22 @@ #: lunarphase.cpp:36 msgctxt "LunarPhase|" msgid "Waxing Crescent" -msgstr "" +msgstr "Kasvava sirppi" #: lunarphase.cpp:38 msgctxt "LunarPhase|" msgid "Waxing Gibbous" -msgstr "" +msgstr "Kasvava nelj??nnes" #: lunarphase.cpp:40 msgctxt "LunarPhase|" msgid "Waning Gibbous" -msgstr "" +msgstr "V??henev?? nelj??nnes" #: lunarphase.cpp:42 msgctxt "LunarPhase|" msgid "Waning Crescent" -msgstr "" +msgstr "V??henev?? sirppi" #: zodiac.cpp:66 msgctxt "Zodiac|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.94.0/po/pl/libkholidays5_qt.po new/kholidays-5.95.0/po/pl/libkholidays5_qt.po --- old/kholidays-5.94.0/po/pl/libkholidays5_qt.po 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/po/pl/libkholidays5_qt.po 2022-06-09 23:19:45.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>, 2014, 2015, 2021. +# ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>, 2014, 2015, 2021, 2022. 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: 2021-01-17 09:18+0100\n" +"PO-Revision-Date: 2022-05-15 20:13+0200\n" "Last-Translator: ??ukasz Wojni??owicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" "Language: pl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 20.12.1\n" +"X-Generator: Lokalize 22.03.70\n" "X-Qt-Contexts: true\n" #: astroseasons.cpp:139 @@ -354,22 +354,22 @@ #: lunarphase.cpp:36 msgctxt "LunarPhase|" msgid "Waxing Crescent" -msgstr "" +msgstr "Przybywaj??cy Ksi????yc Sierpowaty" #: lunarphase.cpp:38 msgctxt "LunarPhase|" msgid "Waxing Gibbous" -msgstr "" +msgstr "Przybywaj??cy Ksi????yc Garbaty" #: lunarphase.cpp:40 msgctxt "LunarPhase|" msgid "Waning Gibbous" -msgstr "" +msgstr "Ubywaj??cy Ksi????yc Garbaty" #: lunarphase.cpp:42 msgctxt "LunarPhase|" msgid "Waning Crescent" -msgstr "" +msgstr "Ubywaj??cy Ksi????yc Sierpowaty" #: zodiac.cpp:66 msgctxt "Zodiac|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.94.0/po/sl/libkholidays5_qt.po new/kholidays-5.95.0/po/sl/libkholidays5_qt.po --- old/kholidays-5.94.0/po/sl/libkholidays5_qt.po 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/po/sl/libkholidays5_qt.po 2022-06-09 23:19:45.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: libkholidays\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2022-04-11 09:36+0200\n" +"PO-Revision-Date: 2022-05-22 07:05+0200\n" "Last-Translator: Matja?? Jeran <matjaz.je...@amis.net>\n" "Language-Team: Slovenian <lugos-...@lugos.si>\n" "Language: sl\n" @@ -292,17 +292,17 @@ #: holidayregion.cpp:1002 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Orthodox" -msgstr "??idovski, ortodoksen" +msgstr "??idovski, ortodoksni" #: holidayregion.cpp:1004 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Conservative" -msgstr "??idovski, konzervativen" +msgstr "??idovski, konzervativni" #: holidayregion.cpp:1006 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Reform" -msgstr "??idovski, reformiran" +msgstr "??idovski, reformirani" #: holidayregion.cpp:1008 msgctxt "HolidayRegion|Holiday type" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.94.0/po/zh_CN/libkholidays5_qt.po new/kholidays-5.95.0/po/zh_CN/libkholidays5_qt.po --- old/kholidays-5.94.0/po/zh_CN/libkholidays5_qt.po 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/po/zh_CN/libkholidays5_qt.po 2022-06-09 23:19:45.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2022-04-26 15:18\n" +"PO-Revision-Date: 2022-06-05 04:17\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.94.0/src/declarative/kholidaysdeclarativeplugin.cpp new/kholidays-5.95.0/src/declarative/kholidaysdeclarativeplugin.cpp --- old/kholidays-5.94.0/src/declarative/kholidaysdeclarativeplugin.cpp 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/src/declarative/kholidaysdeclarativeplugin.cpp 2022-06-09 23:19:45.000000000 +0200 @@ -12,6 +12,7 @@ #include <KHolidays/LunarPhase> #include <KHolidays/SunRiseSet> +#include <QCoreApplication> #include <QQmlEngine> // convert to/from QDateTime for JS @@ -58,16 +59,18 @@ void KHolidaysDeclarativePlugin::registerTypes(const char *uri) { qmlRegisterType<HolidayRegionsDeclarativeModel>(uri, 1, 0, "HolidayRegionsModel"); - - qmlRegisterSingletonType(uri, 1, 0, "Lunar", [](QQmlEngine *engine, QJSEngine *) -> QJSValue { - return engine->toScriptValue(LunarPhaseWrapper()); - }); qRegisterMetaType<KHolidays::LunarPhase::Phase>(); qmlRegisterUncreatableType<KHolidays::LunarPhase>(uri, 1, 0, "LunarPhase", {}); - qmlRegisterSingletonType(uri, 1, 0, "SunRiseSet", [](QQmlEngine *engine, QJSEngine *) -> QJSValue { - return engine->toScriptValue(SunRiseSetWrapper()); - }); + // HACK qmlplugindump chokes on gadget singletons, to the point of breaking ecm_find_qmlmodule() + if (QCoreApplication::applicationName() != QLatin1String("qmlplugindump")) { + qmlRegisterSingletonType(uri, 1, 0, "Lunar", [](QQmlEngine *engine, QJSEngine *) -> QJSValue { + return engine->toScriptValue(LunarPhaseWrapper()); + }); + qmlRegisterSingletonType(uri, 1, 0, "SunRiseSet", [](QQmlEngine *engine, QJSEngine *) -> QJSValue { + return engine->toScriptValue(SunRiseSetWrapper()); + }); + } } #include "kholidaysdeclarativeplugin.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.94.0/src/holidayregion.cpp new/kholidays-5.95.0/src/holidayregion.cpp --- old/kholidays-5.94.0/src/holidayregion.cpp 2022-05-07 23:21:37.000000000 +0200 +++ new/kholidays-5.95.0/src/holidayregion.cpp 2022-06-09 23:19:45.000000000 +0200 @@ -1139,9 +1139,9 @@ bool HolidayRegion::isHoliday(const QDate &date) const { #if KHOLIDAYS_BUILD_DEPRECATED_SINCE(5, 95) - const Holiday::List holidayList = rawHolidaysWithAstroSeasons(date); -#else const Holiday::List holidayList = holidays(date); +#else + const Holiday::List holidayList = rawHolidaysWithAstroSeasons(date); #endif if (!holidayList.isEmpty()) { for (const KHolidays::Holiday &holiday : holidayList) {
