| 1 |
commit: 5d0418f942e4280b3645d273b48fdf9ae1bfec5b |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 8 09:01:49 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 8 11:23:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0418f9 |
| 7 |
|
| 8 |
x11-misc/sddm: remove unused patch |
| 9 |
|
| 10 |
.../sddm/files/sddm-0.17.0-switchtogreeter.patch | 54 ---------------------- |
| 11 |
1 file changed, 54 deletions(-) |
| 12 |
|
| 13 |
diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch |
| 14 |
deleted file mode 100644 |
| 15 |
index 22d2fa4ae9b..00000000000 |
| 16 |
--- a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch |
| 17 |
+++ /dev/null |
| 18 |
@@ -1,54 +0,0 @@ |
| 19 |
-Subject: [PATCH] Fix switchToGreeter not available without logind |
| 20 |
-From: Alexander Miller <alex.miller@×××.de> |
| 21 |
- |
| 22 |
-Seats can't be created until SeatManager's signals are |
| 23 |
-connected to the DisplayManager, or the latter won't see |
| 24 |
-them and switchToGreeter doesn't work. So split SeatManager |
| 25 |
-initialization from its constructor and call initialize it |
| 26 |
-only after all connections have been set up in DaemonApp's |
| 27 |
-constructor. |
| 28 |
- |
| 29 |
-With logind there may have been enough delay before seats |
| 30 |
-got actually added so things would work, but it's still |
| 31 |
-cleaner to fix the order. |
| 32 |
- |
| 33 |
-Fixes: https://bugs.gentoo.org/644718 |
| 34 |
-Fixes: https://github.com/sddm/sddm/issues/824 |
| 35 |
- |
| 36 |
---- a/src/daemon/SeatManager.h |
| 37 |
-+++ b/src/daemon/SeatManager.h |
| 38 |
-@@ -31,8 +31,9 @@ namespace SDDM { |
| 39 |
- class SeatManager : public QObject { |
| 40 |
- Q_OBJECT |
| 41 |
- public: |
| 42 |
-- explicit SeatManager(QObject *parent = 0); |
| 43 |
-+ explicit SeatManager(QObject *parent = 0) {} |
| 44 |
- |
| 45 |
-+ void initialize(); |
| 46 |
- void createSeat(const QString &name); |
| 47 |
- void removeSeat(const QString &name); |
| 48 |
- void switchToGreeter(const QString &seat); |
| 49 |
---- a/src/daemon/SeatManager.cpp |
| 50 |
-+++ b/src/daemon/SeatManager.cpp |
| 51 |
-@@ -93,8 +93,7 @@ namespace SDDM { |
| 52 |
- } |
| 53 |
- } |
| 54 |
- |
| 55 |
-- SeatManager::SeatManager(QObject *parent) : QObject(parent) { |
| 56 |
-- |
| 57 |
-+ void SeatManager::initialize() { |
| 58 |
- if (DaemonApp::instance()->testing() || !Logind::isAvailable()) { |
| 59 |
- //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections |
| 60 |
- createSeat(QStringLiteral("seat0")); |
| 61 |
---- a/src/daemon/DaemonApp.cpp |
| 62 |
-+++ b/src/daemon/DaemonApp.cpp |
| 63 |
-@@ -75,6 +75,9 @@ namespace SDDM { |
| 64 |
- |
| 65 |
- // log message |
| 66 |
- qDebug() << "Starting..."; |
| 67 |
-+ |
| 68 |
-+ // initialize seats only after signals are connected |
| 69 |
-+ m_seatManager->initialize(); |
| 70 |
- } |
| 71 |
- |
| 72 |
- bool DaemonApp::testing() const { |
Archives