$ git show --format=fuller --patch-with-stat --summary 9a01b9eff1aa278fbdace577791d933ce88b5bb5
commit 9a01b9eff1aa278fbdace577791d933ce88b5bb5
Author: tpgxyz <tpgxyz@gmail.com>
AuthorDate: Tue Mar 16 11:23:30 2021 +0100
Commit: tpgxyz <tpgxyz@gmail.com>
CommitDate: Tue Mar 16 11:23:30 2021 +0100
sync patches
---
0000-Improve-font-config-deserialization.patch | 4 +-
0001-Use-PAM-s-username.patch | 42 ++++++
...nly-use-the-base-name-for-DESKTOP_SESSION.patch | 4 +-
...x-compilation-once-QTBUG-88431-gets-fixed.patch | 26 ++++
...l-and-testing-paths-in-XorgDisplayServer-.patch | 5 +-
...=> 0010-Retry-starting-the-display-server.patch | 4 +-
...-Explicitly-stop-Xorg-when-starting-fails.patch | 34 ++---
...splayServer-started-only-when-the-auth-fi.patch | 6 +-
...s-being-started-as-the-wrong-type-on-auto.patch | 5 +-
...ession-Ensure-SHELL-remains-correctly-set.patch | 2 +-
0018-Update-sv.ts-1342.patch | 155 +++++++++++++++++++++
...h => 0019-Clear-VT-before-switching-to-it.patch | 2 +-
...-potential-crash-when-not-in-testing-mode.patch | 34 +++++
...ion-env-vars-to-be-defined-in-session-fil.patch | 125 +++++++++++++++++
...c-profile-and-HOME-.profile-sourcing-1331.patch | 40 ++++++
0023-Error-in-elarun-theme-1336.patch | 39 ++++++
...-in-FacesDir-first-and-if-not-found-searc.patch | 46 ++++++
0025-Remove-suffix-for-Wayland-session-997.patch | 97 +++++++++++++
0026-Fix-warning-from-SDDM-generateName.patch | 35 +++++
sddm.spec | 38 +++--
20 files changed, 693 insertions(+), 50 deletions(-)
create mode 100644 0001-Use-PAM-s-username.patch
rename 0001-Only-use-the-base-name-for-DESKTOP_SESSION.patch => 0004-Only-use-the-base-name-for-DESKTOP_SESSION.patch (90%)
create mode 100644 0005-Fix-compilation-once-QTBUG-88431-gets-fixed.patch
rename 0002-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch => 0006-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch (98%)
rename 0003-Retry-starting-the-display-server.patch => 0010-Retry-starting-the-display-server.patch (98%)
rename 0004-Explicitly-stop-Xorg-when-starting-fails.patch => 0011-Explicitly-stop-Xorg-when-starting-fails.patch (72%)
rename 0005-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch => 0012-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch (90%)
rename 0006-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch => 0014-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch (93%)
rename 0007-wayland-session-Ensure-SHELL-remains-correctly-set.patch => 0016-wayland-session-Ensure-SHELL-remains-correctly-set.patch (93%)
create mode 100644 0018-Update-sv.ts-1342.patch
rename 0008-Clear-VT-before-switching-to-it.patch => 0019-Clear-VT-before-switching-to-it.patch (94%)
create mode 100644 0020-Prevent-potential-crash-when-not-in-testing-mode.patch
create mode 100644 0021-Allow-addition-env-vars-to-be-defined-in-session-fil.patch
create mode 100644 0022-Add-fish-etc-profile-and-HOME-.profile-sourcing-1331.patch
create mode 100644 0023-Error-in-elarun-theme-1336.patch
create mode 100644 0024-Use-avatars-in-FacesDir-first-and-if-not-found-searc.patch
create mode 100644 0025-Remove-suffix-for-Wayland-session-997.patch
create mode 100644 0026-Fix-warning-from-SDDM-generateName.patch
diff --git a/0000-Improve-font-config-deserialization.patch b/0000-Improve-font-config-deserialization.patch
index 6907127..66d7606 100644
--- a/0000-Improve-font-config-deserialization.patch
+++ b/0000-Improve-font-config-deserialization.patch
@@ -1,7 +1,7 @@
From 93e0d5d2433ac10f92aaa22bc280750059bb7fee Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 4 Nov 2020 17:40:13 +0100
-Subject: [PATCH] Improve font config deserialization
+Subject: [PATCH 00/26] Improve font config deserialization
Going from QString -> QVariant -> QFont isn't ideal and means that it tries
to create a QFont from a null/empty QString as well, resulting in a warning:
@@ -34,5 +34,5 @@ index bbce512..01f53fa 100644
// Set session model on proxy
m_proxy->setSessionModel(m_sessionModel);
--
-2.30.0
+2.30.1
diff --git a/0001-Use-PAM-s-username.patch b/0001-Use-PAM-s-username.patch
new file mode 100644
index 0000000..3260b5d
--- /dev/null
+++ b/0001-Use-PAM-s-username.patch
@@ -0,0 +1,42 @@
+From 15163c37ca027ed4fdfcdf7bf5195eefe7aef10b Mon Sep 17 00:00:00 2001
+From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+Date: Thu, 5 Nov 2020 00:52:27 -0300
+Subject: [PATCH 01/26] Use PAM's username
+
+The provided username might differ from full username. This happens
+for sssd with multiple domains where the username is suffixed with
+@domain. However, the user can type only username without a suffix
+and let sssd find the first username match according to
+domain_resolution_order.
+
+Fixes #1303
+
+Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+---
+ src/helper/UserSession.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index c9a8a20..dbf39fc 100644
+--- a/src/helper/UserSession.cpp
++++ b/src/helper/UserSession.cpp
+@@ -175,13 +175,13 @@ namespace SDDM {
+ // fetch session's user's groups
+ int n_user_groups = 0;
+ gid_t *user_groups = NULL;
+- if (-1 == getgrouplist(username.constData(), pw.pw_gid,
++ if (-1 == getgrouplist(pw.pw_name, pw.pw_gid,
+ NULL, &n_user_groups)) {
+ user_groups = new gid_t[n_user_groups];
+- if ((n_user_groups = getgrouplist(username.constData(),
++ if ((n_user_groups = getgrouplist(pw.pw_name,
+ pw.pw_gid, user_groups,
+ &n_user_groups)) == -1 ) {
+- qCritical() << "getgrouplist(" << username << ", " << pw.pw_gid
++ qCritical() << "getgrouplist(" << pw.pw_name << ", " << pw.pw_gid
+ << ") failed";
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+--
+2.30.1
+
diff --git a/0001-Only-use-the-base-name-for-DESKTOP_SESSION.patch b/0004-Only-use-the-base-name-for-DESKTOP_SESSION.patch
similarity index 90%
rename from 0001-Only-use-the-base-name-for-DESKTOP_SESSION.patch
rename to 0004-Only-use-the-base-name-for-DESKTOP_SESSION.patch
index 470b466..f5352b0 100644
--- a/0001-Only-use-the-base-name-for-DESKTOP_SESSION.patch
+++ b/0004-Only-use-the-base-name-for-DESKTOP_SESSION.patch
@@ -1,7 +1,7 @@
From 5fd5ed271a0e5b8c8857cc4f5f2084d43fd228f1 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 9 Nov 2020 11:22:15 +0100
-Subject: [PATCH] Only use the base name for $DESKTOP_SESSION
+Subject: [PATCH 04/26] Only use the base name for $DESKTOP_SESSION
Other DMs don't use the path.
@@ -24,5 +24,5 @@ index 2d7b04f..3de28ef 100644
QString Session::desktopNames() const
--
-2.30.0
+2.30.1
diff --git a/0005-Fix-compilation-once-QTBUG-88431-gets-fixed.patch b/0005-Fix-compilation-once-QTBUG-88431-gets-fixed.patch
new file mode 100644
index 0000000..01e06ff
--- /dev/null
+++ b/0005-Fix-compilation-once-QTBUG-88431-gets-fixed.patch
@@ -0,0 +1,26 @@
+From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
+From: "aacid@kde.org" <aacid@kde.org>
+Date: Thu, 12 Nov 2020 23:42:48 +0100
+Subject: [PATCH 05/26] Fix compilation once QTBUG-88431 gets fixed
+
+And also comes closes to Qt6 compatibility
+---
+ src/daemon/XorgDisplayServer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
+index 5f93a1b..d5f29a9 100644
+--- a/src/daemon/XorgDisplayServer.cpp
++++ b/src/daemon/XorgDisplayServer.cpp
+@@ -65,7 +65,7 @@ namespace SDDM {
+ // create a random hexadecimal number
+ const char *digits = "0123456789abcdef";
+ for (int i = 0; i < 32; ++i)
+- m_cookie[i] = digits[dis(gen)];
++ m_cookie[i] = QLatin1Char(digits[dis(gen)]);
+ }
+
+ XorgDisplayServer::~XorgDisplayServer() {
+--
+2.30.1
+
diff --git a/0002-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch b/0006-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch
similarity index 98%
rename from 0002-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch
rename to 0006-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch
index f28ead0..315e5c8 100644
--- a/0002-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch
+++ b/0006-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch
@@ -1,7 +1,8 @@
From 68cc9e31d1a4c4609f42114782fc485cb07353a4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 9 Oct 2020 21:06:01 +0200
-Subject: [PATCH] Merge normal and testing paths in XorgDisplayServer::start
+Subject: [PATCH 06/26] Merge normal and testing paths in
+ XorgDisplayServer::start
They have much in common and this means that Xephyr can also make use use
of -displayfd now.
@@ -170,5 +171,5 @@ index d5f29a9..e60c022 100644
// The file is also used by the greeter, which does care about the
// display number. Write the proper entry, if it's different.
--
-2.30.0
+2.30.1
diff --git a/0003-Retry-starting-the-display-server.patch b/0010-Retry-starting-the-display-server.patch
similarity index 98%
rename from 0003-Retry-starting-the-display-server.patch
rename to 0010-Retry-starting-the-display-server.patch
index 2ecc778..27f3ed7 100644
--- a/0003-Retry-starting-the-display-server.patch
+++ b/0010-Retry-starting-the-display-server.patch
@@ -1,7 +1,7 @@
From 42c51761cc82edbaa50d702a4614e179ad4bcd63 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Thu, 12 Nov 2020 20:30:55 +0100
-Subject: [PATCH] Retry starting the display server
+Subject: [PATCH 10/26] Retry starting the display server
Even if the CanGraphical property of a Seat is true, it's possible that it's
still too early for X to start, as it might need some driver or device which
@@ -114,5 +114,5 @@ index e60c022..5f40fe8 100644
QFile::remove(m_authPath);
--
-2.30.0
+2.30.1
diff --git a/0004-Explicitly-stop-Xorg-when-starting-fails.patch b/0011-Explicitly-stop-Xorg-when-starting-fails.patch
similarity index 72%
rename from 0004-Explicitly-stop-Xorg-when-starting-fails.patch
rename to 0011-Explicitly-stop-Xorg-when-starting-fails.patch
index c08fef2..387a551 100644
--- a/0004-Explicitly-stop-Xorg-when-starting-fails.patch
+++ b/0011-Explicitly-stop-Xorg-when-starting-fails.patch
@@ -1,7 +1,7 @@
From 3b00cd06f82837ba85f37c9f632261e7b4c6fd35 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 9 Dec 2020 19:28:41 +0100
-Subject: [PATCH] Explicitly stop Xorg when starting fails
+Subject: [PATCH 11/26] Explicitly stop Xorg when starting fails
When Xorg starts but there is an error, stop it explicitly instead of assuming
that X exits itself. This avoids a possibly lingering Xorg process in the
@@ -11,10 +11,11 @@ restarted too early (shouldn't happen).
src/daemon/XorgDisplayServer.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
-diff -Naur a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
---- a/src/daemon/XorgDisplayServer.cpp 2021-01-15 15:17:13.126000000 +0000
-+++ b/src/daemon/XorgDisplayServer.cpp 2021-01-15 15:23:33.541000000 +0000
-@@ -84,6 +84,11 @@
+diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
+index 5f40fe8..3a7bee0 100644
+--- a/src/daemon/XorgDisplayServer.cpp
++++ b/src/daemon/XorgDisplayServer.cpp
+@@ -118,6 +118,11 @@ namespace SDDM {
if (m_started)
return false;
@@ -26,15 +27,7 @@ diff -Naur a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
// create process
process = new QProcess(this);
-@@ -147,6 +152,7 @@
-
- // return fail
- close(pipeFds[0]);
-+ stop();
- return false;
- }
-
-@@ -160,6 +166,7 @@
+@@ -195,6 +200,7 @@ namespace SDDM {
qCritical("Failed to open pipe to start X Server");
close(pipeFds[0]);
@@ -42,7 +35,7 @@ diff -Naur a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
return false;
}
QByteArray displayNumber = readPipe.readLine();
-@@ -168,6 +175,7 @@
+@@ -203,6 +209,7 @@ namespace SDDM {
qCritical("Failed to read display number from pipe");
close(pipeFds[0]);
@@ -50,15 +43,15 @@ diff -Naur a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
return false;
}
displayNumber.prepend(QByteArray(":"));
-@@ -184,6 +192,7 @@
+@@ -219,6 +226,7 @@ namespace SDDM {
if(m_display != QStringLiteral(":0")) {
- if(!Xauth::writeCookieToFile(m_authPath, m_display, m_cookie)) {
+ if(!addCookie(m_authPath)) {
qCritical() << "Failed to write xauth file";
+ stop();
return false;
}
}
-@@ -197,8 +206,7 @@
+@@ -232,8 +240,7 @@ namespace SDDM {
}
void XorgDisplayServer::stop() {
@@ -68,5 +61,6 @@ diff -Naur a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
return;
// log message
---
-2.30.0
+--
+2.30.1
+
diff --git a/0005-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch b/0012-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch
similarity index 90%
rename from 0005-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch
rename to 0012-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch
index 705f4f2..556f1a6 100644
--- a/0005-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch
+++ b/0012-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch
@@ -1,8 +1,8 @@
From b2520c9fdeff081b1ac66a4a15289cedfa6944b9 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 9 Dec 2020 19:33:08 +0100
-Subject: [PATCH] Emit XorgDisplayServer::started only when the auth file is
- ready
+Subject: [PATCH 12/26] Emit XorgDisplayServer::started only when the auth file
+ is ready
---
src/daemon/XorgDisplayServer.cpp | 4 ++--
@@ -31,5 +31,5 @@ index 3a7bee0..331adcd 100644
m_started = true;
--
-2.30.0
+2.30.1
diff --git a/0006-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch b/0014-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
similarity index 93%
rename from 0006-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
rename to 0014-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
index 2942fe6..9c6658a 100644
--- a/0006-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
+++ b/0014-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
@@ -1,7 +1,8 @@
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
+Subject: [PATCH 14/26] 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
@@ -30,5 +31,5 @@ index b95f6e5..9f1fabc 100644
// append extension
--
-2.30.0
+2.30.1
diff --git a/0007-wayland-session-Ensure-SHELL-remains-correctly-set.patch b/0016-wayland-session-Ensure-SHELL-remains-correctly-set.patch
similarity index 93%
rename from 0007-wayland-session-Ensure-SHELL-remains-correctly-set.patch
rename to 0016-wayland-session-Ensure-SHELL-remains-correctly-set.patch
index 2a92d79..fa212f4 100644
--- a/0007-wayland-session-Ensure-SHELL-remains-correctly-set.patch
+++ b/0016-wayland-session-Ensure-SHELL-remains-correctly-set.patch
@@ -1,7 +1,7 @@
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 16/26] 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
diff --git a/0018-Update-sv.ts-1342.patch b/0018-Update-sv.ts-1342.patch
new file mode 100644
index 0000000..2638a7e
--- /dev/null
+++ b/0018-Update-sv.ts-1342.patch
@@ -0,0 +1,155 @@
+From 15ed813db4524b7840774a5f112507175546e08a Mon Sep 17 00:00:00 2001
+From: archviking <75440442+archviking@users.noreply.github.com>
+Date: Mon, 22 Feb 2021 00:02:24 +0100
+Subject: [PATCH 18/26] Update sv.ts (#1342)
+
+Co-authored-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
+---
+ data/translations/sv.ts | 72 +++++++++++++++++++++++++++++------------
+ 1 file changed, 51 insertions(+), 21 deletions(-)
+
+diff --git a/data/translations/sv.ts b/data/translations/sv.ts
+index 2854f05..3421a71 100644
+--- a/data/translations/sv.ts
++++ b/data/translations/sv.ts
+@@ -1,10 +1,9 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!DOCTYPE TS>
+-<TS version="2.1" language="nn">
++<TS version="2.1" language="sv">
+ <context>
+ <name>PictureBox</name>
+ <message>
+- <location filename="../../components/2.0/PictureBox.qml" line="123"/>
+ <source>Press to login</source>
+ <translation>Tryck för att logga in</translation>
+ </message>
+@@ -12,7 +11,6 @@
+ <context>
+ <name>QObject</name>
+ <message>
+- <location filename="../../src/common/Session.cpp" line="166"/>
+ <source>%1 (Wayland)</source>
+ <translation>%1 (Wayland)</translation>
+ </message>
+@@ -20,57 +18,54 @@
+ <context>
+ <name>TextConstants</name>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="28"/>
++ <source>Welcome to %1</source>
++ <translation>Välkommen till %1</translation>
++ </message>
++ <message>
+ <source>Warning, Caps Lock is ON!</source>
+ <translation>Varning, «Caps Lock» är på!</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="29"/>
+ <source>Layout</source>
+ <translation>Tangentbordslayout</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="30"/>
+ <source>Login</source>
+ <translation>Logga in</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="31"/>
+ <source>Login failed</source>
+ <translation>Inloggningen misslyckades</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="32"/>
+ <source>Login succeeded</source>
+ <translation>Inloggningen lyckades</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="33"/>
+ <source>Password</source>
+ <translation>Lösenord</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="34"/>
+ <source>Enter your username and password</source>
+ <translation>Fyll i ditt användarnamn och lösenord</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="35"/>
+- <source>Select your user and enter password</source>
+- <translation>Välj din användare och ange lösenord</translation>
+- </message>
+- <message>
+- <location filename="../../components/common/TextConstants.qml" line="36"/>
+ <source>Reboot</source>
+ <translation>Starta om</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="37"/>
++ <source>Suspend</source>
++ <translation>Vänteläge</translation>
++ </message>
++ <message>
++ <source>Hibernate</source>
++ <translation>Viloläge</translation>
++ </message>
++ <message>
+ <source>Session</source>
+ <translation>Session</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="38"/>
+ <source>Shutdown</source>
+ <translation>Stäng av</translation>
+ </message>
+@@ -80,9 +75,44 @@
+ <translation>Användarnamn</translation>
+ </message>
+ <message>
+- <location filename="../../components/common/TextConstants.qml" line="40"/>
+- <source>Welcome to %1</source>
+- <translation>Välkommen till %1</translation>
++ <source>Enter your username</source>
++ <translation>Fyll i ditt användarnamn</translation>
++ </message>
++ <message>
++ <source>Enter your password</source>
++ <translation>Fyll i ditt lösenord</translation>
++ </message>
++ <message>
++ <source>Select your user and enter password</source>
++ <translation>Välj användarnamn och skriv in lösenord</translation>
++ </message>
++ <message>
++ <source>Show password</source>
++ <translation>Visa lösenord</translation>
++ </message>
++ <message>
++ <source>Hide password</source>
++ <translation>Dölj lösenord</translation>
++ </message>
++ <message>
++ <source>Please enter a password!</source>
++ <translation>Fyll i lösenord!</translation>
++ </message>
++ <message>
++ <source>Change password</source>
++ <translation>Ändra lösenord</translation>
++ </message>
++ <message>
++ <source>Unregistered user</source>
++ <translation>Ogiltig användarnamn</translation>
++ </message>
++ <message>
++ <source>Password change aborted because maximum tries reached</source>
++ <translation>Lösenordsbyte avbröts eftersom maximalt antal försök har uppnåtts</translation>
++ </message>
++ <message>
++ <source>New password change round! Please input current password again!</source>
++ <translation>Nytt varv för lösenordsbyte! Skriv in nuvarande lösenord igen!</translation>
+ </message>
+ </context>
+ </TS>
+--
+2.30.1
+
diff --git a/0008-Clear-VT-before-switching-to-it.patch b/0019-Clear-VT-before-switching-to-it.patch
similarity index 94%
rename from 0008-Clear-VT-before-switching-to-it.patch
rename to 0019-Clear-VT-before-switching-to-it.patch
index ff52edf..ca23607 100644
--- a/0008-Clear-VT-before-switching-to-it.patch
+++ b/0019-Clear-VT-before-switching-to-it.patch
@@ -1,7 +1,7 @@
From 8b371572ab6cf5f4652b7f95c700b13a89c9f109 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Date: Sun, 28 Feb 2021 12:18:31 +0100
-Subject: [PATCH] Clear VT before switching to it
+Subject: [PATCH 19/26] Clear VT before switching to it
Make sure the VT is clean.
---
diff --git a/0020-Prevent-potential-crash-when-not-in-testing-mode.patch b/0020-Prevent-potential-crash-when-not-in-testing-mode.patch
new file mode 100644
index 0000000..1ef9c4d
--- /dev/null
+++ b/0020-Prevent-potential-crash-when-not-in-testing-mode.patch
@@ -0,0 +1,34 @@
+From 2d22db89bacaf9a374ba33052bed98f7604a5b85 Mon Sep 17 00:00:00 2001
+From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
+Date: Sun, 7 Mar 2021 17:38:26 +0100
+Subject: [PATCH 20/26] Prevent potential crash when not in testing mode
+
+The process is created only in testing mode. Protect against crashes by
+checking the pointer before deleting the object.
+
+However this shouldn't happen since this slot is currently used only in
+testing mode.
+---
+ src/daemon/Greeter.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 878576b..436ecc3 100644
+--- a/src/daemon/Greeter.cpp
++++ b/src/daemon/Greeter.cpp
+@@ -240,8 +240,10 @@ namespace SDDM {
+ qDebug() << "Greeter stopped.";
+
+ // clean up
+- m_process->deleteLater();
+- m_process = nullptr;
++ if (m_process) {
++ m_process->deleteLater();
++ m_process = nullptr;
++ }
+ }
+
+ void Greeter::onRequestChanged() {
+--
+2.30.1
+
diff --git a/0021-Allow-addition-env-vars-to-be-defined-in-session-fil.patch b/0021-Allow-addition-env-vars-to-be-defined-in-session-fil.patch
new file mode 100644
index 0000000..7268de7
--- /dev/null
+++ b/0021-Allow-addition-env-vars-to-be-defined-in-session-fil.patch
@@ -0,0 +1,125 @@
+From 093e8e54c7de33c2d7332cc3a126041263e1aa71 Mon Sep 17 00:00:00 2001
+From: davidedmundson <kde@davidedmundson.co.uk>
+Date: Mon, 8 Mar 2021 07:35:55 +0000
+Subject: [PATCH 21/26] Allow addition env vars to be defined in session files
+ (#1370)
+
+We have a continual problem with developers using Plasma in custom
+prefixes. We need to set mulitple additional envs and it is a constant
+pain point.
+
+Setting XDG_DATA_DIRS and alike in a script in the Exec line of the
+desktop file doesn't work properly, as this is after systemd and dbus
+have already been started during pam_logind. It is currently very bodged
+with more manual steps.
+
+Things will work much better if we can set the env before pam_logind is
+run.
+
+Using pam_env or profile.d doesn't work as that affects all the
+sessions.
+
+It is not intended to be used for anything other than dev setups.
+---
+ src/common/Session.cpp | 24 ++++++++++++++++++++++++
+ src/common/Session.h | 5 +++++
+ src/daemon/Display.cpp | 1 +
+ 3 files changed, 30 insertions(+)
+
+diff --git a/src/common/Session.cpp b/src/common/Session.cpp
+index 3de28ef..0aa5402 100644
+--- a/src/common/Session.cpp
++++ b/src/common/Session.cpp
+@@ -107,6 +107,10 @@ namespace SDDM {
+ return m_isNoDisplay;
+ }
+
++ QProcessEnvironment Session::additionalEnv() const {
++ return m_additionalEnv;
++ }
++
+ void Session::setTo(Type type, const QString &_fileName)
+ {
+ QString fileName(_fileName);
+@@ -178,6 +182,8 @@ namespace SDDM {
+ m_isHidden = line.mid(7).toLower() == QLatin1String("true");
+ if (line.startsWith(QLatin1String("NoDisplay=")))
+ m_isNoDisplay = line.mid(10).toLower() == QLatin1String("true");
++ if (line.startsWith(QLatin1String("X-SDDM-Env=")))
++ m_additionalEnv = parseEnv(line.mid(strlen("X-SDDM-Env=")));
+ }
+
+ file.close();
+@@ -191,4 +197,22 @@ namespace SDDM {
+ setTo(other.type(), other.fileName());
+ return *this;
+ }
++
++ QProcessEnvironment SDDM::Session::parseEnv(const QString &list)
++ {
++ QProcessEnvironment env;
++
++ const QVector<QStringRef> entryList = list.splitRef(QLatin1Char(','));
++ for (const auto &entry: entryList) {
++ int midPoint = entry.indexOf(QLatin1Char('='));
++ if (midPoint < 0) {
++ qWarning() << "Malformed entry in" << fileName() << ":" << entry;
++ continue;
++ }
++ env.insert(entry.left(midPoint).toString(), entry.mid(midPoint+1).toString());
++ }
++ return env;
++ }
++
++
+ }
+diff --git a/src/common/Session.h b/src/common/Session.h
+index 9fd86cd..aa196e9 100644
+--- a/src/common/Session.h
++++ b/src/common/Session.h
+@@ -23,6 +23,7 @@
+ #include <QDataStream>
+ #include <QDir>
+ #include <QSharedPointer>
++#include <QProcessEnvironment>
+
+ namespace SDDM {
+ class SessionModel;
+@@ -59,11 +60,14 @@ namespace SDDM {
+ bool isHidden() const;
+ bool isNoDisplay() const;
+
++ QProcessEnvironment additionalEnv() const;
++
+ void setTo(Type type, const QString &name);
+
+ Session &operator=(const Session &other);
+
+ private:
++ QProcessEnvironment parseEnv(const QString &list);
+ bool m_valid;
+ Type m_type;
+ QDir m_dir;
+@@ -75,6 +79,7 @@ namespace SDDM {
+ QString m_tryExec;
+ QString m_xdgSessionType;
+ QString m_desktopNames;
++ QProcessEnvironment m_additionalEnv;
+ bool m_isHidden;
+ bool m_isNoDisplay;
+
+diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp
+index 9f1fabc..a65df3f 100644
+--- a/src/daemon/Display.cpp
++++ b/src/daemon/Display.cpp
+@@ -313,6 +313,7 @@ namespace SDDM {
+ qDebug() << "Session" << m_sessionName << "selected, command:" << session.exec();
+
+ QProcessEnvironment env;
++ env.insert(session.additionalEnv());
+
+ if (seat()->name() == QLatin1String("seat0")) {
+ // Use the greeter VT, for wayland sessions the helper overwrites this
+--
+2.30.1
+
diff --git a/0022-Add-fish-etc-profile-and-HOME-.profile-sourcing-1331.patch b/0022-Add-fish-etc-profile-and-HOME-.profile-sourcing-1331.patch
new file mode 100644
index 0000000..a9f372f
--- /dev/null
+++ b/0022-Add-fish-etc-profile-and-HOME-.profile-sourcing-1331.patch
@@ -0,0 +1,40 @@
+From cf65e99eb8abfe2ee1ef7e2f7dc43862e83bf0ab Mon Sep 17 00:00:00 2001
+From: soredake <5204968+soredake@users.noreply.github.com>
+Date: Tue, 9 Mar 2021 09:28:11 +0200
+Subject: [PATCH 22/26] Add fish /etc/profile and $HOME/.profile sourcing
+ (#1331)
+
+---
+ data/scripts/Xsession | 2 ++
+ data/scripts/wayland-session | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index 5449810..d0c2605 100755
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
+@@ -39,6 +39,8 @@ case $SHELL in
+ rm -f $xsess_tmp
+ ;;
+ */fish)
++ [ -f /etc/profile ] && . /etc/profile
++ [ -f $HOME/.profile ] && . $HOME/.profile
+ xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+ $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+ . $xsess_tmp
+diff --git a/data/scripts/wayland-session b/data/scripts/wayland-session
+index 1f90554..552a39f 100755
+--- a/data/scripts/wayland-session
++++ b/data/scripts/wayland-session
+@@ -43,6 +43,8 @@ case $SHELL in
+ rm -f $wlsess_tmp
+ ;;
+ */fish)
++ [ -f /etc/profile ] && . /etc/profile
++ [ -f $HOME/.profile ] && . $HOME/.profile
+ xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+ $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+ . $xsess_tmp
+--
+2.30.1
+
diff --git a/0023-Error-in-elarun-theme-1336.patch b/0023-Error-in-elarun-theme-1336.patch
new file mode 100644
index 0000000..7cd343c
--- /dev/null
+++ b/0023-Error-in-elarun-theme-1336.patch
@@ -0,0 +1,39 @@
+From 191698e315c6469c0c7dad8eef40ee20f3a69e44 Mon Sep 17 00:00:00 2001
+From: mvlvrd <34712036+mvlvrd@users.noreply.github.com>
+Date: Sun, 14 Mar 2021 16:07:38 +0900
+Subject: [PATCH 23/26] Error in elarun theme (#1336)
+
+* session_button for the elarun theme is undefined, raising
+this error:
+file:///usr/share/sddm/themes/debian-theme/Main.qml:155: ReferenceError: session_button is not defined
+
+session_button was removed in #521
+---
+ data/themes/elarun/Main.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/themes/elarun/Main.qml b/data/themes/elarun/Main.qml
+index 365c4f1..0408b82 100644
+--- a/data/themes/elarun/Main.qml
++++ b/data/themes/elarun/Main.qml
+@@ -152,7 +152,7 @@ Rectangle {
+
+ onClicked: sddm.login(user_entry.text, pw_entry.text, sessionIndex)
+
+- KeyNavigation.backtab: pw_entry; KeyNavigation.tab: session_button
++ KeyNavigation.backtab: pw_entry; KeyNavigation.tab: session
+ }
+
+ Item {
+@@ -172,7 +172,7 @@ Rectangle {
+ source: "images/system_shutdown.png"
+ onClicked: sddm.powerOff()
+
+- KeyNavigation.backtab: session_button; KeyNavigation.tab: reboot_button
++ KeyNavigation.backtab: session; KeyNavigation.tab: reboot_button
+ }
+
+ ImageButton {
+--
+2.30.1
+
diff --git a/0024-Use-avatars-in-FacesDir-first-and-if-not-found-searc.patch b/0024-Use-avatars-in-FacesDir-first-and-if-not-found-searc.patch
new file mode 100644
index 0000000..4eb6d48
--- /dev/null
+++ b/0024-Use-avatars-in-FacesDir-first-and-if-not-found-searc.patch
@@ -0,0 +1,46 @@
+From d34be784b2c3c018628c4f7a0911969fb9b6ef89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Giuseppe=20Cal=C3=A0?= <jiveaxe@gmail.com>
+Date: Sun, 5 Apr 2020 10:53:31 +0200
+Subject: [PATCH 24/26] Use avatars in FacesDir first and if not found search
+ other locations
+
+If Avatars are enabled and home is encrypted it takes 60s to popup
+the greeter at boot. The same is if copying $USER.face.icon in FacesDir
+since avatar is searched first in home.
+
+The patch changes this logic. Now it search first in FacesDir and if
+found the greeter is shown, otherwise queries other default locations.
+---
+ src/greeter/UserModel.cpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
+index 7d7f9e2..6bc25e8 100644
+--- a/src/greeter/UserModel.cpp
++++ b/src/greeter/UserModel.cpp
+@@ -136,14 +136,16 @@ namespace SDDM {
+ if (avatarsEnabled) {
+ const QString userFace = QStringLiteral("%1/.face.icon").arg(user->homeDir);
+ const QString systemFace = QStringLiteral("%1/%2.face.icon").arg(facesDir).arg(user->name);
+- QString accountsServiceFace = QStringLiteral("/var/lib/AccountsService/icons/%1").arg(user->name);
+-
+- if (QFile::exists(userFace))
+- user->icon = QStringLiteral("file://%1").arg(userFace);
++ const QString accountsServiceFace = QStringLiteral("/var/lib/AccountsService/icons/%1").arg(user->name);
++
++ // If the home is encrypted it takes a lot of time to open
++ // up the greeter, therefore we try the system avatar first
++ if (QFile::exists(systemFace))
++ user->icon = systemFace;
++ else if (QFile::exists(userFace))
++ user->icon = userFace;
+ else if (QFile::exists(accountsServiceFace))
+ user->icon = accountsServiceFace;
+- else if (QFile::exists(systemFace))
+- user->icon = QStringLiteral("file://%1").arg(systemFace);
+ }
+ }
+ }
+--
+2.30.1
+
diff --git a/0025-Remove-suffix-for-Wayland-session-997.patch b/0025-Remove-suffix-for-Wayland-session-997.patch
new file mode 100644
index 0000000..11287e7
--- /dev/null
+++ b/0025-Remove-suffix-for-Wayland-session-997.patch
@@ -0,0 +1,97 @@
+From ec92b49019eff689a7b0cc1c91355ce0f2588368 Mon Sep 17 00:00:00 2001
+From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
+Date: Sun, 14 Mar 2021 10:29:11 +0100
+Subject: [PATCH 25/26] Remove suffix for Wayland session (#997)
+
+Some desktops like GNOME specify which windowing system is in use
+with the Name entry of their desktop file.
+
+Plasma is also headed in that direction.
+
+For Wayland-only desktops such as Liri this information is
+redundant and so is for X11-only window managers.
+
+Do not append the Wayland suffix and let desktops handle it
+themeselves.
+
+However if two sessions has the same display name we deduplicate
+appending an indicator to the Wayland counterpart, this helps
+Plasma during the transition to removing the session type from
+their display name.
+
+[ChangeLog][Greeter] Remove suffix for Wayland sessions and
+deduplicate display names.
+---
+ src/common/Session.cpp | 11 ++---------
+ src/greeter/SessionModel.cpp | 10 ++++++++--
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/src/common/Session.cpp b/src/common/Session.cpp
+index 0aa5402..a026c1f 100644
+--- a/src/common/Session.cpp
++++ b/src/common/Session.cpp
+@@ -161,15 +161,8 @@ namespace SDDM {
+ if (current_section != QLatin1String("Desktop Entry"))
+ continue; // We are only interested in the "Desktop Entry" section
+
+- if (line.startsWith(QLatin1String("Name="))) {
+- if (type == WaylandSession)
+- if (line.mid(5).endsWith(QLatin1String(" (Wayland)")))
+- m_displayName = QObject::tr("%1").arg(line.mid(5));
+- else
+- m_displayName = QObject::tr("%1 (Wayland)").arg(line.mid(5));
+- else
+- m_displayName = line.mid(5);
+- }
++ if (line.startsWith(QLatin1String("Name=")))
++ m_displayName = line.mid(5);
+ if (line.startsWith(QLatin1String("Comment=")))
+ m_comment = line.mid(8);
+ if (line.startsWith(QLatin1String("Exec=")))
+diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
+index 1953c76..a0eb3b1 100644
+--- a/src/greeter/SessionModel.cpp
++++ b/src/greeter/SessionModel.cpp
+@@ -35,6 +35,7 @@ namespace SDDM {
+ }
+
+ int lastIndex { 0 };
++ QStringList displayNames;
+ QVector<Session *> sessions;
+ };
+
+@@ -50,6 +51,7 @@ namespace SDDM {
+ connect(watcher, &QFileSystemWatcher::directoryChanged, [this](const QString &path) {
+ beginResetModel();
+ d->sessions.clear();
++ d->displayNames.clear();
+ populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
+ populate(Session::X11Session, mainConfig.X11.SessionDir.get());
+ endResetModel();
+@@ -99,6 +101,8 @@ namespace SDDM {
+ case TypeRole:
+ return session->type();
+ case NameRole:
++ if (d->displayNames.count(session->displayName()) > 1 && session->type() == Session::WaylandSession)
++ return tr("%1 (Wayland)").arg(session->displayName());
+ return session->displayName();
+ case ExecRole:
+ return session->exec();
+@@ -144,10 +148,12 @@ namespace SDDM {
+ }
+ }
+ // add to sessions list
+- if (!si->isHidden() && !si->isNoDisplay() && execAllowed)
++ if (!si->isHidden() && !si->isNoDisplay() && execAllowed) {
++ d->displayNames.append(si->displayName());
+ d->sessions.push_back(si);
+- else
++ } else {
+ delete si;
++ }
+ }
+ // find out index of the last session
+ for (int i = 0; i < d->sessions.size(); ++i) {
+--
+2.30.1
+
diff --git a/0026-Fix-warning-from-SDDM-generateName.patch b/0026-Fix-warning-from-SDDM-generateName.patch
new file mode 100644
index 0000000..5e885b8
--- /dev/null
+++ b/0026-Fix-warning-from-SDDM-generateName.patch
@@ -0,0 +1,35 @@
+From 2584182f3896b459e941ce96e85760121ea0cf8f Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 15 Mar 2021 17:09:20 +0100
+Subject: [PATCH 26/26] Fix warning from SDDM::generateName()
+
+Properly constructs the created string by allocating the space to fill
+instead of just reserving. Addresses the following warning:
+ Using QCharRef with an index pointing outside the valid range of a QString.
+ The corresponding behavior is deprecated, and will be changed in a future
+ version of Qt.
+---
+ src/daemon/Utils.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon/Utils.h b/src/daemon/Utils.h
+index 7de5a98..03170f8 100644
+--- a/src/daemon/Utils.h
++++ b/src/daemon/Utils.h
+@@ -26,11 +26,11 @@
+ namespace SDDM {
+
+ inline QString generateName(int length) {
+- QString digits = QStringLiteral("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
++ const QString digits = QStringLiteral("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
+
+ // reserve space for name
+ QString name;
+- name.reserve(length);
++ name.resize(length);
+
+ // create random device
+ std::random_device rd;
+--
+2.30.1
+
diff --git a/sddm.spec b/sddm.spec
index 5587662..62081f5 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -25,10 +25,6 @@ Source6: sddm.sysusers
Source7: sddm.sysconfig
Patch1: sddm-0.14.0-by-default-use-plasma-session.patch
Patch2: sddm-0.18.1-add-suport-to-plymouth-smooth-transition.patch
-# (tpg) seems to be broken
-#Patch4: sddm-0.14.0-Log-Xorg-server-output-to-the-journal.patch
-# (tpg) based on this https://github.com/sddm/sddm/pull/525
-#Patch3: sddm-0.14.0-add-support-to-QtAccountsService.patch
# (tpg) https://github.com/sddm/sddm/pull/817
Patch6: 0001-Execute-etc-X11-Xsession.patch
# This patch is IMPORTANT -- don't drop it just because it doesn't apply
@@ -36,18 +32,30 @@ Patch6: 0001-Execute-etc-X11-Xsession.patch
# https://github.com/sddm/sddm/issues/733
# https://github.com/sddm/sddm/pull/1230
#Patch7: https://github.com/sddm/sddm/pull/1230.patch
-#Patch8: https://patch-diff.githubusercontent.com/raw/sddm/sddm/pull/1371.patch
-Patch9: https://patch-diff.githubusercontent.com/raw/sddm/sddm/pull/1379.patch
+
# (tpg) patches from upstream git
-Patch100: 0000-Improve-font-config-deserialization.patch
-Patch101: 0001-Only-use-the-base-name-for-DESKTOP_SESSION.patch
-#Patch102: 0002-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch
-Patch103: 0003-Retry-starting-the-display-server.patch
-#Patch104: 0004-Explicitly-stop-Xorg-when-starting-fails.patch
-#Patch105: 0005-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch
-Patch106: 0006-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
-Patch107: 0007-wayland-session-Ensure-SHELL-remains-correctly-set.patch
-Patch108: 0008-Clear-VT-before-switching-to-it.patch
+Patch101: 0000-Improve-font-config-deserialization.patch
+Patch102: 0001-Use-PAM-s-username.patch
+Patch103: 0004-Only-use-the-base-name-for-DESKTOP_SESSION.patch
+Patch104: 0005-Fix-compilation-once-QTBUG-88431-gets-fixed.patch
+Patch105: 0006-Merge-normal-and-testing-paths-in-XorgDisplayServer-.patch
+Patch106: 0010-Retry-starting-the-display-server.patch
+Patch107: 0011-Explicitly-stop-Xorg-when-starting-fails.patch
+Patch108: 0012-Emit-XorgDisplayServer-started-only-when-the-auth-fi.patch
+Patch110: 0014-Fix-sessions-being-started-as-the-wrong-type-on-auto.patch
+Patch112: 0016-wayland-session-Ensure-SHELL-remains-correctly-set.patch
+Patch114: 0018-Update-sv.ts-1342.patch
+Patch115: 0019-Clear-VT-before-switching-to-it.patch
+Patch116: 0020-Prevent-potential-crash-when-not-in-testing-mode.patch
+Patch117: 0021-Allow-addition-env-vars-to-be-defined-in-session-fil.patch
+Patch118: 0022-Add-fish-etc-profile-and-HOME-.profile-sourcing-1331.patch
+Patch119: 0023-Error-in-elarun-theme-1336.patch
+Patch120: 0024-Use-avatars-in-FacesDir-first-and-if-not-found-searc.patch
+Patch121: 0025-Remove-suffix-for-Wayland-session-997.patch
+Patch122: 0026-Fix-warning-from-SDDM-generateName.patch
+Patch200: https://patch-diff.githubusercontent.com/raw/sddm/sddm/pull/1379.patch
+
+
BuildRequires: cmake(ECM)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)