From 76dec8847f0379804c2bcbcaadd7e9b23b19e4b5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Tue, 16 Oct 2018 11:13:21 -0500
Subject: [PATCH] 5.14.1

---
 .gitignore            |  1 +
 D16081.diff           | 15 ---------------
 plasma-workspace.spec | 11 +++++------
 sources               |  2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 D16081.diff

diff --git a/.gitignore b/.gitignore
index b1cb563..ad7e574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /plasma-workspace-5.13.5.tar.xz
 /plasma-workspace-5.13.90.tar.xz
 /plasma-workspace-5.14.0.tar.xz
+/plasma-workspace-5.14.1.tar.xz
diff --git a/D16081.diff b/D16081.diff
deleted file mode 100644
index 838528c..0000000
--- a/D16081.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
---- a/dataengines/geolocation/location_gps.cpp
-+++ b/dataengines/geolocation/location_gps.cpp
-@@ -51,7 +51,9 @@
-     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) {
-
diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index 6f4cad9..42048c1 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -6,8 +6,8 @@
 
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
-Version: 5.14.0
-Release: 3%{?dist}
+Version: 5.14.1
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     https://cgit.kde.org/%{name}.git
@@ -46,9 +46,6 @@ Patch102:       startkde.patch
 Patch105:       plasma-workspace-5.7.3-folderview_layout.patch
 
 ## upstreamable Patches
-# Fix build with gpsd 3.18
-# https://phabricator.kde.org/D16081
-Patch50: https://phabricator.kde.org/file/data/oopytdz45mdqu5ntev7p/PHID-FILE-zzzrunochlg3gpqxgbdh/D16081.diff
 
 ## upstream Patches lookaside cache
 
@@ -371,7 +368,6 @@ BuildArch: noarch
 %setup -q -a 20
 
 ## upstream patches
-%patch50 -p1
 
 %patch100 -p1 -b .konsole-in-contextmenu
 # FIXME/TODO:  it is unclear whether this is needed or even a good idea anymore -- rex
@@ -588,6 +584,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org.
 
 
 %changelog
+* Tue Oct 16 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.14.1-1
+- 5.14.1
+
 * Thu Oct 11 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.14.0-3
 - rebuild (gpsd)
 
diff --git a/sources b/sources
index 03ed70f..d4379a7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (plasma-workspace-5.14.0.tar.xz) = 43e050311cb84c0bedfbe02c37fd6a19b330680b436195fd071590a5ca2616c064794c338e22672ed6dc309673e4184fc85a966226dc50768584e6453d14a2cc
+SHA512 (plasma-workspace-5.14.1.tar.xz) = 917386b278a7179b5f76f4b8bfa9e35b9505d5e7c07dcd448bbf86b75658963465f62dc6e999fe67bfcbb767b0b73921c6787b222d0642ddddd9158f645af18c
 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8