aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2021-08-09 12:49:51 -0600
committerAriadne Conill <ariadne@dereferenced.org>2021-08-09 12:49:51 -0600
commit7c500a0a3b2414e7fac4e86cf7cf1536f758ca00 (patch)
tree7768b05376e7be566728b02b3bf938b947d80820
parent5436826850b476c70fb5bd527451960651b8de8f (diff)
downloadaports-7c500a0a3b2414e7fac4e86cf7cf1536f758ca00.tar.gz
aports-7c500a0a3b2414e7fac4e86cf7cf1536f758ca00.tar.bz2
aports-7c500a0a3b2414e7fac4e86cf7cf1536f758ca00.tar.xz
community/plasma-workspace: more gpsd fixes
-rw-r--r--community/plasma-workspace/APKBUILD2
-rw-r--r--community/plasma-workspace/gpsd-3.23-1.patch29
2 files changed, 0 insertions, 31 deletions
diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD
index cb0cb213f9..d1ec96bca0 100644
--- a/community/plasma-workspace/APKBUILD
+++ b/community/plasma-workspace/APKBUILD
@@ -13,7 +13,6 @@ 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
D28238.patch
- gpsd-3.23-1.patch
gpsd-3.23-2.patch
"
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang"
@@ -39,6 +38,5 @@ package() {
sha512sums="
870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2 plasma-workspace-5.18.5.tar.xz
ff73e9534e92a9df5ce9339aea8ba27104da2255d1425f9ab29d2a969f780cd8c007a2374cc679794cc524b572c865ccc569e758821bece2bb2e4ea961582efc D28238.patch
-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
deleted file mode 100644
index 2f8f97a272..0000000000
--- a/community/plasma-workspace/gpsd-3.23-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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";