1
0
Wolfgang Bauer 2020-11-30 11:07:09 +00:00 committed by Git OBS Bridge
parent 645e1aa4aa
commit 90d6fb4962
7 changed files with 27 additions and 67 deletions

View File

@ -1,44 +0,0 @@
From 96ac04eca3444e8bed51daf3297d3e7b92089b93 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 14 Nov 2020 15:48:07 +0100
Subject: [PATCH] Disable Hafas binary journey queries on big endian systems
The current way or parsing those responses doesn't consider endianess at
all yet.
---
autotests/hafasqueryparsertest.cpp | 3 +++
src/lib/backends/hafasquerybackend.cpp | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/autotests/hafasqueryparsertest.cpp b/autotests/hafasqueryparsertest.cpp
index a0838f1..3ded71e 100644
--- a/autotests/hafasqueryparsertest.cpp
+++ b/autotests/hafasqueryparsertest.cpp
@@ -35,6 +35,9 @@ private Q_SLOTS:
void testParseJourneyError()
{
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+ QSKIP("not supported on big endian systems yet!", SkipAll);
+#endif
HafasQueryParser p;
const auto res = p.parseQueryJourneyResponse(readFile(SOURCE_DIR "/data/hafas/journey-binary-error.bin.gz"));
QVERIFY(res.empty());
diff --git a/src/lib/backends/hafasquerybackend.cpp b/src/lib/backends/hafasquerybackend.cpp
index ed68def..67fa65d 100644
--- a/src/lib/backends/hafasquerybackend.cpp
+++ b/src/lib/backends/hafasquerybackend.cpp
@@ -226,6 +226,10 @@ QString HafasQueryBackend::locationId(const Location &loc) const
bool HafasQueryBackend::queryJourney(const JourneyRequest &request, JourneyReply *reply, QNetworkAccessManager *nam) const
{
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+#warning Hafas binary journey reponse parsing not implemented for big endian yet!
+ return false;
+#endif
if ((request.modes() & JourneySection::PublicTransport) == 0) {
return false;
}
--
2.29.2

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae26923f2c7452b3d0ad8013e8278f876fe46f52d062e0c760b1d8ec2acd6c00
size 344712

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uonoACgkQOmpNuDnq
ptcEqw/8DUBd72s/CXLcHYgCfuT8+UgJFDeOKuJ2i7RipuQ5913UTW5faMVby25X
Dlkf0i52nBz/wbTjtKEfmkZT3BYwjQczlofNCcA9HIKILNB/Hv9ZZXKpNF6GA6un
0Mtud+kc0AounvGAq3QM5SZvxJDr2XxFAedp0CylvZ1BqBRL9ir0Ta31E3peMxui
/VOHHzVRqwy7vNwu713zK97PVteRK3TJ062F1hRokIJp0AmRKqa1Y2ige6G9/ASd
/4jY6jt7Zat/8m/mcloK+8HnZQ74Pm3Il76YNa7ISM38HEE5QYwIJ2CmeGVBqPK9
DLeUWRqw++q/Q0hAG7+up0/injPsn5KcFMi4ZEmUMJPzTGUuuNRyXkwuvRj2wq63
IF7rc+BnAqaFxxNxVUjanyoDA5KSaP6HuEz3YUqyzFsNWhWXTfz7XCe6TfW9AxpK
JXNI9cgci5IyqxTLHVla5Had/02AsbEMD6pqR7YVd/tKgNHgwXhCWmWCh/ftl9Pb
gHbwH2bP+nh5suFzX6yiroPByk+eJN6q6AJk1VgzxezKwCT/YZWhekIk5SBK8j4s
rhJNA/brxmaUf2vHPM3X5u05LKx3PYkyWz85AQg62tc/Kf0PvMR0QK27v9ESF1CC
3d35aB1fDpv93XPKswgUrB/1vq09fXUIg8wnHPPvoe854f9QNy4=
=aUwU
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d926f1166684993a08fca79ff0a58511d1af148f5492798566df8a418c34095
size 344776

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/ATskACgkQ29LOiT4t
HIcrnAf+KOAJvWVAelqzFqueBhKY5o5IzksGAGxS2JAF7l3lTyzlZg96hWDz2dWF
GEnN8XwIwKi5fl+GmCTUm3jjEl1TUNWBXL/3E/wu86BDREmcuymlLxEACXGrLQ4r
bScK1PwK4QBX9Wq1H2c8bBEmELY8pFDYMGo3x8yzt/nYrMliRhi9SDTZhxm2Lj+E
SKxGzdAvarS+trT4Bm4+oRI1bAamITES4pFpts6PH9TT+cGZrP9htZfMTMkdXImI
6P+on6FdhU/3MGsmLiTjdYcHQyyyTWkH67Ych9bokI/JLLb05wosoNXNoYWiV7fQ
BKzz5j+EyWT4IuDSlK5aOWJj+nc0kA==
=aue9
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Nov 27 15:17:17 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 20.11.90
* New feature release
- Changes since 20.11.80:
* Set SOVERSION to a fixed value rather than the release service version
* Disable Hafas binary journey queries on big endian systems
- Drop upstream patch:
* 0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
-------------------------------------------------------------------
Sat Nov 14 12:24:00 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -16,13 +16,13 @@
#
%global sover 20
%global sover 1
%global lname libKPublicTransport%{sover}
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kpublictransport
Version: 20.11.80
Version: 20.11.90
Release: 0
Summary: QML imports for querying public transport data
License: LGPL-2.0-or-later
@ -32,8 +32,6 @@ Source0: https://download.kde.org/unstable/release-service/%{version}/src
Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
BuildRequires: bison
BuildRequires: extra-cmake-modules
BuildRequires: fdupes