[packages/kde4-kdebase-workspace] - fix building with gpsd 3.19 - rel 10

[baggins]

commit fc29bb52df104dc7ac1c7713e1fc47c4d515f8f4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 2 20:35:49 2019 +0100

    - fix building with gpsd 3.19
    - rel 10

 gpsd.patch                  | 13 +++++++++++++
 kde4-kdebase-workspace.spec |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kdebase-workspace.spec b/kde4-kdebase-workspace.spec
index 0fd6e60..4ef8bbf 100644
--- a/kde4-kdebase-workspace.spec
+++ b/kde4-kdebase-workspace.spec
@@ -8,7 +8,7 @@ Summary:	KDE 4 base workspace components
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
 Name:		kde4-kdebase-workspace
 Version:	4.11.22
-Release:	9
+Release:	10
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://download.kde.org/%{_state}/applications/15.08.0/src/%{orgname}-%{version}.tar.xz
@@ -36,6 +36,7 @@ Patch5:		%{name}-xsession_errors_O_APPEND.patch
 Patch6:		%{name}-kdm_plymouth081.patch
 Patch7:		%{name}-kdm-logind-multiseat.patch
 Patch8:		%{name}-bug796969.patch
+Patch9:		gpsd.patch
 URL:		http://www.kde.org/
 BuildRequires:	ConsoleKit-devel
 BuildRequires:	Mesa-libGLES-devel
@@ -529,6 +530,7 @@ dialogowych mających na celu rozszerzenie przywilejów użytkownika.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 export CXXFLAGS="%{rpmcxxflags} -fpermissive"
diff --git a/gpsd.patch b/gpsd.patch
new file mode 100644
index 0000000..7903602
--- /dev/null
+++ b/gpsd.patch
@@ -0,0 +1,13 @@
+--- kde-workspace-4.11.22/plasma/generic/dataengines/geolocation/location_gps.cpp~	2015-08-12 09:03:15.000000000 +0200
++++ kde-workspace-4.11.22/plasma/generic/dataengines/geolocation/location_gps.cpp	2019-11-02 20:29:50.196679637 +0100
+@@ -51,7 +51,9 @@
+     while (!m_abort) {
+         Plasma::DataEngine::Data d;
+ 
+-#if GPSD_API_MAJOR_VERSION >= 5
++#if GPSD_API_MAJOR_VERSION >= 6
++	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) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdebase-workspace.git/commitdiff/fc29bb52df104dc7ac1c7713e1fc47c4d515f8f4