Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kopeninghours for openSUSE:Factory checked in at 2023-04-23 22:46:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopeninghours (Old) and /work/SRC/openSUSE:Factory/.kopeninghours.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopeninghours" Sun Apr 23 22:46:34 2023 rev:25 rq:1080660 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kopeninghours/kopeninghours.changes 2023-03-03 22:29:45.099606367 +0100 +++ /work/SRC/openSUSE:Factory/.kopeninghours.new.1533/kopeninghours.changes 2023-04-23 22:49:23.167363225 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:46:09 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.04.0/ + +------------------------------------------------------------------- +Fri Mar 31 16:42:18 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:43:55 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- kopeninghours-22.12.3.tar.xz kopeninghours-22.12.3.tar.xz.sig New: ---- kopeninghours-23.04.0.tar.xz kopeninghours-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopeninghours.spec ++++++ --- /var/tmp/diff_new_pack.VYz793/_old 2023-04-23 22:49:24.027368085 +0200 +++ /var/tmp/diff_new_pack.VYz793/_new 2023-04-23 22:49:24.035368130 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: kopeninghours -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: OSM opening hours expression parser and evaluator License: LGPL-2.0-or-later ++++++ kopeninghours-22.12.3.tar.xz -> kopeninghours-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/.codespellrc.license new/kopeninghours-23.04.0/.codespellrc.license --- old/kopeninghours-22.12.3/.codespellrc.license 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/.codespellrc.license 2023-04-12 17:54:31.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2022-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/.gitlab-ci.yml new/kopeninghours-23.04.0/.gitlab-ci.yml --- old/kopeninghours-22.12.3/.gitlab-ci.yml 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/.gitlab-ci.yml 2023-04-12 17:54:31.000000000 +0200 @@ -10,4 +10,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6-dummy.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/.kde-ci.yml new/kopeninghours-23.04.0/.kde-ci.yml --- old/kopeninghours-22.12.3/.kde-ci.yml 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/.kde-ci.yml 2023-04-12 17:54:31.000000000 +0200 @@ -2,11 +2,17 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'Android/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@stable' 'frameworks/ki18n': '@stable' 'frameworks/kholidays': '@stable' +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'Android/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/ki18n': '@latest-kf6' + 'frameworks/kholidays': '@latest-kf6' + Options: require-passing-tests-on: [ 'Linux', 'FreeBSD' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/CMakeLists.txt new/kopeninghours-23.04.0/CMakeLists.txt --- old/kopeninghours-22.12.3/CMakeLists.txt 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/CMakeLists.txt 2023-04-12 17:54:31.000000000 +0200 @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.5) # KDE Application Version, managed by release script -set (RELEASE_SERVICE_VERSION_MAJOR "22") -set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MAJOR "23") +set (RELEASE_SERVICE_VERSION_MINOR "04") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(KOpeningHours VERSION ${RELEASE_SERVICE_VERSION}) @@ -50,12 +50,19 @@ set(REQUIRED_QT_VERSION 5.9) else() set(REQUIRED_QT_VERSION 5.14) # 5.14 for QCalendar + if (QT_MAJOR_VERSION STREQUAL "6") + set(QT_REQUIRED_VERSION "6.4.0") + set(KF_MIN_VERSION "5.240.0") + set(KF_MAJOR_VERSION "6") + else() + set(KF_MAJOR_VERSION "5") + endif() endif() find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core) # 5.14 for QCalendar find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Qml) if (NOT VALIDATOR_ONLY) - find_package(KF5 5.77 REQUIRED COMPONENTS Holidays I18n) + find_package(KF${KF_MAJOR_VERSION} 5.77 REQUIRED COMPONENTS Holidays I18n) endif() if (BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/CMakePresets.json new/kopeninghours-23.04.0/CMakePresets.json --- old/kopeninghours-22.12.3/CMakePresets.json 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/CMakePresets.json 2023-04-12 17:54:31.000000000 +0200 @@ -10,6 +10,18 @@ "hidden": true }, { + "name": "dev-mold", + "displayName": "Build as debug + using mold linker", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold" + }, + "inherits": [ + "base" + ] + }, + { "name": "dev", "displayName": "Build as debug", "cacheVariables": { @@ -152,6 +164,10 @@ "configurePreset": "dev" }, { + "name": "dev-mold", + "configurePreset": "dev-mold" + }, + { "name": "dev-qt6", "configurePreset": "dev-qt6" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/CMakePresets.json.license new/kopeninghours-23.04.0/CMakePresets.json.license --- old/kopeninghours-22.12.3/CMakePresets.json.license 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/CMakePresets.json.license 2023-04-12 17:54:31.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/po/lt/kopeninghours.po new/kopeninghours-23.04.0/po/lt/kopeninghours.po --- old/kopeninghours-22.12.3/po/lt/kopeninghours.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kopeninghours-23.04.0/po/lt/kopeninghours.po 2023-04-12 17:54:31.000000000 +0200 @@ -0,0 +1,155 @@ +# Lithuanian translations for kopeninghours package. +# Copyright (C) 2023 This file is copyright: +# This file is distributed under the same license as the kopeninghours package. +# Automatically generated, 2023. +# +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 02:25+0100\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: lt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" + +#: lib/display.cpp:28 +#, kde-format +msgid "Open" +msgstr "" + +#: lib/display.cpp:28 +#, kde-format +msgid "Open (%1)" +msgstr "" + +#: lib/display.cpp:30 +#, kde-format +msgid "Closed" +msgstr "" + +#: lib/display.cpp:30 +#, kde-format +msgid "Closed (%1)" +msgstr "" + +#: lib/display.cpp:50 +#, kde-format +msgid "Open for one more minute" +msgid_plural "Open for %1 more minutes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:51 +#, kde-format +msgid "Open for one more minute (%2)" +msgid_plural "Open for %1 more minutes (%2)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:54 +#, kde-format +msgid "Currently closed, opens in one minute" +msgid_plural "Currently closed, opens in %1 minutes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: 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] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:68 +#, kde-format +msgid "Open for one more hour" +msgid_plural "Open for %1 more hours" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:69 +#, kde-format +msgid "Open for one more hour (%2)" +msgid_plural "Open for %1 more hours (%2)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:72 +#, kde-format +msgid "Currently closed, opens in one hour" +msgid_plural "Currently closed, opens in %1 hours" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: 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] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:86 +#, kde-format +msgid "Open for one more day" +msgid_plural "Open for %1 more days" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:87 +#, kde-format +msgid "Open for one more day (%2)" +msgid_plural "Open for %1 more days (%2)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:90 +#, kde-format +msgid "Currently closed, opens in one day" +msgid_plural "Currently closed, opens in %1 days" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: 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] "" +msgstr[1] "" +msgstr[2] "" + +#: lib/display.cpp:102 +#, kde-format +msgid "Currently open" +msgstr "" + +#: lib/display.cpp:102 +#, kde-format +msgid "Currently open (%1)" +msgstr "" + +#: lib/display.cpp:104 +#, kde-format +msgid "Currently closed" +msgstr "" + +#: lib/display.cpp:104 +#, kde-format +msgid "Currently closed (%1)" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/po/zh_CN/kopeninghours.po new/kopeninghours-23.04.0/po/zh_CN/kopeninghours.po --- old/kopeninghours-22.12.3/po/zh_CN/kopeninghours.po 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/po/zh_CN/kopeninghours.po 2023-04-12 17:54:31.000000000 +0200 @@ -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: 2023-02-24 12:59\n" +"PO-Revision-Date: 2023-04-10 14:13\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-22.12.3/src/lib/CMakeLists.txt new/kopeninghours-23.04.0/src/lib/CMakeLists.txt --- old/kopeninghours-22.12.3/src/lib/CMakeLists.txt 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/src/lib/CMakeLists.txt 2023-04-12 17:54:31.000000000 +0200 @@ -60,8 +60,8 @@ else() target_link_libraries(KOpeningHours PRIVATE - KF5::Holidays - KF5::I18n + KF${KF_MAJOR_VERSION}::Holidays + KF${KF_MAJOR_VERSION}::I18n ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/src/lib/interval.cpp new/kopeninghours-23.04.0/src/lib/interval.cpp --- old/kopeninghours-22.12.3/src/lib/interval.cpp 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/src/lib/interval.cpp 2023-04-12 17:54:31.000000000 +0200 @@ -149,6 +149,14 @@ d->estimatedEnd = estimatedEnd; } +int Interval::dstOffset() const +{ + if (d->begin.isValid() && estimatedEnd().isValid()) { + return estimatedEnd().offsetFromUtc() - d->begin.offsetFromUtc(); + } + return 0; +} + QDebug operator<<(QDebug debug, const Interval &interval) { QDebugStateSaver saver(debug); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/src/lib/interval.h new/kopeninghours-23.04.0/src/lib/interval.h --- old/kopeninghours-22.12.3/src/lib/interval.h 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/src/lib/interval.h 2023-04-12 17:54:31.000000000 +0200 @@ -32,6 +32,7 @@ Q_PROPERTY(bool hasOpenEndTime READ hasOpenEndTime) Q_PROPERTY(QString comment READ comment) Q_PROPERTY(QDateTime estimatedEnd READ estimatedEnd) + Q_PROPERTY(int dstOffset READ dstOffset) public: Interval(); Interval(const Interval&); @@ -83,6 +84,12 @@ QDateTime estimatedEnd() const; void setEstimatedEnd(const QDateTime &estimatedEnd); + /** Returns the UTC offset change between estimatedEnd() and begin(). + * This is 0, unless there is a DST transition happening in that interval. + * @since 23.04.0 + */ + int dstOffset() const; + /** Check if this interval contains @p dt. */ bool contains(const QDateTime &dt) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/src/lib/openinghours.cpp new/kopeninghours-23.04.0/src/lib/openinghours.cpp --- old/kopeninghours-22.12.3/src/lib/openinghours.cpp 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/src/lib/openinghours.cpp 2023-04-12 17:54:31.000000000 +0200 @@ -355,7 +355,7 @@ // trim trailing spaces // the parser would handle most of this by itself, but fails if a trailing space would produce a trailing rule separator // so it's easier to just clean this here - while (size > 0 && std::isspace(openingHours[size - 1])) { + while (size > 0 && std::isspace(static_cast<unsigned char>(openingHours[size - 1]))) { --size; } if (size == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-22.12.3/tests/example.qml new/kopeninghours-23.04.0/tests/example.qml --- old/kopeninghours-22.12.3/tests/example.qml 2023-02-25 06:11:44.000000000 +0100 +++ new/kopeninghours-23.04.0/tests/example.qml 2023-04-12 17:54:31.000000000 +0200 @@ -48,7 +48,7 @@ return "transparent"; } width: { - var ratio = (interval.estimatedEnd - interval.begin) / (24 * 60 * 60 * 1000); + var ratio = (interval.estimatedEnd - interval.begin + interval.dstOffset * 1000) / (24 * 60 * 60 * 1000); return ratio * (delegateRoot.ListView.view.width - delegateRoot.ListView.view.labelWidth - Kirigami.Units.smallSpacing); } height: Kirigami.Units.gridUnit
