Date: Wednesday, September 14, 2022 @ 11:15:30
Author: arojas
Revision: 456103
archrelease: copy trunk to extra-x86_64
Added:
plasma-workspace/repos/extra-x86_64/9bf0e56d.patch
(from rev 456102, plasma-workspace/trunk/9bf0e56d.patch)
plasma-workspace/repos/extra-x86_64/PKGBUILD
(from rev 456102, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/extra-x86_64/kde.pam
(from rev 456102, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/extra-x86_64/keys/
Deleted:
plasma-workspace/repos/extra-x86_64/PKGBUILD
plasma-workspace/repos/extra-x86_64/kde.pam
plasma-workspace/repos/extra-x86_64/keys/
----------------+
9bf0e56d.patch | 49 ++++++++++++++++++++
PKGBUILD | 133 ++++++++++++++++++++++++++++---------------------------
kde.pam | 18 +++----
3 files changed, 126 insertions(+), 74 deletions(-)
Copied: plasma-workspace/repos/extra-x86_64/9bf0e56d.patch (from rev 456102,
plasma-workspace/trunk/9bf0e56d.patch)
===================================================================
--- 9bf0e56d.patch (rev 0)
+++ 9bf0e56d.patch 2022-09-14 11:15:30 UTC (rev 456103)
@@ -0,0 +1,49 @@
+From 9bf0e56da84de5e9bd2b3ff28bdb2cb1af6de91e Mon Sep 17 00:00:00 2001
+From: Harald Sitter <[email protected]>
+Date: Tue, 13 Sep 2022 13:54:04 +0200
+Subject: [PATCH] delay ksplash until after env is set up
+
+otherwise we can dbus invoke with the wrong environment. specifically
+this happens with the latest qtbase changes that introduced color
+picking support on wayland. when we start a qguiapplication with
+incomplete environment that dbus invokes the xdg-portal system and that
+in turn has an incomplete environment resulting in theming and the likes
+not properly applying because the portal doesn't know that it runs
+inside a plasma session.
+
+https://invent.kde.org/qt/qt/qtbase/-/commit/2dc083df009a45c5dacfea27b0affeb85b01f847
+
+BUG: 458865
+---
+ startkde/startplasma-x11.cpp | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
+index f8123557e5..08a4c0d1c0 100644
+--- a/startkde/startplasma-x11.cpp
++++ b/startkde/startplasma-x11.cpp
+@@ -57,9 +57,6 @@ int main(int argc, char **argv)
+ }
+ }
+
+- setupCursor(false);
+- QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
+-
+ runEnvironmentScripts();
+
+ out << "startkde: Starting up...\n";
+@@ -80,6 +76,11 @@ int main(int argc, char **argv)
+ // variables (e.g. LANG and LC_*)
+ importSystemdEnvrionment();
+
++ // NOTE: Do not start QGuiApplications before setting up the environment.
We'd be at risk of dbus invoking other
++ // processes with an incomplete environment.
++ setupCursor(false);
++ QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
++
+ if (!startPlasmaSession(false))
+ return 1;
+
+--
+GitLab
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-14 11:15:08 UTC (rev 456102)
+++ PKGBUILD 2022-09-14 11:15:30 UTC (rev 456103)
@@ -1,65 +0,0 @@
-# Maintainer: Felix Yan <[email protected]>
-# Maintainer: Antonio Rojas <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgbase=plasma-workspace
-pkgname=(plasma-workspace plasma-wayland-session)
-pkgver=5.25.5
-pkgrel=2
-pkgdesc='KDE Plasma Workspace'
-arch=(x86_64)
-url='https://kde.org/plasma-desktop/'
-license=(LGPL)
-depends=(knotifyconfig ksystemstats ktexteditor libqalculate kde-cli-tools
appstream-qt
- xorg-xrdb xorg-xsetroot kactivitymanagerd kholidays xorg-xmessage
milou prison kwin
- plasma-integration kpeople kactivities-stats libkscreen kquickcharts
kuserfeedback
- accountsservice kio-extras kio-fuse qt5-tools oxygen-sounds)
-makedepends=(extra-cmake-modules kdoctools gpsd baloo networkmanager-qt
plasma-wayland-protocols kunitconversion kinit)
-groups=(plasma)
-source=(https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}
kde.pam
- https://invent.kde.org/plasma/plasma-workspace/-/commit/c7ba560c.patch)
-sha256sums=('bd74390273a18b117932b883a085840b3f364da6756262217337ea03e278bc5f'
- 'SKIP'
- '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
- 'd6d050aa8e7a8827f2b6c9110425a10f3e1c738a65019821c320fa1102890203')
-validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan
Esk-Riddell <[email protected]>
- '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah
<[email protected]>
- 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson
<[email protected]>
- '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin
<[email protected]>
-options=(debug)
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < c7ba560c.patch # Fix infinite recursion in
widget explorer
-}
-
-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'
- 'baloo: Baloo search runner' 'discover: manage applications
installation from the launcher')
- 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-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 456102,
plasma-workspace/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-09-14 11:15:30 UTC (rev 456103)
@@ -0,0 +1,68 @@
+# Maintainer: Felix Yan <[email protected]>
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=(plasma-workspace plasma-wayland-session)
+pkgver=5.25.5
+pkgrel=3
+pkgdesc='KDE Plasma Workspace'
+arch=(x86_64)
+url='https://kde.org/plasma-desktop/'
+license=(LGPL)
+depends=(knotifyconfig ksystemstats ktexteditor libqalculate kde-cli-tools
appstream-qt
+ xorg-xrdb xorg-xsetroot kactivitymanagerd kholidays xorg-xmessage
milou prison kwin
+ plasma-integration kpeople kactivities-stats libkscreen kquickcharts
kuserfeedback
+ accountsservice kio-extras kio-fuse qt5-tools oxygen-sounds)
+makedepends=(extra-cmake-modules kdoctools gpsd baloo networkmanager-qt
plasma-wayland-protocols kunitconversion kinit)
+groups=(plasma)
+source=(https://download.kde.org/stable/plasma/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}
kde.pam
+ https://invent.kde.org/plasma/plasma-workspace/-/commit/c7ba560c.patch
+ 9bf0e56d.patch)
+sha256sums=('bd74390273a18b117932b883a085840b3f364da6756262217337ea03e278bc5f'
+ 'SKIP'
+ '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
+ 'd6d050aa8e7a8827f2b6c9110425a10f3e1c738a65019821c320fa1102890203'
+ '61598f2334a50ff1607d41c31fbe121350d8a64f4e265966a171beeb52182c33')
+validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan
Esk-Riddell <[email protected]>
+ '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah
<[email protected]>
+ 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson
<[email protected]>
+ '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin
<[email protected]>
+options=(debug)
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < c7ba560c.patch # Fix infinite recursion in
widget explorer
+ patch -d $pkgname-$pkgver -p1 < 9bf0e56d.patch # Fix xdg-desktop-portal-kde
breakage with recent qt5-base
+}
+
+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'
+ 'baloo: Baloo search runner' 'discover: manage applications
installation from the launcher')
+ 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-xwayland)
+ groups=()
+
+ install -Dm644 build/login-sessions/plasmawayland.desktop
"$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
+}
Deleted: kde.pam
===================================================================
--- kde.pam 2022-09-14 11:15:08 UTC (rev 456102)
+++ kde.pam 2022-09-14 11:15:30 UTC (rev 456103)
@@ -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 456102,
plasma-workspace/trunk/kde.pam)
===================================================================
--- kde.pam (rev 0)
+++ kde.pam 2022-09-14 11:15:30 UTC (rev 456103)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
