pull in upstream fix for autologin (sddm issue #1348)

0016-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch

@@ -0,0 +1,35 @@
+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 16/18] 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 b95f6e5..9f1fabc 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
+-- 
+2.29.2
+

0018-wayland-session-Ensure-SHELL-remains-correctly-set.patch

@@ -1,7 +1,7 @@
-From 0cd4e54b4a8656d9e131decc2cb9ca86bf82e81a Mon Sep 17 00:00:00 2001
+From bc5a18f34c0881929a6b2e5d3993971c4f692f4f Mon Sep 17 00:00:00 2001
 From: Neal Gompa <ngompa13@gmail.com>
 Date: Sun, 17 Jan 2021 11:48:28 -0500
-Subject: [PATCH] wayland-session: Ensure $SHELL remains correctly set
+Subject: [PATCH 18/18] wayland-session: Ensure $SHELL remains correctly set
 
 In some circumstances, the effort of setting the environment
 correctly can wind up clobbering the user-specified shell. To

sddm.spec

@@ -9,7 +9,7 @@
 
 Name:           sddm
 Version:        0.19.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2+
 Summary:        QML based X11 desktop manager
 
@@ -18,6 +18,9 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 ## upstream patches
 
+Patch16: 0016-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
+Patch18: 0018-wayland-session-Ensure-SHELL-remains-correctly-set.patch
+
 ## upstreamable patches
 
 # From: https://github.com/sddm/sddm/pull/997
@@ -26,9 +29,6 @@ Patch051:       0001-Remove-suffix-for-Wayland-session.patch
 # From: https://github.com/sddm/sddm/pull/1230
 Patch052:       0001-Redesign-Xauth-handling.patch
 
-# From: https://github.com/sddm/sddm/pull/1360
-Patch053:       0001-wayland-session-Ensure-SHELL-remains-correctly-set.patch
-
 ## downstream patches
 Patch101:       sddm-0.19.0-fedora_config.patch
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Thu Jan 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 0.19.0-5
+- pull in upstream fix for autologin (sddm issue #1348)
+
 * Tue Jan 26 2021 Rex Dieter <rdieter@fedoraproject.org> - 0.19.0-4
 - Refresh Xauth patch from upstream PR
 - minor .spec cosmetics