Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2023-03-03 22:25:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitinerary" Fri Mar 3 22:25:23 2023 rev:59 rq:1068832 version:22.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2023-02-04 14:18:34.498592013 +0100 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.31432/kitinerary.changes 2023-03-03 22:26:08.502882223 +0100 @@ -1,0 +2,10 @@ +Tue Feb 28 09:46:08 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 22.12.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/22.12.3/ +- Add GCC 13 compatibility fix (boo#1201089): + * 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch + +------------------------------------------------------------------- Old: ---- kitinerary-22.12.2.tar.xz kitinerary-22.12.2.tar.xz.sig New: ---- 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch kitinerary-22.12.3.tar.xz kitinerary-22.12.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.v34jWN/_old 2023-03-03 22:26:09.134884238 +0100 +++ /var/tmp/diff_new_pack.v34jWN/_new 2023-03-03 22:26:09.138884250 +0100 @@ -1,7 +1,7 @@ # # spec file for package kitinerary # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_without released Name: kitinerary -Version: 22.12.2 +Version: 22.12.3 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later @@ -28,6 +28,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem %if 0%{?suse_version} == 1500 @@ -100,8 +102,7 @@ %check %ctest -%post -n libKPimItinerary5 -p /sbin/ldconfig -%postun -n libKPimItinerary5 -p /sbin/ldconfig +%ldconfig_scriptlets -n libKPimItinerary5 %files %{_kf5_libexecdir}/kitinerary-extractor ++++++ 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch ++++++ >From 0ef772c3e0ff8f049f299ad14b3c65327e4fe69e Mon Sep 17 00:00:00 2001 From: Sam James <[email protected]> Date: Sun, 11 Dec 2022 13:29:11 +0000 Subject: [PATCH] asn1: Fix build with GCC 13 (add missing <cstdint> include) GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so <cstdint> is no longer transitively included. Explicitly include <cstdint> for uint8_t. Bug: https://bugs.gentoo.org/885423 --- src/lib/asn1/bitvectorview.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/asn1/bitvectorview.h b/src/lib/asn1/bitvectorview.h index 5a4da315..f924a1fe 100644 --- a/src/lib/asn1/bitvectorview.h +++ b/src/lib/asn1/bitvectorview.h @@ -8,6 +8,7 @@ #include <bitset> #include <cassert> +#include <cstdint> #include <string_view> #include <type_traits> -- 2.39.2 ++++++ kitinerary-22.12.2.tar.xz -> kitinerary-22.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/CMakeLists.txt new/kitinerary-22.12.3/CMakeLists.txt --- old/kitinerary-22.12.2/CMakeLists.txt 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/CMakeLists.txt 2023-02-25 06:06:33.000000000 +0100 @@ -3,7 +3,7 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.22.2") +set(PIM_VERSION "5.22.3") project(KItinerary VERSION ${PIM_VERSION}) set(KF5_MIN_VERSION "5.91.0") @@ -41,8 +41,8 @@ find_package(SharedMimeInfo 1.3 REQUIRED) endif() -set(KMIME_VERSION "5.22.2") -set(PIM_PKPASS "5.22.2") +set(KMIME_VERSION "5.22.3") +set(PIM_PKPASS "5.22.3") find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED) find_package(KPimPkPass ${PIM_PKPASS} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/po/de/kitinerary.po new/kitinerary-22.12.3/po/de/kitinerary.po --- old/kitinerary-22.12.2/po/de/kitinerary.po 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/po/de/kitinerary.po 2023-02-25 06:06:33.000000000 +0100 @@ -1,12 +1,12 @@ # Burkhard Lück <[email protected]>, 2018, 2019, 2020, 2021. -# Frederik Schwarzer <[email protected]>, 2021, 2022. +# Frederik Schwarzer <[email protected]>, 2021, 2022, 2023. # Frank Steinmetzger <[email protected]>, 2022. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-07-20 00:46+0000\n" -"PO-Revision-Date: 2022-07-23 23:16+0200\n" +"PO-Revision-Date: 2023-02-09 01:31+0100\n" "Last-Translator: Frederik Schwarzer <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" @@ -14,7 +14,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 22.07.70\n" +"X-Generator: Lokalize 22.12.1\n" #: calendarhandler.cpp:160 #, kde-format @@ -98,7 +98,7 @@ #: calendarhandler.cpp:319 #, kde-format msgid "Ticket number: %1" -msgstr "" +msgstr "Fahrkartennummer: %1" #: calendarhandler.cpp:329 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/po/pt_BR/kitinerary.po new/kitinerary-22.12.3/po/pt_BR/kitinerary.po --- old/kitinerary-22.12.2/po/pt_BR/kitinerary.po 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/po/pt_BR/kitinerary.po 2023-02-25 06:06:33.000000000 +0100 @@ -2,22 +2,22 @@ # Copyright (C) 2018-2020 This file is copyright: # This file is distributed under the same license as the kitinerary package. # -# Luiz Fernando Ranghetti <[email protected]>, 2018, 2019, 2020, 2021. +# Luiz Fernando Ranghetti <[email protected]>, 2018, 2019, 2020, 2021, 2023. # André Marcelo Alvarenga <[email protected]>, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kitinerary\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-07-20 00:46+0000\n" -"PO-Revision-Date: 2021-07-22 14:58-0300\n" +"PO-Revision-Date: 2023-02-14 09:22-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" -"Language-Team: Brazilian Portuguese <[email protected]>\n" +"Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\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 21.04.3\n" +"X-Generator: Lokalize 21.12.3\n" #: calendarhandler.cpp:160 #, kde-format @@ -94,15 +94,14 @@ msgstr "Ãnibus %1 de %2 para %3" #: calendarhandler.cpp:306 -#, fuzzy, kde-format -#| msgid "Train %1 from %2 to %3" +#, kde-format msgid "Ferry from %1 to %2" -msgstr "Trem %1 de %2 para %3" +msgstr "Balsa de %1 para %2" #: calendarhandler.cpp:319 #, kde-format msgid "Ticket number: %1" -msgstr "" +msgstr "Número da passagem: %1" #: calendarhandler.cpp:329 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/po/zh_CN/kitinerary.po new/kitinerary-22.12.3/po/zh_CN/kitinerary.po --- old/kitinerary-22.12.2/po/zh_CN/kitinerary.po 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/po/zh_CN/kitinerary.po 2023-02-25 06:06:33.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-07-20 00:46+0000\n" -"PO-Revision-Date: 2023-01-15 15:27\n" +"PO-Revision-Date: 2023-02-24 12:58\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/cli/org.kde.kitinerary-extractor.appdata.xml new/kitinerary-22.12.3/src/cli/org.kde.kitinerary-extractor.appdata.xml --- old/kitinerary-22.12.2/src/cli/org.kde.kitinerary-extractor.appdata.xml 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/src/cli/org.kde.kitinerary-extractor.appdata.xml 2023-02-25 06:06:33.000000000 +0100 @@ -116,9 +116,9 @@ <binary>kitinerary-extractor</binary> </provides> <releases> + <release version="5.22.3" date="2023-03-02"/> <release version="5.22.2" date="2023-02-02"/> <release version="5.22.1" date="2023-01-05"/> <release version="5.22.0" date="2022-12-08"/> - <release version="5.21.3" date="2022-11-03"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/lib/processors/pkpassdocumentprocessor.cpp new/kitinerary-22.12.3/src/lib/processors/pkpassdocumentprocessor.cpp --- old/kitinerary-22.12.2/src/lib/processors/pkpassdocumentprocessor.cpp 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/src/lib/processors/pkpassdocumentprocessor.cpp 2023-02-25 06:06:33.000000000 +0100 @@ -146,6 +146,15 @@ continue; } } + // departure time + if (!flight.departureTime().isValid() && field.key().contains(QLatin1String("departure"), Qt::CaseInsensitive)) { + const auto time = QTime::fromString(field.value().toString()); + if (time.isValid()) { + // this misses date, but the postprocessor will fill that in + flight.setDepartureTime(QDateTime(QDate(1, 1, 1), time)); + continue; + } + } } // "relevantDate" is the best guess for the boarding time if we didn't find an explicit field for it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/lib/scripts/extractors.qrc new/kitinerary-22.12.3/src/lib/scripts/extractors.qrc --- old/kitinerary-22.12.2/src/lib/scripts/extractors.qrc 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/src/lib/scripts/extractors.qrc 2023-02-25 06:06:33.000000000 +0100 @@ -165,6 +165,8 @@ <file>terminland-de.js</file> <file>thalys.json</file> <file>thalys.js</file> + <file>ticketio.json</file> + <file>ticketio.js</file> <file>ticketmaster.json</file> <file>ticketmaster.js</file> <file>tierparkberlin.json</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/lib/scripts/flixbus.js new/kitinerary-22.12.3/src/lib/scripts/flixbus.js --- old/kitinerary-22.12.2/src/lib/scripts/flixbus.js 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/src/lib/scripts/flixbus.js 2023-02-25 06:06:33.000000000 +0100 @@ -23,7 +23,7 @@ function parseDate(year, baseDate, overrideDate, time) { const s = (overrideDate ? overrideDate.trim() : baseDate) + ' ' + year + ' ' + time; - return JsonLd.toDateTime(s, 'd MMM yyyy hh:mm', ['en', 'fr', 'pl']); + return JsonLd.toDateTime(s, 'd MMM yyyy hh:mm', ['en', 'fr', 'pl', 'nl']); } function parseLocation(place, addr1, addr2, links) @@ -45,33 +45,36 @@ const links = page.linksInRect(0.0, 0.0, 0.5, 0.5); const resNum = triggerNode.content.match(/pdfqr\/(\d+)\//)[1]; const date = text.match(/^\S+,? (\d+ \S+) (\d{4})\n/); - let idx = date.index + date[0].length; + + const timeColumn = page.textInRect(0.0, 0.1, 0.125, 0.5); + const stationColumn = page.textInRect(0.125, 0.1, 0.5, 0.5); + + let idxTime = 0; + let idxStations = 0; let reservations = []; while (true) { - const dep = text.substr(idx).match(/(\d\d:\d\d) +(.*)\n(\d{1,2} \S+)?(?: + (.*?)(?:\n|,\n +(.*)\n))?/); - if (!dep) break; - idx += dep.index + dep[0].length; - const bus = text.substr(idx).match(/^[ î¡]+ (?:Bus|Autobus) +(.*)\n[ î¡]+(?:Direction|à destination de|Kierunek) (.*)\n/); - if (!bus) break; - idx += bus.index + bus[0].length; - const arr = text.substr(idx).match(/^(\d{1,2} \S+\n)?(\d\d:\d\d) +(.*)\n(?: + (.*?)(?:\n|,\n +(.*)\n))?/); - if (!arr) break; - idx += arr.index + arr[0].length; + const times = timeColumn.substr(idxTime).match(/(\d\d:\d\d)\n([^:]*?\n)?([^:]*?\n)?(\d\d:\d\d)/); + const stations = stationColumn.substr(idxStations).match(/(.*)\n[î¤»î¥ ]+(.*)(?:\n|,\n +(.*)\n).*(?:Bus|Autobus) +(.*)\n.*(?:Direction|à destination de|Kierunek|richting) (.*)\n(.*)\n(?:[î¤»î¥ ]+(.*?)(?:\n|,\n +(.*)\n))?/); + if (!times || !stations) { + break; + } + idxTime += times.index + times[0].length; + idxStations += stations.index + stations[0].length; let res = JsonLd.newBusReservation(); res.reservationNumber = resNum; res.reservedTicket.ticketToken = 'qrCode:' + triggerNode.content; - res.reservationFor.departureTime = parseDate(date[2], date[1], dep[3], dep[1]); - res.reservationFor.departureBusStop.name = dep[2]; - parseLocation(res.reservationFor.departureBusStop, dep[4], dep[5], links); - - res.reservationFor.busNumber = bus[1]; - res.reservationFor.busName = bus[2]; - - res.reservationFor.arrivalTime = parseDate(date[2], date[1], arr[1], arr[2]); - res.reservationFor.arrivalBusStop.name = arr[3]; - parseLocation(res.reservationFor.arrivalBusStop, arr[4], arr[5], links); + res.reservationFor.departureTime = parseDate(date[2], date[1], times[3] ? times[2] : null, times[1]); + res.reservationFor.departureBusStop.name = stations[1]; + parseLocation(res.reservationFor.departureBusStop, stations[2], stations[3], links); + + res.reservationFor.busNumber = stations[4]; + res.reservationFor.busName = stations[5]; + + res.reservationFor.arrivalTime = parseDate(date[2], date[1], times[3] ? times[3] : times[2], times[4]); + res.reservationFor.arrivalBusStop.name = stations[6]; + parseLocation(res.reservationFor.arrivalBusStop, stations[7], stations[8], links); reservations.push(res); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/lib/scripts/gwr.js new/kitinerary-22.12.3/src/lib/scripts/gwr.js --- old/kitinerary-22.12.2/src/lib/scripts/gwr.js 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/src/lib/scripts/gwr.js 2023-02-25 06:06:33.000000000 +0100 @@ -12,6 +12,5 @@ res.reservationFor.departureStation.identifier = 'uk:' + trip[2]; res.reservationFor.arrivalStation.name = trip[3]; res.reservationFor.arrivalStation.identifier = 'uk:' + trip[4]; - res.reservationNumber = event.description.match(/Booking Reference: (.*)\n/)[1]; return res; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/lib/scripts/nationalrail.js new/kitinerary-22.12.3/src/lib/scripts/nationalrail.js --- old/kitinerary-22.12.2/src/lib/scripts/nationalrail.js 2023-01-31 20:38:12.000000000 +0100 +++ new/kitinerary-22.12.3/src/lib/scripts/nationalrail.js 2023-02-25 06:06:33.000000000 +0100 @@ -30,7 +30,7 @@ res.reservedTicket.ticketedSeat.seatNumber = seat[4]; } - res.reservationMumber = text.match(/Ticket Number (.*)/)[1]; + res.reservationNumber = text.match(/Ticket Number (.*)/)[1]; res.reservedTicket.ticketToken = 'aztec:' + triggerNode.content; return res; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/lib/scripts/ticketio.js new/kitinerary-22.12.3/src/lib/scripts/ticketio.js --- old/kitinerary-22.12.2/src/lib/scripts/ticketio.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kitinerary-22.12.3/src/lib/scripts/ticketio.js 2023-02-25 06:06:33.000000000 +0100 @@ -0,0 +1,17 @@ +/* + SPDX-FileCopyrightText: 2023 Volker Krause <[email protected]> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +function parsePass(pass, node) { + let res = node.result[0]; + res.reservationFor.name = pass.field['eventtitle'].value; + const addr = pass.field['address'].value.split('\n'); + res.reservationFor.location.name = addr[0]; + res.reservationFor.location.address = { + '@type': 'PostalAddress', + streetAddress: addr[1], + addressLocality: addr[2] + }; + return res; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-22.12.2/src/lib/scripts/ticketio.json new/kitinerary-22.12.3/src/lib/scripts/ticketio.json --- old/kitinerary-22.12.2/src/lib/scripts/ticketio.json 1970-01-01 01:00:00.000000000 +0100 +++ new/kitinerary-22.12.3/src/lib/scripts/ticketio.json 2023-02-25 06:06:33.000000000 +0100 @@ -0,0 +1,13 @@ +{ + "filter": [ + { + "field": "passTypeIdentifier", + "match": "pass.io.ticket", + "mimeType": "application/vnd.apple.pkpass", + "scope": "Current" + } + ], + "function": "parsePass", + "mimeType": "application/vnd.apple.pkpass", + "script": "ticketio.js" +}
