[neon/3rdparty/sddm/Neon/unstable] debian: build with newer versions of Qt 5.15 (#1013550)

[Pino Toscano]

Git commit e605939fa636ad600f23e6db32cc6fba5e943180 by Pino Toscano.
Committed on 28/07/2022 at 18:57.
Pushed by jriddell into branch 'Neon/unstable'.

build with newer versions of Qt 5.15 (#1013550)

backport upstream commit e93bf95c54ad8c2a1604f8d7be05339164b19308

M  +4    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +26   -0    debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch

https://invent.kde.org/neon/3rdparty/sddm/commit/e605939fa636ad600f23e6db32cc6fba5e943180

diff --git a/debian/changelog b/debian/changelog
index 5f02237..b75caff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ sddm (0.19.0-4) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Remove inactive Uploaders.
+  * Backport upstream commit e93bf95c54ad8c2a1604f8d7be05339164b19308 to fix
+    build with newer versions of Qt 5.15; patch
+    upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch.
+    (Closes: #1013550)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 08 Nov 2021 21:00:36 +0900
 
diff --git a/debian/patches/series b/debian/patches/series
index 13e26c1..b9d074a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06_nvidia_prime_setup.diff
 upstream-2f034906d-use-only-basename-of-session.patch
 upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
+upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch
diff --git a/debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch b/debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch
new file mode 100644
index 0000000..7790350
--- /dev/null
+++ b/debian/patches/upstream_Fix-compilation-once-QTBUG-88431-gets-fixed.patch
@@ -0,0 +1,26 @@
+From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
+From: "aacid at kde.org" <aacid at kde.org>
+Date: Thu, 12 Nov 2020 23:42:48 +0100
+Subject: [PATCH] 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.35.1
+