[arch-commits] Commit in plasma-workspace (7 files)

Antonio Rojas arojas at archlinux.org
Thu Oct 1 17:54:21 UTC 2020


    Date: Thursday, October 1, 2020 @ 17:54:20
  Author: arojas
Revision: 397033

archrelease: copy trunk to extra-x86_64

Added:
  plasma-workspace/repos/extra-x86_64/PKGBUILD
    (from rev 397032, plasma-workspace/trunk/PKGBUILD)
  plasma-workspace/repos/extra-x86_64/kde.pam
    (from rev 397032, plasma-workspace/trunk/kde.pam)
  plasma-workspace/repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch
    (from rev 397032, plasma-workspace/trunk/plasma-workspace-gpsd-3.21.patch)
Modified:
  plasma-workspace/kde-unstable/PKGBUILD
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

-----------------------------------------------------+
 /extra-x86_64/PKGBUILD                              |   73 ++++++++++++++++++
 /extra-x86_64/kde.pam                               |    9 ++
 /extra-x86_64/plasma-workspace-gpsd-3.21.patch      |   16 +++
 kde-unstable/PKGBUILD                               |   12 ++
 repos/extra-x86_64/PKGBUILD                         |   70 -----------------
 repos/extra-x86_64/kde.pam                          |    9 --
 repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch |   16 ---
 7 files changed, 107 insertions(+), 98 deletions(-)

Modified: kde-unstable/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD	2020-10-01 17:52:56 UTC (rev 397032)
+++ kde-unstable/PKGBUILD	2020-10-01 17:54:20 UTC (rev 397033)
@@ -6,7 +6,7 @@
 pkgbase=plasma-workspace
 pkgname=(plasma-workspace plasma-wayland-session)
 pkgver=5.19.90
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE Plasma Workspace'
 arch=(x86_64)
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -16,15 +16,21 @@
          plasma-integration kdelibs4support kpeople kactivities-stats libkscreen kquickcharts kuserfeedback)
 makedepends=(extra-cmake-modules kdoctools gpsd baloo networkmanager-qt kdesignerplugin kinit plasma-wayland-protocols)
 groups=(plasma)
-source=("https://download.kde.org/unstable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam)
+source=("https://download.kde.org/unstable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig} kde.pam
+         kdebug-423526.patch::"https://invent.kde.org/plasma/plasma-workspace/commit/bb7b1226.patch")
 sha256sums=('8443749557af2f6288a144d3df46d3c0c271e7a9068fc46334faf7c3b6e2ab76'
             'SKIP'
-            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739')
+            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
+            'ffda98d84a18f6a1111607411c85b18dc20c6d7899b1037c209970b25845d2b0')
 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() {
+  patch -d $pkgbase-$pkgver -p1 -i ../kdebug-423526.patch # Fix switching sessions with systemd 246
+}
+
 build() {
   cmake -B build -S $pkgbase-$pkgver \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \

Deleted: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD	2020-10-01 17:52:56 UTC (rev 397032)
+++ repos/extra-x86_64/PKGBUILD	2020-10-01 17:54:20 UTC (rev 397033)
@@ -1,70 +0,0 @@
-# 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.19.5
-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
-         kdebug-423526.patch::"https://invent.kde.org/plasma/plasma-workspace/commit/bb7b1226.patch")
-sha256sums=('490329e08e63016edd696a9132bf80b76ef51dacf53308b865d2e27b67ce8127'
-            'SKIP'
-            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
-            '27bdc2f751cb6a418d4cf08b08d260ec5621dc3190418fcea9fa80870f857348'
-            'ffda98d84a18f6a1111607411c85b18dc20c6d7899b1037c209970b25845d2b0')
-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() {
-  patch -d $pkgbase-$pkgver -p1 -i ../plasma-workspace-gpsd-3.21.patch # Fix build with gpsd 3.21
-  patch -d $pkgbase-$pkgver -p1 -i ../kdebug-423526.patch # Fix switching sessions with systemd 246
-
-  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 397032, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- repos/extra-x86_64/PKGBUILD	                        (rev 0)
+++ repos/extra-x86_64/PKGBUILD	2020-10-01 17:54:20 UTC (rev 397033)
@@ -0,0 +1,73 @@
+# 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.19.5
+pkgrel=3
+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
+         kdebug-423526a.patch::"https://invent.kde.org/plasma/plasma-workspace/commit/05414ed5.patch"
+         kdebug-423526b.patch::"https://invent.kde.org/plasma/plasma-workspace/commit/bb7b1226.patch")
+sha256sums=('490329e08e63016edd696a9132bf80b76ef51dacf53308b865d2e27b67ce8127'
+            'SKIP'
+            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
+            '27bdc2f751cb6a418d4cf08b08d260ec5621dc3190418fcea9fa80870f857348'
+            '7c87253df33c7145eb90082dee1e9ccc19eb650c4715bfde61b67989d5b0650d'
+            'ffda98d84a18f6a1111607411c85b18dc20c6d7899b1037c209970b25845d2b0')
+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() {
+  patch -d $pkgbase-$pkgver -p1 -i ../plasma-workspace-gpsd-3.21.patch # Fix build with gpsd 3.21
+  patch -d $pkgbase-$pkgver -p1 -i ../kdebug-423526a.patch # Fix switching sessions with systemd 246
+  patch -d $pkgbase-$pkgver -p1 -i ../kdebug-423526b.patch
+
+  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: repos/extra-x86_64/kde.pam
===================================================================
--- repos/extra-x86_64/kde.pam	2020-10-01 17:52:56 UTC (rev 397032)
+++ repos/extra-x86_64/kde.pam	2020-10-01 17:54:20 UTC (rev 397033)
@@ -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 397032, plasma-workspace/trunk/kde.pam)
===================================================================
--- repos/extra-x86_64/kde.pam	                        (rev 0)
+++ repos/extra-x86_64/kde.pam	2020-10-01 17:54:20 UTC (rev 397033)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth            include         system-login
+
+account         include         system-login
+
+password        include         system-login
+
+session         include         system-login

Deleted: repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch
===================================================================
--- repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch	2020-10-01 17:52:56 UTC (rev 397032)
+++ repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch	2020-10-01 17:54:20 UTC (rev 397033)
@@ -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 397032, plasma-workspace/trunk/plasma-workspace-gpsd-3.21.patch)
===================================================================
--- repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch	                        (rev 0)
+++ repos/extra-x86_64/plasma-workspace-gpsd-3.21.patch	2020-10-01 17:54:20 UTC (rev 397033)
@@ -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);


More information about the arch-commits mailing list