Date: Tuesday, September 1, 2020 @ 13:02:29 Author: arojas Revision: 395052
archrelease: copy trunk to extra-x86_64 Added: plasma-workspace/repos/extra-x86_64/PKGBUILD (from rev 395051, plasma-workspace/trunk/PKGBUILD) plasma-workspace/repos/extra-x86_64/kde.pam (from rev 395051, plasma-workspace/trunk/kde.pam) plasma-workspace/repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch (from rev 395051, plasma-workspace/trunk/plasma-workspace-gpsd-3.21.patch) Deleted: plasma-workspace/repos/extra-x86_64/PKGBUILD plasma-workspace/repos/extra-x86_64/kde.pam plasma-workspace/repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch ----------------------------------+ PKGBUILD | 134 ++++++++++++++++++------------------- kde.pam | 18 ++-- plasma-workspace-gpsd-3.21.patch | 32 ++++---- 3 files changed, 92 insertions(+), 92 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-09-01 13:02:15 UTC (rev 395051) +++ PKGBUILD 2020-09-01 13:02:29 UTC (rev 395052) @@ -1,67 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Alexey D. <lq07829icatm at rambler.ru> - -pkgbase=plasma-workspace -pkgname=(plasma-workspace plasma-wayland-session) -pkgver=5.19.4 -pkgrel=2 -pkgdesc='KDE Plasma Workspace' -arch=(x86_64) -url='https://www.kde.org/workspaces/plasmadesktop/' -license=(LGPL) -depends=(knotifyconfig libksysguard ktexteditor libqalculate kde-cli-tools appstream-qt phonon-qt5 - xorg-xrdb xorg-xsetroot kactivitymanagerd kholidays xorg-xmessage milou prison kwin - plasma-integration kdelibs4support kpeople kactivities-stats libkscreen kquickcharts kuserfeedback) -makedepends=(extra-cmake-modules kdoctools gpsd baloo networkmanager-qt kdesignerplugin kinit) -groups=(plasma) -source=("https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam - plasma-workspace-gpsd-3.21.patch) -sha256sums=('584fada178f8a3d770080e1faa631cb64eebbf70af89f5d611ac9438fa868bd3' - 'SKIP' - '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739' - '27bdc2f751cb6a418d4cf08b08d260ec5621dc3190418fcea9fa80870f857348') -validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <j...@jriddell.org> - '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bs...@kde.org> - 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <davidedmund...@kde.org> - '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notm...@gmail.com> - -prepare() { - patch -d $pkgbase-$pkgver -p1 -i ../plasma-workspace-gpsd-3.21.patch # Fix build with gpsd 3.21 - - sed -e 's|dbus-run-session ||' -i $pkgbase-$pkgver/login-sessions/plasmawayland.desktop.cmake # Don't start a second user dbus session -} - -build() { - cmake -B build -S $pkgbase-$pkgver \ - -DCMAKE_INSTALL_LIBEXECDIR=lib \ - -DBUILD_TESTING=OFF - cmake --build build -} - -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-gtk-module: global menu support for GTK2 and some GTK3 applications' - 'qt5-virtualkeyboard: virtual keyboard support in lock screen' - 'baloo: Baloo search runner' 'discover: manage applications installation from the launcher') - provides=(notification-daemon) - backup=('etc/pam.d/kde') - - DESTDIR="$pkgdir" cmake --install build - - 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/login-sessions/plasmawayland.desktop "$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop -} Copied: plasma-workspace/repos/extra-x86_64/PKGBUILD (from rev 395051, plasma-workspace/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-09-01 13:02:29 UTC (rev 395052) @@ -0,0 +1,67 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Alexey D. <lq07829icatm at rambler.ru> + +pkgbase=plasma-workspace +pkgname=(plasma-workspace plasma-wayland-session) +pkgver=5.19.5 +pkgrel=1 +pkgdesc='KDE Plasma Workspace' +arch=(x86_64) +url='https://www.kde.org/workspaces/plasmadesktop/' +license=(LGPL) +depends=(knotifyconfig libksysguard ktexteditor libqalculate kde-cli-tools appstream-qt phonon-qt5 + xorg-xrdb xorg-xsetroot kactivitymanagerd kholidays xorg-xmessage milou prison kwin + plasma-integration kdelibs4support kpeople kactivities-stats libkscreen kquickcharts kuserfeedback) +makedepends=(extra-cmake-modules kdoctools gpsd baloo networkmanager-qt kdesignerplugin kinit) +groups=(plasma) +source=("https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam + plasma-workspace-gpsd-3.21.patch) +sha256sums=('490329e08e63016edd696a9132bf80b76ef51dacf53308b865d2e27b67ce8127' + 'SKIP' + '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739' + '27bdc2f751cb6a418d4cf08b08d260ec5621dc3190418fcea9fa80870f857348') +validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <j...@jriddell.org> + '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bs...@kde.org> + 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <davidedmund...@kde.org> + '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notm...@gmail.com> + +prepare() { + patch -d $pkgbase-$pkgver -p1 -i ../plasma-workspace-gpsd-3.21.patch # Fix build with gpsd 3.21 + + sed -e 's|dbus-run-session ||' -i $pkgbase-$pkgver/login-sessions/plasmawayland.desktop.cmake # Don't start a second user dbus session +} + +build() { + cmake -B build -S $pkgbase-$pkgver \ + -DCMAKE_INSTALL_LIBEXECDIR=lib \ + -DBUILD_TESTING=OFF + cmake --build build +} + +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-gtk-module: global menu support for GTK2 and some GTK3 applications' + 'qt5-virtualkeyboard: virtual keyboard support in lock screen' + 'baloo: Baloo search runner' 'discover: manage applications installation from the launcher') + provides=(notification-daemon) + backup=('etc/pam.d/kde') + + DESTDIR="$pkgdir" cmake --install build + + 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/login-sessions/plasmawayland.desktop "$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop +} Deleted: kde.pam =================================================================== --- kde.pam 2020-09-01 13:02:15 UTC (rev 395051) +++ kde.pam 2020-09-01 13:02:29 UTC (rev 395052) @@ -1,9 +0,0 @@ -#%PAM-1.0 - -auth include system-login - -account include system-login - -password include system-login - -session include system-login Copied: plasma-workspace/repos/extra-x86_64/kde.pam (from rev 395051, plasma-workspace/trunk/kde.pam) =================================================================== --- kde.pam (rev 0) +++ kde.pam 2020-09-01 13:02:29 UTC (rev 395052) @@ -0,0 +1,9 @@ +#%PAM-1.0 + +auth include system-login + +account include system-login + +password include system-login + +session include system-login Deleted: plasma-workspace-gpsd-3.21.patch =================================================================== --- plasma-workspace-gpsd-3.21.patch 2020-09-01 13:02:15 UTC (rev 395051) +++ plasma-workspace-gpsd-3.21.patch 2020-09-01 13:02:29 UTC (rev 395052) @@ -1,16 +0,0 @@ -diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp -index 021c29ac5..476117ca3 100644 ---- a/dataengines/geolocation/location_gps.cpp -+++ b/dataengines/geolocation/location_gps.cpp -@@ -65,7 +65,11 @@ void Gpsd::run() - if (m_gpsdata->online) { - #endif - //qDebug() << "online"; -+#if GPSD_API_MAJOR_VERSION >= 10 -+ if (m_gpsdata->fix.status != STATUS_NO_FIX) { -+#else - if (m_gpsdata->status != STATUS_NO_FIX) { -+#endif - //qDebug() << "fix"; - d["accuracy"] = 30; - d["latitude"] = QString::number(m_gpsdata->fix.latitude); Copied: plasma-workspace/repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch (from rev 395051, plasma-workspace/trunk/plasma-workspace-gpsd-3.21.patch) =================================================================== --- plasma-workspace-gpsd-3.21.patch (rev 0) +++ plasma-workspace-gpsd-3.21.patch 2020-09-01 13:02:29 UTC (rev 395052) @@ -0,0 +1,16 @@ +diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp +index 021c29ac5..476117ca3 100644 +--- a/dataengines/geolocation/location_gps.cpp ++++ b/dataengines/geolocation/location_gps.cpp +@@ -65,7 +65,11 @@ void Gpsd::run() + if (m_gpsdata->online) { + #endif + //qDebug() << "online"; ++#if GPSD_API_MAJOR_VERSION >= 10 ++ if (m_gpsdata->fix.status != STATUS_NO_FIX) { ++#else + if (m_gpsdata->status != STATUS_NO_FIX) { ++#endif + //qDebug() << "fix"; + d["accuracy"] = 30; + d["latitude"] = QString::number(m_gpsdata->fix.latitude);