From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7DF371580B9 for ; Wed, 25 Aug 2021 14:36:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0677E0907; Wed, 25 Aug 2021 14:36:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C80ADE0905 for ; Wed, 25 Aug 2021 14:36:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F3B2342B98 for ; Wed, 25 Aug 2021 14:36:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 284588F3 for ; Wed, 25 Aug 2021 14:36:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1629902153.e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch x11-misc/sddm/sddm-0.18.1-r5.ebuild X-VCS-Directories: x11-misc/sddm/ x11-misc/sddm/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0 X-VCS-Branch: master Date: Wed, 25 Aug 2021 14:36:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0046ebdf-1edc-4f8f-a644-c3608547e046 X-Archives-Hash: d10e796977b056ba5f21c58b9327ebac commit: e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 25 14:12:03 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 25 14:35:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5812e3f 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 gentoo.org> x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch | 23 +++++++++++++++++++++++ x11-misc/sddm/sddm-0.18.1-r5.ebuild | 2 ++ 2 files changed, 25 insertions(+) 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 00000000000..7179d14e4c1 --- /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" +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 8f888089fe3..20b12756299 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() {