commit: 5d29b281bbcdaabddd3ff40009ab6ed6428fda17 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jan 1 17:37:58 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 1 17:37:58 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5d29b281
x11-misc/sddm: Drop IUSE=consolekit Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20 -------------------- x11-misc/sddm/metadata.xml | 1 - x11-misc/sddm/sddm-9999.ebuild | 7 ++----- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch deleted file mode 100644 index bbe2a272..00000000 --- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch +++ /dev/null @@ -1,20 +0,0 @@ -SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2 -has the same interface names as logind. - -This patch forces sddm to use legacy behaviour when consolekit2 is detected. - -Bug: https://bugs.gentoo.org/633920 -Bug: https://github.com/sddm/sddm/issues/903 -Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99 - ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -60,7 +60,7 @@ - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { - qDebug() << "Console kit interface found"; -- available = true; -+ available = false; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index 43cf40aa..9f20b6da 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -10,7 +10,6 @@ <name>Gentoo KDE Project</name> </maintainer> <use> - <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit (no native support)</flag> <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag> </use> <longdescription lang="en"> diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index e2ddf0c9..e5d3a7ec 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sddm/sddm"; LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" SLOT="0" -IUSE="consolekit elogind +pam systemd test" +IUSE="elogind +pam systemd test" REQUIRED_USE="?? ( elogind systemd )" @@ -39,7 +39,6 @@ RDEPEND=" >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] - consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) @@ -55,8 +54,6 @@ PATCHES=( # fix for groups: https://github.com/sddm/sddm/issues/1159 "${FILESDIR}/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch" "${FILESDIR}/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch" - # TODO: fix properly - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 ) src_prepare() {
