diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-08-25 16:12:03 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-08-25 16:35:53 +0200 |
| commit | e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0 (patch) | |
| tree | 9327f0c71ac6497788191ed4c5d7b0e5f8f5b3d9 /x11-misc | |
| parent | dev-qt/qtgamepad: Fix IUSE=sdl to depend on media-libs/libsdl2 (diff) | |
| download | gentoo-e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0.tar.gz gentoo-e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0.tar.bz2 gentoo-e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0.zip | |
x11-misc/sddm: Fix build with Qt 5.15.2++
Upstream commit e93bf95c54ad8c2a1604f8d7be05339164b19308
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch | 23 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-0.18.1-r5.ebuild | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch new file mode 100644 index 000000000000..7179d14e4c1e --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch @@ -0,0 +1,23 @@ +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] 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 5f93a1b3..d5f29a94 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() { diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r5.ebuild index 8f888089fe3c..20b127562993 100644 --- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild @@ -54,6 +54,8 @@ PATCHES=( # TODO: fix properly "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 "${FILESDIR}/pam-1.4-substack.patch" + # upstream git develop branch: + "${FILESDIR}/${P}-qt-5.15.2.patch" ) src_prepare() { |