From 90d6fb4962283b88cef5ff5d3ee58d53d0a2b5c6b497271c77b713b2424e2a04 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Mon, 30 Nov 2020 11:07:09 +0000
Subject: [PATCH] 20.11.90

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kpublictransport?expand=0&rev=4
---
 ...nary-journey-queries-on-big-endian-s.patch | 44 -------------------
 kpublictransport-20.11.80.tar.xz              |  3 --
 kpublictransport-20.11.80.tar.xz.sig          | 16 -------
 kpublictransport-20.11.90.tar.xz              |  3 ++
 kpublictransport-20.11.90.tar.xz.sig          | 11 +++++
 kpublictransport.changes                      | 11 +++++
 kpublictransport.spec                         |  6 +--
 7 files changed, 27 insertions(+), 67 deletions(-)
 delete mode 100644 0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
 delete mode 100644 kpublictransport-20.11.80.tar.xz
 delete mode 100644 kpublictransport-20.11.80.tar.xz.sig
 create mode 100644 kpublictransport-20.11.90.tar.xz
 create mode 100644 kpublictransport-20.11.90.tar.xz.sig

diff --git a/0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch b/0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
deleted file mode 100644
index 0e0a640..0000000
--- a/0001-Disable-Hafas-binary-journey-queries-on-big-endian-s.patch
+++ /dev/null
@@ -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
-
diff --git a/kpublictransport-20.11.80.tar.xz b/kpublictransport-20.11.80.tar.xz
deleted file mode 100644
index 90680bb..0000000
--- a/kpublictransport-20.11.80.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae26923f2c7452b3d0ad8013e8278f876fe46f52d062e0c760b1d8ec2acd6c00
-size 344712
diff --git a/kpublictransport-20.11.80.tar.xz.sig b/kpublictransport-20.11.80.tar.xz.sig
deleted file mode 100644
index 77b030e..0000000
--- a/kpublictransport-20.11.80.tar.xz.sig
+++ /dev/null
@@ -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-----
diff --git a/kpublictransport-20.11.90.tar.xz b/kpublictransport-20.11.90.tar.xz
new file mode 100644
index 0000000..0559653
--- /dev/null
+++ b/kpublictransport-20.11.90.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d926f1166684993a08fca79ff0a58511d1af148f5492798566df8a418c34095
+size 344776
diff --git a/kpublictransport-20.11.90.tar.xz.sig b/kpublictransport-20.11.90.tar.xz.sig
new file mode 100644
index 0000000..d20e10e
--- /dev/null
+++ b/kpublictransport-20.11.90.tar.xz.sig
@@ -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-----
diff --git a/kpublictransport.changes b/kpublictransport.changes
index ea8c699..4c3bbb6 100644
--- a/kpublictransport.changes
+++ b/kpublictransport.changes
@@ -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>
 
diff --git a/kpublictransport.spec b/kpublictransport.spec
index 372e198..bb9b249 100644
--- a/kpublictransport.spec
+++ b/kpublictransport.spec
@@ -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