summaryrefslogtreecommitdiff
path: root/user/sddm/autologin-type.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-08-19 22:26:54 -0500
committerZach van Rijn <me@zv.io>2022-10-21 18:34:02 -0500
commit40526154b709a62f45c832c02fb5d1ef56e16754 (patch)
treed0551f5e9fb34557ac3d16b62d1c24e0568e7e07 /user/sddm/autologin-type.patch
parentc27ed30b35be8092053a8e7210d10b4e0a8792e8 (diff)
downloadpackages-40526154b709a62f45c832c02fb5d1ef56e16754.tar.gz
packages-40526154b709a62f45c832c02fb5d1ef56e16754.tar.bz2
packages-40526154b709a62f45c832c02fb5d1ef56e16754.tar.xz
packages-40526154b709a62f45c832c02fb5d1ef56e16754.zip
user/sddm: Update to 0.19.0
Fixes: #368, #646
Diffstat (limited to 'user/sddm/autologin-type.patch')
-rw-r--r--user/sddm/autologin-type.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/user/sddm/autologin-type.patch b/user/sddm/autologin-type.patch
new file mode 100644
index 000000000..cc5738065
--- /dev/null
+++ b/user/sddm/autologin-type.patch
@@ -0,0 +1,31 @@
+From e81dfcd6913c4fbd1801597168291b1e396633d8 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Wed, 6 Jan 2021 16:00:34 +0100
+Subject: [PATCH] Fix sessions being started as the wrong type on autologin
+
+For autologin, the last session is used, which contains a full path.
+Display::findSessionEntry didn't handle that correctly, which led to
+X11 sessions getting started as Wayland ones (or the other way around
+before 994fa67).
+
+Fixes #1348
+---
+ src/daemon/Display.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp
+index b95f6e51e..9f1fabc68 100644
+--- a/src/daemon/Display.cpp
++++ b/src/daemon/Display.cpp
+@@ -245,6 +245,11 @@ namespace SDDM {
+ }
+
+ bool Display::findSessionEntry(const QDir &dir, const QString &name) const {
++ // Given an absolute path: Check that it matches dir
++ const QFileInfo fileInfo(name);
++ if (fileInfo.isAbsolute() && fileInfo.absolutePath() != dir.absolutePath())
++ return false;
++
+ QString fileName = name;
+
+ // append extension