This repository has been archived by the owner on May 20, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix xdg-desktop-portal-kde breakage with recent qt5-base (FS#75851)
git-svn-id: file:///srv/repos/svn-packages/svn@456102 eb2447ed-0c53-47e4-bac8-5bc4a241df78
- Loading branch information
1 parent
b1d1b48
commit b0e1161
Showing
2 changed files
with
55 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
From 9bf0e56da84de5e9bd2b3ff28bdb2cb1af6de91e Mon Sep 17 00:00:00 2001 | ||
From: Harald Sitter <sitter@kde.org> | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters