Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kopeninghours for openSUSE:Factory checked in at 2024-12-13 22:36:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopeninghours (Old) and /work/SRC/openSUSE:Factory/.kopeninghours.new.29675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopeninghours" Fri Dec 13 22:36:26 2024 rev:45 rq:1230475 version:24.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kopeninghours/kopeninghours.changes 2024-11-08 12:02:38.097607815 +0100 +++ /work/SRC/openSUSE:Factory/.kopeninghours.new.29675/kopeninghours.changes 2024-12-13 22:38:37.190771423 +0100 @@ -1,0 +2,26 @@ +Sun Dec 8 09:28:00 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 24.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.12.0/ +- No code change since 24.11.90 + +------------------------------------------------------------------- +Mon Dec 2 08:43:29 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 24.11.90 + * New feature release +- No code change since 24.11.80 + +------------------------------------------------------------------- +Sat Nov 16 17:30:08 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 24.11.80 + * New feature release +- Changes since 24.08.3: + * Fix reproducible builds + * Port QML value types to declarative type registration + * Make QML bindings Qt6-only and use declarative type registration + +------------------------------------------------------------------- Old: ---- kopeninghours-24.08.3.tar.xz kopeninghours-24.08.3.tar.xz.sig New: ---- kopeninghours-24.12.0.tar.xz kopeninghours-24.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopeninghours.spec ++++++ --- /var/tmp/diff_new_pack.LY9l8j/_old 2024-12-13 22:38:40.354903308 +0100 +++ /var/tmp/diff_new_pack.LY9l8j/_new 2024-12-13 22:38:40.358903474 +0100 @@ -16,12 +16,12 @@ # -%define kf6_version 6.3.0 +%define kf6_version 6.6.0 %define qt6_version 6.6.0 %bcond_without released Name: kopeninghours -Version: 24.08.3 +Version: 24.12.0 Release: 0 Summary: OSM opening hours expression parser and evaluator License: LGPL-2.0-or-later ++++++ kopeninghours-24.08.3.tar.xz -> kopeninghours-24.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/CMakeLists.txt new/kopeninghours-24.12.0/CMakeLists.txt --- old/kopeninghours-24.08.3/CMakeLists.txt 2024-10-31 00:03:03.000000000 +0100 +++ new/kopeninghours-24.12.0/CMakeLists.txt 2024-12-03 00:07:33.000000000 +0100 @@ -5,8 +5,8 @@ # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "24") -set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MINOR "12") +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}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/po/fi/kopeninghours.po new/kopeninghours-24.12.0/po/fi/kopeninghours.po --- old/kopeninghours-24.08.3/po/fi/kopeninghours.po 2024-10-31 00:03:03.000000000 +0100 +++ new/kopeninghours-24.12.0/po/fi/kopeninghours.po 2024-12-03 00:07:33.000000000 +0100 @@ -15,7 +15,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 21.12.3\n" #: lib/display.cpp:28 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/src/CMakeLists.txt new/kopeninghours-24.12.0/src/CMakeLists.txt --- old/kopeninghours-24.08.3/src/CMakeLists.txt 2024-10-31 00:03:03.000000000 +0100 +++ new/kopeninghours-24.12.0/src/CMakeLists.txt 2024-12-03 00:07:33.000000000 +0100 @@ -4,6 +4,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kopeninghours\") add_subdirectory(lib) -if (TARGET Qt::Qml AND NOT VALIDATOR_ONLY) +if (TARGET Qt6::Qml AND NOT VALIDATOR_ONLY) add_subdirectory(qml) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/src/lib/CMakeLists.txt new/kopeninghours-24.12.0/src/lib/CMakeLists.txt --- old/kopeninghours-24.08.3/src/lib/CMakeLists.txt 2024-10-31 00:03:03.000000000 +0100 +++ new/kopeninghours-24.12.0/src/lib/CMakeLists.txt 2024-12-03 00:07:33.000000000 +0100 @@ -6,12 +6,13 @@ openinghourslexer.l ${CMAKE_CURRENT_BINARY_DIR}/openinghourslexer.cpp DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/openinghoursscanner_p.h - COMPILE_FLAGS "--nounistd" + COMPILE_FLAGS "--nounistd --noline" ) bison_target(openinghoursparser openinghoursparser.y ${CMAKE_CURRENT_BINARY_DIR}/openinghoursparser.cpp DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/openinghoursparser_p.h + COMPILE_FLAGS "--no-lines" ) add_flex_bison_dependency(openinghoursscanner openinghoursparser) set_source_files_properties(${BISON_openinghoursparser_OUTPUTS} ${FLEX_openinghoursscanner_OUTPUTS} PROPERTIES SKIP_AUTOMOC ON) @@ -46,6 +47,10 @@ generate_export_header(KOpeningHours BASE_NAME KOpeningHours) +if (TARGET Qt6::Qml) + qt_extract_metatypes(KOpeningHours) +endif() + set_target_properties(KOpeningHours PROPERTIES VERSION ${KOPENINGHOURS_VERSION_STRING} SOVERSION ${KOPENINGHOURS_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/src/qml/CMakeLists.txt new/kopeninghours-24.12.0/src/qml/CMakeLists.txt --- old/kopeninghours-24.08.3/src/qml/CMakeLists.txt 2024-10-31 00:03:03.000000000 +0100 +++ new/kopeninghours-24.12.0/src/qml/CMakeLists.txt 2024-12-03 00:07:33.000000000 +0100 @@ -2,9 +2,16 @@ # SPDX-License-Identifier: BSD-3-Clause include(ECMQmlModule) -ecm_add_qml_module(kopeninghoursqmlplugin URI org.kde.kopeninghours) +ecm_add_qml_module(kopeninghoursqmlplugin + URI "org.kde.kopeninghours" + VERSION 1.0 + NO_GENERATE_PLUGIN_SOURCE +) -target_sources(kopeninghoursqmlplugin PRIVATE kopeninghoursqmlplugin.cpp) +target_sources(kopeninghoursqmlplugin PRIVATE + kopeninghoursqmlplugin.cpp + types.h +) target_link_libraries(kopeninghoursqmlplugin PRIVATE Qt::Qml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/src/qml/kopeninghoursqmlplugin.cpp new/kopeninghours-24.12.0/src/qml/kopeninghoursqmlplugin.cpp --- old/kopeninghours-24.08.3/src/qml/kopeninghoursqmlplugin.cpp 2024-10-31 00:03:03.000000000 +0100 +++ new/kopeninghours-24.12.0/src/qml/kopeninghoursqmlplugin.cpp 2024-12-03 00:07:33.000000000 +0100 @@ -6,7 +6,6 @@ #include <KOpeningHours/Display> #include <KOpeningHours/Interval> -#include <KOpeningHours/IntervalModel> #include <KOpeningHours/OpeningHours> #include <QCoreApplication> @@ -38,15 +37,6 @@ void KOpeningHoursQmlPlugin::registerTypes(const char*) { - qRegisterMetaType<KOpeningHours::Interval>(); - qRegisterMetaType<KOpeningHours::OpeningHours>(); - qRegisterMetaType<KOpeningHours::OpeningHours::Modes>(); - - qmlRegisterUncreatableMetaObject(KOpeningHours::Interval::staticMetaObject, "org.kde.kopeninghours", 1, 0, "Interval", {}); - qmlRegisterUncreatableMetaObject(KOpeningHours::OpeningHours::staticMetaObject, "org.kde.kopeninghours", 1, 0, "OpeningHours", {}); - - qmlRegisterType<KOpeningHours::IntervalModel>("org.kde.kopeninghours", 1, 0, "IntervalModel"); - // HACK qmlplugindump chokes on gadget singletons, to the point of breaking ecm_find_qmlmodule() if (QCoreApplication::applicationName() != QLatin1String("qmlplugindump")) { qmlRegisterSingletonType("org.kde.kopeninghours", 1, 0, "OpeningHoursParser", [](QQmlEngine*, QJSEngine *engine) -> QJSValue { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/src/qml/types.h new/kopeninghours-24.12.0/src/qml/types.h --- old/kopeninghours-24.08.3/src/qml/types.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kopeninghours-24.12.0/src/qml/types.h 2024-12-03 00:07:33.000000000 +0100 @@ -0,0 +1,51 @@ +/* + SPDX-FileCopyrightText: 2020 Volker Krause <vkra...@kde.org> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +#ifndef KOPENINGHOURS_QMLPLUGIN_TYPES_H +#define KOPENINGHOURS_QMLPLUGIN_TYPES_H + +#include <KOpeningHours/Interval> +#include <KOpeningHours/IntervalModel> +#include <KOpeningHours/OpeningHours> + +#include <QQmlEngine> + +struct IntervalForeign { + Q_GADGET + QML_FOREIGN(KOpeningHours::Interval) + QML_VALUE_TYPE(interval) +}; + +class IntervalEnums : public KOpeningHours::Interval { + Q_GADGET +}; +namespace IntervalEnumsForeign { + Q_NAMESPACE + QML_NAMED_ELEMENT(Interval) + QML_FOREIGN_NAMESPACE(IntervalEnums) +} + +struct InvervalModelForeign { + Q_GADGET + QML_FOREIGN(KOpeningHours::IntervalModel) + QML_NAMED_ELEMENT(IntervalModel) +}; + +struct OpeningHoursForeign { + Q_GADGET + QML_FOREIGN(KOpeningHours::OpeningHours) + QML_VALUE_TYPE(openingHours) +}; + +class OpeningHoursEnums : public KOpeningHours::OpeningHours { + Q_GADGET +}; +namespace OpeningHoursEnumsForeign { + Q_NAMESPACE + QML_NAMED_ELEMENT(OpeningHours) + QML_FOREIGN_NAMESPACE(OpeningHoursEnums) +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kopeninghours-24.08.3/tests/example.qml new/kopeninghours-24.12.0/tests/example.qml --- old/kopeninghours-24.08.3/tests/example.qml 2024-10-31 00:03:03.000000000 +0100 +++ new/kopeninghours-24.12.0/tests/example.qml 2024-12-03 00:07:33.000000000 +0100 @@ -23,21 +23,26 @@ id: openingHoursDelegate Item { id: delegateRoot - property var dayData: model + + required property bool isToday + required property string shortDayName + required property var intervals + required property date dayBegin + implicitHeight: row.implicitHeight Row { id: row QQC2.Label { - text: dayData.shortDayName + text: delegateRoot.shortDayName width: delegateRoot.ListView.view.labelWidth + Kirigami.Units.smallSpacing Component.onCompleted: delegateRoot.ListView.view.labelWidth = Math.max(delegateRoot.ListView.view.labelWidth, implicitWidth) - font.italic: dayData.isToday + font.italic: delegateRoot.isToday } Repeater { - model: dayData.intervals + model: delegateRoot.intervals Rectangle { id: intervalBox - property var interval: modelData + property interval interval: modelData color: { switch (interval.state) { case Interval.Open: return Kirigami.Theme.positiveBackgroundColor; @@ -70,7 +75,7 @@ } Rectangle { id: nowMarker - property double position: (Date.now() - dayData.dayBegin) / (24 * 60 * 60 * 1000) + property double position: (Date.now() - delegateRoot.dayBegin) / (24 * 60 * 60 * 1000) visible: position >= 0.0 && position < 1.0 color: Kirigami.Theme.textColor width: 2
