Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2022-03-04 20:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitinerary" Fri Mar 4 20:14:50 2022 rev:45 rq:958865 version:21.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2022-02-04 21:47:36.337118871 +0100 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.1958/kitinerary.changes 2022-03-04 20:15:33.424802941 +0100 @@ -1,0 +2,13 @@ +Tue Mar 1 09:57:19 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 21.12.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.12.3/ +- Changes since 21.12.2: + * Don't pass PDFDoc arguments that Poppler already has the same defaults for + * Ignore more files for cppcheck that hang the latest version on the CI + * Add basic Air France PDF ticket extractor + * Reduce the lower size threshold for 2D barcodes + +------------------------------------------------------------------- Old: ---- kitinerary-21.12.2.tar.xz kitinerary-21.12.2.tar.xz.sig New: ---- kitinerary-21.12.3.tar.xz kitinerary-21.12.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.ZmEGx6/_old 2022-03-04 20:15:34.276802754 +0100 +++ /var/tmp/diff_new_pack.ZmEGx6/_new 2022-03-04 20:15:34.284802753 +0100 @@ -18,7 +18,7 @@ %bcond_without released Name: kitinerary -Version: 21.12.2 +Version: 21.12.3 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later ++++++ kitinerary-21.12.2.tar.xz -> kitinerary-21.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/.kde-ci.yml new/kitinerary-21.12.3/.kde-ci.yml --- old/kitinerary-21.12.2/.kde-ci.yml 2022-01-29 00:31:44.000000000 +0100 +++ new/kitinerary-21.12.3/.kde-ci.yml 2022-02-27 19:40:53.000000000 +0100 @@ -16,3 +16,5 @@ cppcheck-ignore-files: - 'src/lib/knowledgedb/countrydb.cpp' - 'src/lib/knowledgedb/countrydb_data.cpp' + - 'src/lib/knowledgedb/trainstationdb.cpp' + - 'src/lib/knowledgedb/trainstationdb_data.cpp' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/CMakeLists.txt new/kitinerary-21.12.3/CMakeLists.txt --- old/kitinerary-21.12.2/CMakeLists.txt 2022-01-29 00:31:44.000000000 +0100 +++ new/kitinerary-21.12.3/CMakeLists.txt 2022-02-27 19:40:53.000000000 +0100 @@ -3,7 +3,7 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.19.2") +set(PIM_VERSION "5.19.3") project(KItinerary VERSION ${PIM_VERSION}) set(KF5_MIN_VERSION "5.87.0") @@ -40,8 +40,8 @@ find_package(SharedMimeInfo 1.3 REQUIRED) endif() -set(KMIME_VERSION "5.19.2") -set(PIM_PKPASS "5.19.2") +set(KMIME_VERSION "5.19.3") +set(PIM_PKPASS "5.19.3") find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/po/ar/kitinerary.po new/kitinerary-21.12.3/po/ar/kitinerary.po --- old/kitinerary-21.12.2/po/ar/kitinerary.po 2022-02-01 01:16:37.000000000 +0100 +++ new/kitinerary-21.12.3/po/ar/kitinerary.po 2022-03-01 01:18:49.000000000 +0100 @@ -2,13 +2,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Safa Alfulaij <[email protected]>, 2018. +# Zayed Al-Saidi <[email protected]>, 2022. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-15 00:19+0000\n" -"PO-Revision-Date: 2018-08-07 21:25+0300\n" -"Last-Translator: Safa Alfulaij <[email protected]>\n" +"PO-Revision-Date: 2022-02-19 20:52+0400\n" +"Last-Translator: Zayed Al-Saidi <[email protected]>\n" "Language-Team: Arabic <[email protected]>\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -16,14 +17,13 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.07.70\n" #: calendarhandler.cpp:188 -#, fuzzy, kde-format -#| msgid "Coach: %1" +#, kde-format msgctxt "canceled train/flight/loading reservation" msgid "Canceled: %1" -msgstr "??????????????: %1" +msgstr "???? ??????????: %1" #: calendarhandler.cpp:218 #, kde-format @@ -46,11 +46,10 @@ msgstr "?????? ????????????: %1" #: calendarhandler.cpp:251 -#, fuzzy, kde-format -#| msgid "Departure gate: %1" +#, kde-format msgctxt "flight departure gate" msgid "Departure gate: %1" -msgstr "?????????? ??????????????: %1" +msgstr "?????????? ????????????????: %1" #: calendarhandler.cpp:261 #, kde-format @@ -102,55 +101,52 @@ #: calendarhandler.cpp:348 #, kde-format msgid "Check-in: %1" -msgstr "" +msgstr "?????????? ????????????: %1" #: calendarhandler.cpp:351 #, kde-format msgid "Check-out: %1" -msgstr "" +msgstr "?????????? ????????????: %1" #: calendarhandler.cpp:354 #, kde-format msgid "Phone: %1" -msgstr "" +msgstr "????????????: %1" #: calendarhandler.cpp:357 #, kde-format msgid "Email: %1" -msgstr "" +msgstr "???????????? ????????????????????: %1" #: calendarhandler.cpp:360 -#, fuzzy, kde-format -#| msgid "Seat: %1" +#, kde-format msgid "Website: %1" -msgstr "????????????: %1" +msgstr "???????? ????????????: %1" #: calendarhandler.cpp:403 #, kde-format msgid "Entrance for %1" -msgstr "" +msgstr "???????? ????%1" #: calendarhandler.cpp:451 -#, fuzzy, kde-format -#| msgid "Hotel reservation: %1" +#, kde-format msgid "Restaurant reservation: %1" -msgstr "?????? ????????????: %1" +msgstr "?????? ????????: %1" #: calendarhandler.cpp:465 #, kde-format msgid "Number of people: %1" -msgstr "" +msgstr "?????? ??????????????: %1" #: calendarhandler.cpp:472 calendarhandler.cpp:504 #, kde-format msgid "Under name: %1" -msgstr "" +msgstr "?????? ??????: %1" #: calendarhandler.cpp:482 -#, fuzzy, kde-format -#| msgid "Hotel reservation: %1" +#, kde-format msgid "Rental car reservation: %1" -msgstr "?????? ????????????: %1" +msgstr "?????? ?????????? ??????????????: %1" #: calendarhandler.cpp:493 #, kde-format @@ -158,6 +154,8 @@ "Pickup location: %1\n" "%2\n" msgstr "" +"???????? ???????????????? : %1\n" +"%2\n" #: calendarhandler.cpp:497 #, kde-format @@ -165,6 +163,8 @@ "Dropoff location: %1\n" "%2\n" msgstr "" +"???????? ??????????: %1\n" +"%2\n" #: calendarhandler.cpp:526 #, kde-format @@ -173,6 +173,9 @@ "Under name: %2\n" "Pickup location: %3" msgstr "" +"?????? ??????????: %1\n" +"?????? ??????: %2\n" +"???????? ???????????? : %3" #, fuzzy #~| msgid "Booking reference: %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/po/zh_CN/kitinerary.po new/kitinerary-21.12.3/po/zh_CN/kitinerary.po --- old/kitinerary-21.12.2/po/zh_CN/kitinerary.po 2022-02-01 01:16:37.000000000 +0100 +++ new/kitinerary-21.12.3/po/zh_CN/kitinerary.po 2022-03-01 01:18:49.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-15 00:19+0000\n" -"PO-Revision-Date: 2022-01-08 15:25\n" +"PO-Revision-Date: 2022-02-26 05:18\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-21.12.2/src/cli/org.kde.kitinerary-extractor.appdata.xml new/kitinerary-21.12.3/src/cli/org.kde.kitinerary-extractor.appdata.xml --- old/kitinerary-21.12.2/src/cli/org.kde.kitinerary-extractor.appdata.xml 2022-01-29 00:31:44.000000000 +0100 +++ new/kitinerary-21.12.3/src/cli/org.kde.kitinerary-extractor.appdata.xml 2022-02-27 19:40:53.000000000 +0100 @@ -101,9 +101,9 @@ <binary>kitinerary-extractor</binary> </provides> <releases> + <release version="5.19.3" date="2022-03-03"/> <release version="5.19.2" date="2022-02-03"/> <release version="5.19.1" date="2022-01-06"/> <release version="5.19.0" date="2021-12-09"/> - <release version="5.18.3" date="2021-11-04"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/src/lib/barcodedecoder.cpp new/kitinerary-21.12.3/src/lib/barcodedecoder.cpp --- old/kitinerary-21.12.2/src/lib/barcodedecoder.cpp 2022-01-29 00:31:44.000000000 +0100 +++ new/kitinerary-21.12.3/src/lib/barcodedecoder.cpp 2022-02-27 19:40:53.000000000 +0100 @@ -29,7 +29,7 @@ enum { // unit is pixels, assuming landscape orientation MinSourceImageHeight = 10, - MinSourceImageWidth = 30, + MinSourceImageWidth = 26, // OEBB uses 1044x1044 for its UIC 918.3 Aztec code MaxSourceImageHeight = 1100, // TODO what's a realistic value here? MaxSourceImageWidth = 2000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/src/lib/pdf/pdfdocument.cpp new/kitinerary-21.12.3/src/lib/pdf/pdfdocument.cpp --- old/kitinerary-21.12.2/src/lib/pdf/pdfdocument.cpp 2022-01-29 00:31:44.000000000 +0100 +++ new/kitinerary-21.12.3/src/lib/pdf/pdfdocument.cpp 2022-02-27 19:40:53.000000000 +0100 @@ -301,7 +301,7 @@ obj.initNull(); auto stream = new MemStream(const_cast<char*>(doc->d->m_pdfData.constData()), 0, doc->d->m_pdfData.size(), &obj); #endif - std::unique_ptr<PDFDoc> popplerDoc(new PDFDoc(stream, nullptr, nullptr)); + std::unique_ptr<PDFDoc> popplerDoc(new PDFDoc(stream)); if (!popplerDoc->isOk()) { qCWarning(Log) << "Got invalid PDF document!" << popplerDoc->getErrorCode(); return nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/src/lib/scripts/airfrance.js new/kitinerary-21.12.3/src/lib/scripts/airfrance.js --- old/kitinerary-21.12.2/src/lib/scripts/airfrance.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kitinerary-21.12.3/src/lib/scripts/airfrance.js 2022-02-27 19:40:53.000000000 +0100 @@ -0,0 +1,53 @@ +/* + SPDX-FileCopyrightText: 2022 Volker Krause <[email protected]> + SPDX-License-Identifier: LGPL-2.0-or-later +*/ + +function parseTicket(content, node, triggerNode) { + const text = content.text; + const ref = text.match(/R??SERVATION +([A-Z0-9]{6})\n/)[1]; + + // not really a valid IATA BCBP, but we can use parts of it at least + const bcbp = triggerNode.content.substr(0, 22).match(/^M(\d)([^\/]+)\/(.*) */); + var person = JsonLd.newObject("Person"); + person.familyName = bcbp[2]; + person.givenName = bcbp[3]; + + var reservations = []; + var idx = 0; + while (true) { + const leg = text.substr(idx).match(/(\d\d:\d\d) *(\d\d:\d\d)(?:.*)?\n *(\d\d[A-Z]{3}) +(.*?) +(.*?) +([A-Z0-9]{2}\d{4}).*\n *([A-Z]{3}) +([A-Z]{3}).*\n.*?(?: +Si??ge\/Seat : ([0-9A-Z]+))?\n(?:.*\n)?.*Flight operated by (.*)\n/); + if (!leg) { + break; + } + idx += leg.index + leg[0].length; + + var res; + if (leg[10] == 'SNCF') { + res = JsonLd.newTrainReservation(); + res.reservationFor.departureStation.name = leg[4]; + res.reservationFor.departureStation.identifier = 'iata:' + leg[7]; + res.reservationFor.arrivalStation.name = leg[5]; + res.reservationFor.arrivalStation.identifier = 'iata:' + leg[8]; + res.reservationFor.trainNumber = leg[6]; + res.reservationFor.provider.name = leg[10]; + } else { + res = JsonLd.newFlightReservation(); + res.reservationFor.departureAirport.name = leg[4]; + res.reservationFor.departureAirport.iataCode = leg[7]; + res.reservationFor.arrivalAirport.name = leg[5]; + res.reservationFor.arrivalAirport.iataCode = leg[8]; + res.reservationFor.flightNumber = leg[6]; + res.reservationFor.airline.name = leg[10]; + res.airplaneSeat = leg[9]; + } + + res.reservationFor.departureTime = JsonLd.toDateTime(leg[1] + ' ' + leg[3], "hh:mm ddMMM", "en"); + res.reservationFor.arrivalTime = JsonLd.toDateTime(leg[2] + ' ' + leg[3], "hh:mm ddMMM", "en"); + res.reservationNumber = ref; + res.underName = person; + reservations.push(res); + } + + return reservations; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/src/lib/scripts/airfrance.json new/kitinerary-21.12.3/src/lib/scripts/airfrance.json --- old/kitinerary-21.12.2/src/lib/scripts/airfrance.json 1970-01-01 01:00:00.000000000 +0100 +++ new/kitinerary-21.12.3/src/lib/scripts/airfrance.json 2022-02-27 19:40:53.000000000 +0100 @@ -0,0 +1,12 @@ +{ + "filter": [ + { + "match": "^M\\d.* \\d{13}$", + "mimeType": "text/plain", + "scope": "Descendants" + } + ], + "function": "parseTicket", + "mimeType": "application/pdf", + "script": "airfrance.js" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-21.12.2/src/lib/scripts/extractors.qrc new/kitinerary-21.12.3/src/lib/scripts/extractors.qrc --- old/kitinerary-21.12.2/src/lib/scripts/extractors.qrc 2022-01-29 00:31:44.000000000 +0100 +++ new/kitinerary-21.12.3/src/lib/scripts/extractors.qrc 2022-02-27 19:40:53.000000000 +0100 @@ -16,6 +16,8 @@ <file>aircoach-ie.js</file> <file>airdo.json</file> <file>airdo.js</file> + <file>airfrance.json</file> + <file>airfrance.js</file> <file>amadeus.json</file> <file>amadeus.js</file> <file>amtrack.json</file>
