[arch-commits] Commit in plasma-workspace/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Tue Oct 9 16:09:52 UTC 2018
Date: Tuesday, October 9, 2018 @ 16:09:51
Author: arojas
Revision: 336060
archrelease: copy trunk to staging-x86_64
Added:
plasma-workspace/repos/staging-x86_64/
plasma-workspace/repos/staging-x86_64/PKGBUILD
(from rev 336059, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/staging-x86_64/kde.pam
(from rev 336059, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/staging-x86_64/pw-gpsd-3.18.patch
(from rev 336059, plasma-workspace/trunk/pw-gpsd-3.18.patch)
--------------------+
PKGBUILD | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++
kde.pam | 9 ++++++
pw-gpsd-3.18.patch | 15 ++++++++++
3 files changed, 100 insertions(+)
Copied: plasma-workspace/repos/staging-x86_64/PKGBUILD (from rev 336059, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-09 16:09:51 UTC (rev 336060)
@@ -0,0 +1,76 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=(plasma-workspace plasma-wayland-session)
+pkgver=5.14.0
+pkgrel=2
+pkgdesc='KDE Plasma Workspace'
+arch=(x86_64)
+url='https://www.kde.org/workspaces/plasmadesktop/'
+license=(LGPL)
+depends=(kjsembed knotifyconfig libksysguard ktexteditor libqalculate qt5-tools kde-cli-tools bc
+ xorg-xrdb xorg-xsetroot kactivitymanagerd kholidays xorg-xmessage xorg-xprop milou prison kwin
+ 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'
+ 'SKIP'
+ '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
+ '815261e4635c180464939a120078b8a1f5a832a85a01e227681ecaee841c9587')
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <jr at jriddell.org>
+ '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bshah at kde.org>
+ 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <davidedmundson at kde.org>
+ '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgbase-$pkgver
+ patch -p1 -i ../pw-gpsd-3.18.patch # Fix build with gpsd 3.18
+}
+
+build() {
+ cd build
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_INSTALL_LIBEXECDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_plasma-workspace() {
+ optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS based geolocation' 'networkmanager-qt: IP based geolocation'
+ 'kdepim-addons: displaying PIM events in the calendar'
+ 'appmenu-qt4: global menu support for Qt4 applications'
+ 'appmenu-gtk-module: global menu support for GTK2 and some GTK3 applications'
+ 'qt5-virtualkeyboard: virtual keyboard support in lock screen'
+ 'baloo: Baloo search runner'
+ 'appstream-qt: package search runner')
+ conflicts=(kuiserver)
+ provides=(kuiserver notification-daemon)
+ replaces=(kuiserver)
+ backup=('etc/pam.d/kde')
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde
+
+ # Split plasma-wayland scripts
+ rm -r "$pkgdir"/usr/share/wayland-sessions
+}
+
+package_plasma-wayland-session() {
+ pkgdesc='Plasma Wayland session'
+ depends=(plasma-workspace qt5-wayland kwayland-integration xorg-server-xwayland)
+ groups=()
+
+ install -Dm644 build/plasmawayland.desktop "$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
+}
Copied: plasma-workspace/repos/staging-x86_64/kde.pam (from rev 336059, plasma-workspace/trunk/kde.pam)
===================================================================
--- staging-x86_64/kde.pam (rev 0)
+++ staging-x86_64/kde.pam 2018-10-09 16:09:51 UTC (rev 336060)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
Copied: plasma-workspace/repos/staging-x86_64/pw-gpsd-3.18.patch (from rev 336059, plasma-workspace/trunk/pw-gpsd-3.18.patch)
===================================================================
--- staging-x86_64/pw-gpsd-3.18.patch (rev 0)
+++ staging-x86_64/pw-gpsd-3.18.patch 2018-10-09 16:09:51 UTC (rev 336060)
@@ -0,0 +1,15 @@
+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) {
More information about the arch-commits
mailing list