From 920d05439766ad76bc9d4aac78412661f495effb Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Thu, 22 Sep 2022 12:39:17 -0400
Subject: [PATCH] Update to new snapshot

---
 .gitignore |  1 +
 1526.patch | 25 -------------------------
 sddm.spec  | 13 ++++++-------
 sources    |  2 +-
 4 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 1526.patch

diff --git a/.gitignore b/.gitignore
index 7b702bd..e44aef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /sddm-5ad9f19d958e69e9c3f08baa9161794ceafe4da7.tar.gz
 /sddm-c257a40ba95f56b5f3830b923b1c56aa055cf8ea.tar.gz
 /sddm-e67307e4103a8606d57a0c2fd48a378e40fcef06.tar.gz
+/sddm-21e965aab8d93180966bbb19788bc42bdf2baee7.tar.gz
diff --git a/1526.patch b/1526.patch
deleted file mode 100644
index d22555c..0000000
--- a/1526.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 38eb9a807a79aeb365b48e7ec1323fdd885d1f58 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 4 Mar 2022 18:28:36 +0100
-Subject: [PATCH] MessageHandler: Also use journald if the process is run by
- sddm
-
-This way we don't end up in the awkward position of having to fish for
-the logs somewhere in /var
----
- src/common/MessageHandler.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/common/MessageHandler.h b/src/common/MessageHandler.h
-index 47ab0af0..db6c5387 100644
---- a/src/common/MessageHandler.h
-+++ b/src/common/MessageHandler.h
-@@ -126,7 +126,7 @@ namespace SDDM {
- #ifdef HAVE_JOURNALD
-         // don't log to journald if running interactively, this is likely
-         // the case when running sddm in test mode
--        static bool isInteractive = isatty(STDIN_FILENO);
-+        static bool isInteractive = isatty(STDIN_FILENO) && qgetenv("USER") != "sddm";
-         if (!isInteractive) {
-             // log to journald
-             journaldLogger(type, context, logMessage);
diff --git a/sddm.spec b/sddm.spec
index 4503225..d71b965 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -14,13 +14,13 @@
 %bcond_without sddm_wayland_default
 %endif
 
-%global commit e67307e4103a8606d57a0c2fd48a378e40fcef06
-%global commitdate 20220321
+%global commit 21e965aab8d93180966bbb19788bc42bdf2baee7
+%global commitdate 20220921
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           sddm
 Version:        0.19.0%{?commitdate:^git%{commitdate}.%{shortcommit}}
-Release:        4%{?dist}
+Release:        1%{?dist}
 License:        GPLv2+
 Summary:        QML based desktop and login manager
 
@@ -48,10 +48,6 @@ Patch10:       sddm-0.20.0-allow-hiding-wayland-sessions.patch
 # Submmited: https://github.com/sddm/sddm/pull/1494
 Patch11:       0001-Delay-for-logind-and-fallback-to-seat0.patch
 
-# https://github.com/sddm/sddm/pull/1526
-# Try to get sddm to log to the journal more
-Patch13:        1526.patch
-
 ## downstream patches
 Patch101:       sddm-0.20.0-fedora_config.patch
 
@@ -303,6 +299,9 @@ fi
 
 
 %changelog
+* Thu Sep 22 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20220921.21e965a-1
+- Update to new snapshot
+
 * Thu Aug 18 2022 Timothée Ravier <tim@siosm.fr> - 0.19.0^git20220321.e67307e-4
 - Skip enabling Wayland by default on F37
 
diff --git a/sources b/sources
index 61e4d1a..809184d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sddm-e67307e4103a8606d57a0c2fd48a378e40fcef06.tar.gz) = a520e2f7914ffa0b8fb7223486210e732edf9f0814e47aeb95b92cbb096d8adb63b45eb30b719d1fcf79feb0784707749ac8cfc7d73db251692f3625d3d324a3
+SHA512 (sddm-21e965aab8d93180966bbb19788bc42bdf2baee7.tar.gz) = b02f0a027ae1a63348c328efbace295441583fdadbcaecb7eb1882356d420dfa31870548458e961b26b8d48fd3bb52c0612dedd93c17ef63767a9685068e475f