git » plasma-workspace.git » commit 2cf5d12

Plasma 5.14.1

author Antonio Rojas
2018-10-16 14:41:59 UTC
committer Antonio Rojas
2018-10-16 14:41:59 UTC
parent 5cf1ad89925163ac1f3c5cb232671a77e4bae626

Plasma 5.14.1

PKGBUILD +5 -10
pw-gpsd-3.18.patch +0 -15

diff --git a/PKGBUILD b/PKGBUILD
index f6ef092..d08d0cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgbase=plasma-workspace
 pkgname=(plasma-workspace plasma-wayland-session)
-pkgver=5.14.0
-pkgrel=2
+pkgver=5.14.1
+pkgrel=1
 pkgdesc='KDE Plasma Workspace'
 arch=(x86_64)
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -16,12 +16,10 @@ depends=(kjsembed knotifyconfig libksysguard ktexteditor libqalculate qt5-tools
          plasma-integration kdelibs4support)
 makedepends=(extra-cmake-modules kdoctools gpsd baloo appstream-qt krunner networkmanager-qt kdesignerplugin)
 groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam
-        pw-gpsd-3.18.patch)
-sha256sums=('ce778af339ccc40763dbc9a6c737fa4d8d249910f60f8567c1397f6d9b01ffb9'
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam)
+sha256sums=('4ed6648dbb21fb563f7e8e95727155a415b4502503d38037af04bc98723579f3'
             'SKIP'
-            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
-            '815261e4635c180464939a120078b8a1f5a832a85a01e227681ecaee841c9587')
+            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr@jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
               'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson@kde.org>
@@ -29,9 +27,6 @@ validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr
 
 prepare() {
   mkdir -p build
-
-  cd $pkgbase-$pkgver
-  patch -p1 -i ../pw-gpsd-3.18.patch # Fix build with gpsd 3.18
 }
 
 build() {
diff --git a/pw-gpsd-3.18.patch b/pw-gpsd-3.18.patch
deleted file mode 100644
index 8d204b1..0000000
--- a/pw-gpsd-3.18.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
-index 22f6b279..f06865e2 100644
---- a/dataengines/geolocation/location_gps.cpp
-+++ b/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) {