Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kopeninghours for openSUSE:Factory checked in at 2021-11-06 18:17:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopeninghours (Old) and /work/SRC/openSUSE:Factory/.kopeninghours.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopeninghours" Sat Nov 6 18:17:15 2021 rev:8 rq:929361 version:21.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kopeninghours/kopeninghours.changes 2021-10-13 18:08:46.675527714 +0200 +++ /work/SRC/openSUSE:Factory/.kopeninghours.new.1890/kopeninghours.changes 2021-11-06 18:20:30.516963114 +0100 @@ -1,0 +2,11 @@ +Tue Nov 2 21:34:20 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.08.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.08.3/ +- Changes since 21.08.2: + * Fix evaluating single time open end ranges + * Don't turn 20:00-26:00 into 20:00-02:00 + +------------------------------------------------------------------- Old: ---- kopeninghours-21.08.2.tar.xz kopeninghours-21.08.2.tar.xz.sig New: ---- kopeninghours-21.08.3.tar.xz kopeninghours-21.08.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopeninghours.spec ++++++ --- /var/tmp/diff_new_pack.9iioqY/_old 2021-11-06 18:20:30.928963342 +0100 +++ /var/tmp/diff_new_pack.9iioqY/_new 2021-11-06 18:20:30.928963342 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kopeninghours -Version: 21.08.2 +Version: 21.08.3 Release: 0 Summary: OSM opening hours expression parser and evaluator License: LGPL-2.0-or-later ++++++ kopeninghours-21.08.2.tar.xz -> kopeninghours-21.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/CMakeLists.txt new/kopeninghours-21.08.3/CMakeLists.txt --- old/kopeninghours-21.08.2/CMakeLists.txt 2021-10-05 00:08:41.000000000 +0200 +++ new/kopeninghours-21.08.3/CMakeLists.txt 2021-11-02 16:24:56.000000000 +0100 @@ -6,7 +6,7 @@ # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "21") set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "2") +set (RELEASE_SERVICE_VERSION_MICRO "3") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(KOpeningHours VERSION ${RELEASE_SERVICE_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/autotests/parsertest.cpp new/kopeninghours-21.08.3/autotests/parsertest.cpp --- old/kopeninghours-21.08.2/autotests/parsertest.cpp 2021-10-05 00:08:41.000000000 +0200 +++ new/kopeninghours-21.08.3/autotests/parsertest.cpp 2021-11-02 16:24:56.000000000 +0100 @@ -93,6 +93,7 @@ T("Oct Su[-1]-Dec 31 08:00-18:00"); T("Oct Su[-1]-Dec 31 Su 08:00-18:00"); T("Mar Su[1]-Oct Su[1]: 11:00-20:00; PH 11:00-20:00"); + T2("Mo 20:00-26:00", "Mo 20:00-26:00"); // https://github.com/osm-fr/osmose-backend/issues/1344 // from https://wiki.openstreetmap.org/wiki/Key:opening_hours#Simple_examples T("Mo-Fr 08:00-17:30"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/po/ca/kopeninghours.po new/kopeninghours-21.08.3/po/ca/kopeninghours.po --- old/kopeninghours-21.08.2/po/ca/kopeninghours.po 2021-10-05 07:48:09.000000000 +0200 +++ new/kopeninghours-21.08.3/po/ca/kopeninghours.po 2021-11-02 22:05:54.000000000 +0100 @@ -1,23 +1,23 @@ # Translation of kopeninghours.po to Catalan -# Copyright (C) 2020 This_file_is_part_of_KDE +# Copyright (C) 2020-2021 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <[email protected]>, 2020. +# Josep M. Ferrer <[email protected]>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: kopeninghours\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-23 02:25+0100\n" -"PO-Revision-Date: 2020-12-23 11:57+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2021-10-09 19:48+0200\n" +"Last-Translator: Josep M. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.12.0\n" #: lib/display.cpp:28 #, kde-format @@ -57,15 +57,15 @@ #, kde-format msgid "Currently closed, opens in one minute" msgid_plural "Currently closed, opens in %1 minutes" -msgstr[0] "Tancat ara mateix, obre d'aqu?? d'un minut" -msgstr[1] "Tancat ara mateix, obre d'aqu?? %1 minuts" +msgstr[0] "Tancat ara mateix, obre d'aqu?? a un minut" +msgstr[1] "Tancat ara mateix, obre d'aqu?? a %1 minuts" #: lib/display.cpp:55 #, kde-format msgid "Currently closed (%2), opens in one minute" msgid_plural "Currently closed (%2), opens in %1 minutes" -msgstr[0] "Tancat ara mateix (%2), obre d'aqu?? un minut" -msgstr[1] "Tancat ara mateix (%2), obre d'aqu?? %1 minuts" +msgstr[0] "Tancat ara mateix (%2), obre d'aqu?? a un minut" +msgstr[1] "Tancat ara mateix (%2), obre d'aqu?? a %1 minuts" #: lib/display.cpp:68 #, kde-format @@ -85,15 +85,15 @@ #, kde-format msgid "Currently closed, opens in one hour" msgid_plural "Currently closed, opens in %1 hours" -msgstr[0] "Tancat ara mateix, obre d'aqu?? una hora" -msgstr[1] "Tancat ara mateix, obre d'aqu?? %1 hores" +msgstr[0] "Tancat ara mateix, obre d'aqu?? a una hora" +msgstr[1] "Tancat ara mateix, obre d'aqu?? a %1 hores" #: lib/display.cpp:73 #, kde-format msgid "Currently closed (%2), opens in one hour" msgid_plural "Currently closed (%2), opens in %1 hours" -msgstr[0] "Tancat ara mateix (%2), obre d'aqu?? una hora" -msgstr[1] "Tancat ara mateix (%2), obre d'aqu?? %1 hores" +msgstr[0] "Tancat ara mateix (%2), obre d'aqu?? a una hora" +msgstr[1] "Tancat ara mateix (%2), obre d'aqu?? a %1 hores" #: lib/display.cpp:86 #, kde-format @@ -113,15 +113,15 @@ #, kde-format msgid "Currently closed, opens in one day" msgid_plural "Currently closed, opens in %1 days" -msgstr[0] "Tancat ara mateix, obre d'aqu?? un dia" -msgstr[1] "Tancat ara mateix, obre d'aqu?? %1 dies" +msgstr[0] "Tancat ara mateix, obre d'aqu?? a un dia" +msgstr[1] "Tancat ara mateix, obre d'aqu?? a %1 dies" #: lib/display.cpp:91 #, kde-format msgid "Currently closed (%2), opens in one day" msgid_plural "Currently closed (%2), opens in %1 days" -msgstr[0] "Tancat ara mateix (%2), obre d'aqu?? un dia" -msgstr[1] "Tancat ara mateix (%2), obre d'aqu?? %1 dies" +msgstr[0] "Tancat ara mateix (%2), obre d'aqu?? a un dia" +msgstr[1] "Tancat ara mateix (%2), obre d'aqu?? a %1 dies" #: lib/display.cpp:102 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/po/ca@valencia/kopeninghours.po new/kopeninghours-21.08.3/po/ca@valencia/kopeninghours.po --- old/kopeninghours-21.08.2/po/ca@valencia/kopeninghours.po 2021-10-05 07:48:09.000000000 +0200 +++ new/kopeninghours-21.08.3/po/ca@valencia/kopeninghours.po 2021-11-02 22:05:54.000000000 +0100 @@ -1,23 +1,23 @@ # Translation of kopeninghours.po to Catalan (Valencian) -# Copyright (C) 2020 This_file_is_part_of_KDE +# Copyright (C) 2020-2021 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <[email protected]>, 2020. +# Josep M. Ferrer <[email protected]>, 2020, 2021. msgid "" msgstr "" "Project-Id-Version: kopeninghours\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-23 02:25+0100\n" -"PO-Revision-Date: 2020-12-23 11:57+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2021-10-09 19:48+0200\n" +"Last-Translator: Josep M. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.12.0\n" #: lib/display.cpp:28 #, kde-format @@ -57,15 +57,15 @@ #, kde-format msgid "Currently closed, opens in one minute" msgid_plural "Currently closed, opens in %1 minutes" -msgstr[0] "Tancat ara mateix, obri d'ac?? d'un minut" -msgstr[1] "Tancat ara mateix, obri d'ac?? %1 minuts" +msgstr[0] "Tancat ara mateix, obri d'ac?? a un minut" +msgstr[1] "Tancat ara mateix, obri d'ac?? a %1 minuts" #: lib/display.cpp:55 #, kde-format msgid "Currently closed (%2), opens in one minute" msgid_plural "Currently closed (%2), opens in %1 minutes" -msgstr[0] "Tancat ara mateix (%2), obri d'ac?? un minut" -msgstr[1] "Tancat ara mateix (%2), obri d'ac?? %1 minuts" +msgstr[0] "Tancat ara mateix (%2), obri d'ac?? a un minut" +msgstr[1] "Tancat ara mateix (%2), obri d'ac?? a %1 minuts" #: lib/display.cpp:68 #, kde-format @@ -85,15 +85,15 @@ #, kde-format msgid "Currently closed, opens in one hour" msgid_plural "Currently closed, opens in %1 hours" -msgstr[0] "Tancat ara mateix, obri d'ac?? una hora" -msgstr[1] "Tancat ara mateix, obri d'ac?? %1 hores" +msgstr[0] "Tancat ara mateix, obri d'ac?? a una hora" +msgstr[1] "Tancat ara mateix, obri d'ac?? a %1 hores" #: lib/display.cpp:73 #, kde-format msgid "Currently closed (%2), opens in one hour" msgid_plural "Currently closed (%2), opens in %1 hours" -msgstr[0] "Tancat ara mateix (%2), obri d'ac?? una hora" -msgstr[1] "Tancat ara mateix (%2), obri d'ac?? %1 hores" +msgstr[0] "Tancat ara mateix (%2), obri d'ac?? a una hora" +msgstr[1] "Tancat ara mateix (%2), obri d'ac?? a %1 hores" #: lib/display.cpp:86 #, kde-format @@ -113,15 +113,15 @@ #, kde-format msgid "Currently closed, opens in one day" msgid_plural "Currently closed, opens in %1 days" -msgstr[0] "Tancat ara mateix, obri d'ac?? un dia" -msgstr[1] "Tancat ara mateix, obri d'ac?? %1 dies" +msgstr[0] "Tancat ara mateix, obri d'ac?? a un dia" +msgstr[1] "Tancat ara mateix, obri d'ac?? a %1 dies" #: lib/display.cpp:91 #, kde-format msgid "Currently closed (%2), opens in one day" msgid_plural "Currently closed (%2), opens in %1 days" -msgstr[0] "Tancat ara mateix (%2), obri d'ac?? un dia" -msgstr[1] "Tancat ara mateix (%2), obri d'ac?? %1 dies" +msgstr[0] "Tancat ara mateix (%2), obri d'ac?? a un dia" +msgstr[1] "Tancat ara mateix (%2), obri d'ac?? a %1 dies" #: lib/display.cpp:102 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/po/zh_CN/kopeninghours.po new/kopeninghours-21.08.3/po/zh_CN/kopeninghours.po --- old/kopeninghours-21.08.2/po/zh_CN/kopeninghours.po 2021-10-05 07:48:09.000000000 +0200 +++ new/kopeninghours-21.08.3/po/zh_CN/kopeninghours.po 2021-11-02 22:05:54.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-12-23 02:25+0100\n" -"PO-Revision-Date: 2021-09-27 13:11\n" +"PO-Revision-Date: 2021-10-29 13:28\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/src/lib/evaluator.cpp new/kopeninghours-21.08.3/src/lib/evaluator.cpp --- old/kopeninghours-21.08.2/src/lib/evaluator.cpp 2021-10-05 00:08:41.000000000 +0200 +++ new/kopeninghours-21.08.3/src/lib/evaluator.cpp 2021-11-02 16:24:56.000000000 +0100 @@ -49,8 +49,9 @@ bool Timespan::isMultiDay(QDate date, OpeningHoursPrivate *context) const { const auto beginDt = resolveTime(begin, date, context); - auto endDt = resolveTime(end, date, context); - if (endDt < beginDt || (end.hour >= 24 && begin.hour < 24)) { + const auto realEnd = adjustedEnd(); + auto endDt = resolveTime(realEnd, date, context); + if (endDt < beginDt || (realEnd.hour >= 24 && begin.hour < 24)) { return true; } @@ -60,8 +61,9 @@ SelectorResult Timespan::nextInterval(const Interval &interval, const QDateTime &dt, OpeningHoursPrivate *context) const { const auto beginDt = resolveTime(begin, dt.date(), context); - auto endDt = resolveTime(end, dt.date(), context); - if (endDt < beginDt || (end.hour >= 24 && begin.hour < 24)) { + const auto realEnd = adjustedEnd(); + auto endDt = resolveTime(realEnd, dt.date(), context); + if (endDt < beginDt || (realEnd.hour >= 24 && begin.hour < 24)) { endDt = endDt.addDays(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/src/lib/openinghoursparser.y new/kopeninghours-21.08.3/src/lib/openinghoursparser.y --- old/kopeninghours-21.08.2/src/lib/openinghoursparser.y 2021-10-05 00:08:41.000000000 +0200 +++ new/kopeninghours-21.08.3/src/lib/openinghoursparser.y 2021-11-02 16:24:56.000000000 +0100 @@ -382,27 +382,23 @@ Time[T] { $$ = new Timespan; $$->begin = $$->end = $T; + $$->pointInTime = true; } | Time[T] T_PLUS { $$ = new Timespan; $$->begin = $$->end = $T; + $$->pointInTime = true; $$->openEnd = true; } | Time[T1] RangeSeparator Time[T2] { $$ = new Timespan; $$->begin = $T1; $$->end = $T2; - if ($$->begin == $$->end) { - $$->end.hour += 24; - } } | Time[T1] RangeSeparator Time[T2] T_PLUS { $$ = new Timespan; $$->begin = $T1; $$->end = $T2; - if ($$->begin == $$->end) { - $$->end.hour += 24; - } $$->openEnd = true; } | Time[T1] RangeSeparator Time[T2] T_SLASH T_INTEGER[I] { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/src/lib/selectors.cpp new/kopeninghours-21.08.3/src/lib/selectors.cpp --- old/kopeninghours-21.08.2/src/lib/selectors.cpp 2021-10-05 00:08:41.000000000 +0200 +++ new/kopeninghours-21.08.3/src/lib/selectors.cpp 2021-11-02 16:24:56.000000000 +0100 @@ -68,7 +68,7 @@ case Time::NoEvent: if (hour % 24 == 0 && minute == 0 && end) return "24:00"; - return twoDigits(hour % 24) + ':' + twoDigits(minute); + return twoDigits(hour) + ':' + twoDigits(minute); case Time::Dawn: expr = "dawn"; break; @@ -84,7 +84,7 @@ } const int minutes = hour * 60 + minute; if (minutes != 0) { - const QByteArray hhmm = twoDigits(qAbs(hour) % 24) + ':' + twoDigits(qAbs(minute)); + const QByteArray hhmm = twoDigits(qAbs(hour)) + ':' + twoDigits(qAbs(minute)); expr = '(' + expr + (minutes > 0 ? '+' : '-') + hhmm + ')'; } return expr; @@ -93,7 +93,7 @@ int Timespan::requiredCapabilities() const { int c = Capability::None; - if ((interval > 0 || begin == end) && !openEnd) { + if ((interval > 0 || pointInTime) && !openEnd) { c |= Capability::PointInTime; } else { c |= Capability::Interval; @@ -118,7 +118,7 @@ QByteArray Timespan::toExpression() const { QByteArray expr = begin.toExpression(false); - if (!(end == begin)) { + if (!pointInTime) { expr += '-' + end.toExpression(true); } if (openEnd) { @@ -133,6 +133,14 @@ return expr; } +Time Timespan::adjustedEnd() const +{ + if (begin == end && !pointInTime) { + return { end.event, end.hour + 24, end.minute }; + } + return end; +} + bool Timespan::operator==(Timespan &other) const { return begin == other.begin && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-21.08.2/src/lib/selectors_p.h new/kopeninghours-21.08.3/src/lib/selectors_p.h --- old/kopeninghours-21.08.2/src/lib/selectors_p.h 2021-10-05 00:08:41.000000000 +0200 +++ new/kopeninghours-21.08.3/src/lib/selectors_p.h 2021-11-02 16:24:56.000000000 +0100 @@ -124,12 +124,14 @@ bool isMultiDay(QDate date, OpeningHoursPrivate *context) const; SelectorResult nextInterval(const Interval &interval, const QDateTime &dt, OpeningHoursPrivate *context) const; QByteArray toExpression() const; + Time adjustedEnd() const; bool operator==(Timespan &other) const; Time begin = { Time::NoEvent, -1, -1 }; Time end = { Time::NoEvent, -1, -1 }; int interval = 0; bool openEnd = false; + bool pointInTime = false; std::unique_ptr<Timespan> next; };
