community/plasma-workspace: backport fixes for gpsd 3.21 and newer

3 files changed, 64 insertions, 2 deletions

diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD
index aafc73d47a3..082c55ee289 100644
--- a/community/plasma-workspace/APKBUILD
+++ b/community/plasma-workspace/APKBUILD
@@ -11,7 +11,10 @@ depends="tzdata qt5-qtquickcontrols kirigami2 kinit qt5-qttools kwin kactivityma
 depends_dev="plasma-framework-dev krunner-dev kjsembed-dev knotifyconfig-dev kdesu-dev knewstuff-dev kwallet-dev kidletime-dev kdeclarative-dev ki18n-dev kcmutils-dev ktextwidgets-dev kdelibs4support-dev kcrash-dev kglobalaccel-dev kdbusaddons-dev kwayland-dev kcoreaddons-dev kded-dev libksysguard-dev kpackage-dev kscreenlocker-dev phonon-dev zlib-dev kitemmodels-dev networkmanager-qt-dev baloo-dev ktexteditor-dev kwin-dev kholidays-dev prison-dev kpeople-dev kactivities-stats-dev libkscreen-dev gpsd-dev iso-codes-dev"
 makedepends="$depends_dev extra-cmake-modules kdoctools-dev libxtst-dev"
 checkdepends="xvfb-run"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
+	gpsd-3.23-1.patch
+	gpsd-3.23-2.patch
+	"
 subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang"
 
 prepare() {
@@ -40,4 +43,8 @@ package() {
 	cd "$builddir"/build
 	DESTDIR="$pkgdir" make install
 }
-sha512sums="3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b  plasma-workspace-5.17.4.tar.xz"
+sha512sums="
+3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b  plasma-workspace-5.17.4.tar.xz
+dc92bb8aeaf08202580ac1478f8919476f9691a1094640d1d7b585c5a9aee1be66df533222b9fbb32fa2c613a233eff2db60ad1eaca6650131c49000935595ea  gpsd-3.23-1.patch
+0ada0c07c1949de1715b82276d76a62298ccfcadad62895f059fb188ac83ffe272efe0b476897330be73d84fb542f379f35c8885e93b09b4d8007ee3cac40cec  gpsd-3.23-2.patch
+"
diff --git a/community/plasma-workspace/gpsd-3.23-1.patch b/community/plasma-workspace/gpsd-3.23-1.patch
new file mode 100644
index 00000000000..2f8f97a2722
--- /dev/null
+++ b/community/plasma-workspace/gpsd-3.23-1.patch
@@ -0,0 +1,29 @@
+From 0c4974d68804cdaff2efb6317f7853a89d3a3d2b Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 6 Jan 2020 20:30:59 +0100
+Subject: [PATCH] Fix build with gpsd 3.20
+
+gps_data_t.online has changed type from double to struct timespec
+
+BUG:425939
+Differential Revision: https://phabricator.kde.org/D26474
+---
+ dataengines/geolocation/location_gps.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
+index f06865e28..e1a11c6f4 100644
+--- a/dataengines/geolocation/location_gps.cpp
++++ b/dataengines/geolocation/location_gps.cpp
+@@ -59,7 +59,11 @@ void Gpsd::run()
+         if (gps_poll(m_gpsdata) != -1) {
+ #endif
+             //qDebug() << "poll ok";
++#if GPSD_API_MAJOR_VERSION >= 9
++            if (m_gpsdata->online.tv_sec || m_gpsdata->online.tv_nsec) {
++#else
+             if (m_gpsdata->online) {
++#endif
+                 //qDebug() << "online";
+                 if (m_gpsdata->status != STATUS_NO_FIX) {
+                     //qDebug() << "fix";
diff --git a/community/plasma-workspace/gpsd-3.23-2.patch b/community/plasma-workspace/gpsd-3.23-2.patch
new file mode 100644
index 00000000000..f2b56d49ba4
--- /dev/null
+++ b/community/plasma-workspace/gpsd-3.23-2.patch
@@ -0,0 +1,26 @@
+From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 5 Aug 2020 14:07:24 +0200
+Subject: [PATCH] Fix build with gpsd 3.21
+
+Adapt to API changes
+---
+ dataengines/geolocation/location_gps.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
+index 021c29ac5..476117ca3 100644
+--- a/dataengines/geolocation/location_gps.cpp
++++ b/dataengines/geolocation/location_gps.cpp
+@@ -65,7 +65,11 @@ void Gpsd::run()
+             if (m_gpsdata->online) {
+ #endif
+                 //qDebug() << "online";
++#if GPSD_API_MAJOR_VERSION >= 10
++                if (m_gpsdata->fix.status != STATUS_NO_FIX) {
++#else
+                 if (m_gpsdata->status != STATUS_NO_FIX) {
++#endif
+                     //qDebug() << "fix";
+                     d["accuracy"] = 30;
+                     d["latitude"] = QString::number(m_gpsdata->fix.latitude);