Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2020-07-14 07:48:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitinerary" Tue Jul 14 07:48:30 2020 rev:25 rq:820209 version:20.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2020-06-14 18:21:00.739780346 +0200 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.3060/kitinerary.changes 2020-07-14 07:48:49.147756530 +0200 @@ -1,0 +2,11 @@ +Thu Jul 9 20:09:43 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.04.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2020-07-apps-update +- Changes since 20.04.2: + * Extract seat reservation information from Ouigo confirmations + * Adapt to ZXing changing its library target name + +------------------------------------------------------------------- Old: ---- kitinerary-20.04.2.tar.xz kitinerary-20.04.2.tar.xz.sig New: ---- kitinerary-20.04.3.tar.xz kitinerary-20.04.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.4Kp6G1/_old 2020-07-14 07:48:50.903762199 +0200 +++ /var/tmp/diff_new_pack.4Kp6G1/_new 2020-07-14 07:48:50.907762211 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: kitinerary -Version: 20.04.2 +Version: 20.04.3 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later ++++++ kitinerary-20.04.2.tar.xz -> kitinerary-20.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.04.2/CMakeLists.txt new/kitinerary-20.04.3/CMakeLists.txt --- old/kitinerary-20.04.2/CMakeLists.txt 2020-06-08 20:13:15.000000000 +0200 +++ new/kitinerary-20.04.3/CMakeLists.txt 2020-07-03 23:33:53.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.14.2") +set(PIM_VERSION "5.14.3") project(KItinerary VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 14) @@ -32,8 +32,8 @@ find_package(SharedMimeInfo 1.3 REQUIRED) endif() -set(KMIME_VERSION "5.14.2") -set(PIM_PKPASS "5.14.2") +set(KMIME_VERSION "5.14.3") +set(PIM_PKPASS "5.14.3") find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG) @@ -74,7 +74,7 @@ list(GET _poppler_version_components 2 POPPLER_VERSION_PATCH) endif() -if (TARGET ZXing::Core) +if (TARGET ZXing::ZXing OR TARGET ZXing::Core) set(HAVE_ZXING ON) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.04.2/po/et/kitinerary.po new/kitinerary-20.04.3/po/et/kitinerary.po --- old/kitinerary-20.04.2/po/et/kitinerary.po 2020-06-09 02:48:21.000000000 +0200 +++ new/kitinerary-20.04.3/po/et/kitinerary.po 2020-07-07 03:11:05.000000000 +0200 @@ -10,7 +10,7 @@ "PO-Revision-Date: 2020-02-17 17:56+0200\n" "Last-Translator: Marek Laane <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" -"Language: et_EE\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.04.2/po/zh_CN/kitinerary.po new/kitinerary-20.04.3/po/zh_CN/kitinerary.po --- old/kitinerary-20.04.2/po/zh_CN/kitinerary.po 2020-06-09 02:48:21.000000000 +0200 +++ new/kitinerary-20.04.3/po/zh_CN/kitinerary.po 2020-07-07 03:11:05.000000000 +0200 @@ -8,8 +8,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-03-04 03:33+0100\n" -"PO-Revision-Date: 2020-05-09 13:51\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2020-06-24 08:02\n" +"Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -17,8 +17,10 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Project-ID: 269464\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-stable/messages/pim/kitinerary.pot\n" +"X-Crowdin-File: /kf5-stable/messages/kitinerary/kitinerary.pot\n" +"X-Crowdin-File-ID: 7462\n" #: calendarhandler.cpp:198 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.04.2/src/CMakeLists.txt new/kitinerary-20.04.3/src/CMakeLists.txt --- old/kitinerary-20.04.2/src/CMakeLists.txt 2020-06-08 20:13:15.000000000 +0200 +++ new/kitinerary-20.04.3/src/CMakeLists.txt 2020-07-03 23:33:53.000000000 +0200 @@ -120,7 +120,9 @@ target_link_libraries(KPimItinerary PRIVATE Poppler::Core) endif() -if (HAVE_ZXING) +if (TARGET ZXing::ZXing) + target_link_libraries(KPimItinerary PRIVATE ZXing::ZXing) +elseif (TARGET ZXing::Core) target_link_libraries(KPimItinerary PRIVATE ZXing::Core) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.04.2/src/cli/org.kde.kitinerary-extractor.appdata.xml new/kitinerary-20.04.3/src/cli/org.kde.kitinerary-extractor.appdata.xml --- old/kitinerary-20.04.2/src/cli/org.kde.kitinerary-extractor.appdata.xml 2020-06-08 20:13:15.000000000 +0200 +++ new/kitinerary-20.04.3/src/cli/org.kde.kitinerary-extractor.appdata.xml 2020-07-03 23:33:53.000000000 +0200 @@ -80,9 +80,9 @@ <binary>kitinerary-extractor</binary> </provides> <releases> + <release version="5.14.3" date="2020-07-09"/> <release version="5.14.2" date="2020-06-11"/> <release version="5.14.1" date="2020-05-14"/> <release version="5.14.0" date="2020-04-23"/> - <release version="5.13.2" date="2020-02-06"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-20.04.2/src/extractors/sncf.js new/kitinerary-20.04.3/src/extractors/sncf.js --- old/kitinerary-20.04.2/src/extractors/sncf.js 2020-06-08 20:13:15.000000000 +0200 +++ new/kitinerary-20.04.3/src/extractors/sncf.js 2020-07-03 23:33:53.000000000 +0200 @@ -131,11 +131,14 @@ var productDts = html.eval('//*[@class="product-travel-date"]'); var productDetails = html.eval('//table[@class="product-details"]'); + var passengerDetails = html.eval('//table[@class="passengers"]'); for (productDetailIdx in productDetails) { // date is in the table before us var dt = productDts[productDetailIdx].content.replace(/\S+ (.*)/, "$1"); var segmentDetail = productDetails[productDetailIdx].eval(".//td")[0]; + var placement = passengerDetails[productDetailIdx].eval('.//td[@class="placement "]'); // yes, there is a space behind placement there... + var seat = placement[0].content.match(/Voiture (.*?) - Place (.*?) /); var res = null; while (segmentDetail && !segmentDetail.isNull) { var cls = segmentDetail.attribute("class"); @@ -144,6 +147,10 @@ res.reservationFor.departureTime = JsonLd.toDateTime(dt + segmentDetail.content, "d MMMMhh'h'mm", "fr"); segmentDetail = segmentDetail.nextSibling; res.reservationFor.departureStation.name = segmentDetail.content; + if (seat) { + res.reservedTicket.ticketedSeat.seatSection = seat[1]; + res.reservedTicket.ticketedSeat.seatNumber = seat[2]; + } } else if (cls.includes("segment-arrival")) { res.reservationFor.arrivalTime = JsonLd.toDateTime(dt + segmentDetail.content, "d MMMMhh'h'mm", "fr");
