From 7bc93a72c0a4a8d48ccea8522260973ce5b5d92c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 28 Feb 2022 17:30:15 -0500
Subject: [PATCH] Update to new snapshot

Drop merged proposed patch to not ignore EINTR when activating
---
 .gitignore                                    |  1 +
 ...-do-not-ignore-EINTR-when-activating.patch | 43 -------------------
 sddm.spec                                     | 14 +++---
 sources                                       |  2 +-
 4 files changed, 9 insertions(+), 51 deletions(-)
 delete mode 100644 0001-VirtualTerminal-do-not-ignore-EINTR-when-activating.patch

diff --git a/.gitignore b/.gitignore
index 344b58b..fa4a796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /sddm-6b8e837f3c1c0339c10db6719b1f33aa662a80ed.tar.gz
 /sddm-85cbf3f2cda66f8deadea5f1e2e627a466aba885.tar.gz
 /sddm-5ad9f19d958e69e9c3f08baa9161794ceafe4da7.tar.gz
+/sddm-c257a40ba95f56b5f3830b923b1c56aa055cf8ea.tar.gz
diff --git a/0001-VirtualTerminal-do-not-ignore-EINTR-when-activating.patch b/0001-VirtualTerminal-do-not-ignore-EINTR-when-activating.patch
deleted file mode 100644
index 80dd78b..0000000
--- a/0001-VirtualTerminal-do-not-ignore-EINTR-when-activating.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 704e4ce6c334dcf5db1fe9af22eabd335cebb775 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 25 Feb 2022 03:02:40 +0100
-Subject: [PATCH] VirtualTerminal: do not ignore EINTR when activating
-
-EINTR can be called at any time when a signal is received but here we
-still need to follow through with both ioctl() calls.
-
-This change is inspired by how xserver does more or less the same thing.
----
- src/common/VirtualTerminal.cpp | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/VirtualTerminal.cpp b/src/common/VirtualTerminal.cpp
-index e1330af..7791caf 100644
---- a/src/common/VirtualTerminal.cpp
-+++ b/src/common/VirtualTerminal.cpp
-@@ -211,10 +211,19 @@ out:
-             if (!vt_auto)
-                 handleVtSwitches(fd);
- 
--            if (ioctl(fd, VT_ACTIVATE, vt) < 0)
-+            int ret;
-+            while ((ret = ioctl(fd, VT_ACTIVATE, vt) < 0) && errno == EINTR)
-+            {}
-+
-+            if (ret < 0)
-                 qWarning("Couldn't initiate jump to VT %d: %s", vt, strerror(errno));
--            else if (ioctl(fd, VT_WAITACTIVE, vt) < 0)
--                qWarning("Couldn't finalize jump to VT %d: %s", vt, strerror(errno));
-+            else {
-+                while ((ret = ioctl(fd, VT_WAITACTIVE, vt) < 0) && errno == EINTR)
-+                {}
-+
-+                if (ret < 0)
-+                    qWarning("Couldn't finalize jump to VT %d: %s", vt, strerror(errno));
-+            }
- 
-             close(activeVtFd);
-             if (vtFd != -1)
--- 
-2.34.1
-
diff --git a/sddm.spec b/sddm.spec
index 8e88d7b..405216a 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -14,13 +14,13 @@
 %bcond_without sddm_wayland_default
 %endif
 
-%global commit 5ad9f19d958e69e9c3f08baa9161794ceafe4da7
-%global commitdate 20220224
+%global commit c257a40ba95f56b5f3830b923b1c56aa055cf8ea
+%global commitdate 20220228
 %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
 
@@ -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
 
-# VirtualTerminal: do not ignore EINTR when activating
-# Submitted: https://github.com/sddm/sddm/pull/1521
-Patch12:       0001-VirtualTerminal-do-not-ignore-EINTR-when-activating.patch
-
 ## downstream patches
 Patch101:       sddm-0.20.0-fedora_config.patch
 
@@ -303,6 +299,10 @@ fi
 
 
 %changelog
+* Mon Feb 28 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20220228.c257a40-1
+- Update to new snapshot
+- Drop merged proposed patch to not ignore EINTR when activating
+
 * Fri Feb 25 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.19.0^git20220224.5ad9f19-2
 - Add proposed patch to not ignore EINTR when activating
 
diff --git a/sources b/sources
index 1b6a3bd..89e12b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sddm-5ad9f19d958e69e9c3f08baa9161794ceafe4da7.tar.gz) = c949a361144fdd562cfaf5eaff3f0bbd2ea6e4df664d9e4a2d7dd05680da44c537428e50ff2dcf0ea50a1c3cafa2a15609ecd0b9294b537909dc53ead2781683
+SHA512 (sddm-c257a40ba95f56b5f3830b923b1c56aa055cf8ea.tar.gz) = 48a164c45774b6d19abc8d9664ec1e8c1921746ba7e5ecc3f726e6221957fb86fea43c483b067f4caa78ea2a3699cd3066c5e93e2b7256098a985a2425ddcc65