| 1 |
commit: 5d29b281bbcdaabddd3ff40009ab6ed6428fda17 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 1 17:37:58 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 1 17:37:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5d29b281 |
| 7 |
|
| 8 |
x11-misc/sddm: Drop IUSE=consolekit |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20 -------------------- |
| 14 |
x11-misc/sddm/metadata.xml | 1 - |
| 15 |
x11-misc/sddm/sddm-9999.ebuild | 7 ++----- |
| 16 |
3 files changed, 2 insertions(+), 26 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index bbe2a272..00000000 |
| 21 |
--- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,20 +0,0 @@ |
| 24 |
-SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2 |
| 25 |
-has the same interface names as logind. |
| 26 |
- |
| 27 |
-This patch forces sddm to use legacy behaviour when consolekit2 is detected. |
| 28 |
- |
| 29 |
-Bug: https://bugs.gentoo.org/633920 |
| 30 |
-Bug: https://github.com/sddm/sddm/issues/903 |
| 31 |
-Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99 |
| 32 |
- |
| 33 |
---- a/src/daemon/LogindDBusTypes.cpp |
| 34 |
-+++ b/src/daemon/LogindDBusTypes.cpp |
| 35 |
-@@ -60,7 +60,7 @@ |
| 36 |
- |
| 37 |
- if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { |
| 38 |
- qDebug() << "Console kit interface found"; |
| 39 |
-- available = true; |
| 40 |
-+ available = false; |
| 41 |
- serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); |
| 42 |
- managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); |
| 43 |
- managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind |
| 44 |
|
| 45 |
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml |
| 46 |
index 43cf40aa..9f20b6da 100644 |
| 47 |
--- a/x11-misc/sddm/metadata.xml |
| 48 |
+++ b/x11-misc/sddm/metadata.xml |
| 49 |
@@ -10,7 +10,6 @@ |
| 50 |
<name>Gentoo KDE Project</name> |
| 51 |
</maintainer> |
| 52 |
<use> |
| 53 |
- <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit (no native support)</flag> |
| 54 |
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag> |
| 55 |
</use> |
| 56 |
<longdescription lang="en"> |
| 57 |
|
| 58 |
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild |
| 59 |
index e2ddf0c9..e5d3a7ec 100644 |
| 60 |
--- a/x11-misc/sddm/sddm-9999.ebuild |
| 61 |
+++ b/x11-misc/sddm/sddm-9999.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2019 Gentoo Authors |
| 64 |
+# Copyright 1999-2021 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=7 |
| 68 |
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sddm/sddm" |
| 69 |
|
| 70 |
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
| 71 |
SLOT="0" |
| 72 |
-IUSE="consolekit elogind +pam systemd test" |
| 73 |
+IUSE="elogind +pam systemd test" |
| 74 |
|
| 75 |
REQUIRED_USE="?? ( elogind systemd )" |
| 76 |
|
| 77 |
@@ -39,7 +39,6 @@ RDEPEND=" |
| 78 |
>=dev-qt/qtnetwork-5.9.4:5 |
| 79 |
>=x11-base/xorg-server-1.15.1 |
| 80 |
x11-libs/libxcb[xkb] |
| 81 |
- consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
| 82 |
elogind? ( sys-auth/elogind ) |
| 83 |
pam? ( sys-libs/pam ) |
| 84 |
systemd? ( sys-apps/systemd:= ) |
| 85 |
@@ -55,8 +54,6 @@ PATCHES=( |
| 86 |
# fix for groups: https://github.com/sddm/sddm/issues/1159 |
| 87 |
"${FILESDIR}/${PN}-0.18.1-revert-honor-PAM-supplemental-groups.patch" |
| 88 |
"${FILESDIR}/${PN}-0.18.1-honor-PAM-supplemental-groups-v2.patch" |
| 89 |
- # TODO: fix properly |
| 90 |
- "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 |
| 91 |
) |
| 92 |
|
| 93 |
src_prepare() { |
Archives