From 7df02a806e2c40f4ca70f67c500fb64ebf8f982f Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Apr 05 2023 11:26:45 +0000
Subject: Update to new snapshot to include a fix for logout issues (#2179591)


---

diff --git a/.gitignore b/.gitignore
index 6a9cfb2..df12fa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /sddm-8f1e3df4768bd521034e02602c4410b06aaef7d5.tar.gz
 /sddm-572b128c92c5bce366f5db136423b0b296448429.tar.gz
 /sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd.tar.gz
+/sddm-e6524335a54ca469401ee9487adc4ae973860aad.tar.gz
diff --git a/0001-Delay-for-logind-and-fallback-to-seat0.patch b/0001-Delay-for-logind-and-fallback-to-seat0.patch
index 8fa1e6d..e6292da 100644
--- a/0001-Delay-for-logind-and-fallback-to-seat0.patch
+++ b/0001-Delay-for-logind-and-fallback-to-seat0.patch
@@ -1,4 +1,4 @@
-From 5e6c0f872272fd617228628ab46c491313750019 Mon Sep 17 00:00:00 2001
+From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
 From: Jeremy Linton <jeremy.linton@arm.com>
 Date: Fri, 22 Oct 2021 14:51:54 -0500
 Subject: [PATCH] Delay for logind, and fallback to seat0
@@ -79,7 +79,7 @@ index 011bb7f..6255c69 100644
      if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
          qDebug() << "Console kit interface found";
 diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
-index 429ed19..9f569bb 100644
+index bd207e6..39d8b85 100644
 --- a/src/daemon/SeatManager.cpp
 +++ b/src/daemon/SeatManager.cpp
 @@ -26,6 +26,9 @@
@@ -124,7 +124,7 @@ index 429ed19..9f569bb 100644
 +
      void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
      {
-         auto logindSeat = new LogindSeat(name, objectPath, this);
+         auto logindSeat = new LogindSeat(name, objectPath);
 diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
 index b2f9796..aa43047 100644
 --- a/src/daemon/SeatManager.h
@@ -138,5 +138,5 @@ index b2f9796..aa43047 100644
  }
  
 -- 
-2.38.1
+2.39.2
 
diff --git a/sddm-PR1687.patch b/sddm-PR1687.patch
deleted file mode 100644
index 7e67308..0000000
--- a/sddm-PR1687.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0ec536c94a64b4ac85aff1191c758c5541be99c4 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Sat, 18 Mar 2023 01:42:53 +0100
-Subject: [PATCH] Make sure greeter sessions are set with
- QT_NO_XDG_DESKTOP_PORTAL=1
-
-Other processes involved could also be triggering xdp
----
- src/helper/HelperApp.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
-index 65ff08fb..4b6dc85a 100644
---- a/src/helper/HelperApp.cpp
-+++ b/src/helper/HelperApp.cpp
-@@ -168,6 +168,7 @@ namespace SDDM {
-         QProcessEnvironment env = authenticated(m_user);
- 
-         if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QLatin1String("greeter")) {
-+            env.insert(QStringLiteral("QT_NO_XDG_DESKTOP_PORTAL"), QStringLiteral("1"));
-             for (const auto &entry : mainConfig.GreeterEnvironment.get()) {
-                 const int index = entry.indexOf(QLatin1Char('='));
-                 if (index < 0) {
diff --git a/sddm.spec b/sddm.spec
index af6bc36..af98389 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -14,13 +14,13 @@
 %bcond_without sddm_wayland_default
 %endif
 
-%global commit e07e805c21310572b4fecc810fd5610b1d3d03fd
-%global commitdate 20230320
+%global commit e6524335a54ca469401ee9487adc4ae973860aad
+%global commitdate 20230404
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           sddm
 Version:        0.19.0%{?commitdate:^git%{commitdate}.%{shortcommit}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPLv2+
 Summary:        QML based desktop and login manager
 
@@ -41,12 +41,6 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 # Submmited: https://github.com/sddm/sddm/pull/1494
 Patch11:        0001-Delay-for-logind-and-fallback-to-seat0.patch
 
-# Disable xdg-desktop-portal-kde in Wayland
-# https://bugzilla.redhat.com/show_bug.cgi?id=2178971
-# https://bugzilla.redhat.com/show_bug.cgi?id=2129479
-# From: https://github.com/sddm/sddm/pull/1687
-Patch12:        sddm-PR1687.patch
-
 ## downstream patches
 Patch101:       sddm-0.20.0-fedora_config.patch
 
@@ -295,6 +289,9 @@ fi
 
 
 %changelog
+* Wed Apr 05 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20230404.e652433-1
+- Update to new snapshot to include a fix for logout issues (#2179591)
+
 * Mon Mar 20 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20230320.e07e805-2
 - Add patch to stop launching xdg-desktop-portal with Wayland greeter (#2178971, #2129479)
 
diff --git a/sources b/sources
index 33d14e6..17cd5fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sddm-e07e805c21310572b4fecc810fd5610b1d3d03fd.tar.gz) = d7dcfc02f3225fcab8a8b4636d2b00b1391ae1cff9117bd6f8ac6ca8607405e1f8170969e6b6bdcd191475dddc09111327fb2fbdcddbdd381232589944df3a1f
+SHA512 (sddm-e6524335a54ca469401ee9487adc4ae973860aad.tar.gz) = 5448223161da62f08c0559bbe1d2a68fc02c2955934099995f6a75c8e2561a9ba317ae23546bcf76d82a97c7437f6dd18d0e8532217b0595d7c29b4d739f99a2