On Fri, August 2, 2019 21:48, Stuart Henderson wrote:
> x11/kde4/workspace was broken by the gpsd update,
>
> ^
> /pobj/kde-workspace-4.11.21/kde-workspace-4.11.21/plasma/generic/dataengines/geolocation/location_gps.cpp:55:6:
> error: no matching function for call to 'gps_read'
> if (gps_read(m_gpsdata) != -1) {
> ^~~~~~~~
> /usr/local/include/gps.h:2223:12: note:
> candidate function not viable: requires 3 arguments, but 1 was provided
> extern int gps_read(struct gps_data_t *, char
> *message, int message_len); ^
> 1 warning and 1 error generated.
> ninja: build stopped: subcommand failed. *
>
Missed that consumer, sorry.
Trivial fix below. OK?
Index: patches/patch-plasma_generic_dataengines_geolocation_location_gps_cpp
===================================================================
RCS file: patches/patch-plasma_generic_dataengines_geolocation_location_gps_cpp
diff -N patches/patch-plasma_generic_dataengines_geolocation_location_gps_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plasma_generic_dataengines_geolocation_location_gps_cpp
2
Aug 2019 20:30:26 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+fix build with newer gpsd API
+upstream commit 81a0fe6db9ac9044c2ec8a246878ec65651cb6dd
+
+Index: plasma/generic/dataengines/geolocation/location_gps.cpp
+--- plasma/generic/dataengines/geolocation/location_gps.cpp.orig
++++ plasma/generic/dataengines/geolocation/location_gps.cpp
+@@ -51,7 +51,9 @@ void Gpsd::run()
+ while (!m_abort) {
+ Plasma::DataEngine::Data d;
+
+-#if GPSD_API_MAJOR_VERSION >= 5
++#if GPSD_API_MAJOR_VERSION >= 7
++ if (gps_read(m_gpsdata, NULL, 0) != -1) {
++#elif GPSD_API_MAJOR_VERSION >= 5
+ if (gps_read(m_gpsdata) != -1) {
+ #else
+ if (gps_poll(m_gpsdata) != -1) {
