From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- x11-misc/sddm/files/sddm-0.16.0-Xsession.patch | 24 ---------- x11-misc/sddm/files/sddm-0.17.0-consolekit.patch | 22 --------- x11-misc/sddm/files/sddm-0.17.0-logind-race.patch | 26 ----------- .../files/sddm-0.17.0-switchtogreeter-r1.patch | 54 ---------------------- 4 files changed, 126 deletions(-) delete mode 100644 x11-misc/sddm/files/sddm-0.16.0-Xsession.patch delete mode 100644 x11-misc/sddm/files/sddm-0.17.0-consolekit.patch delete mode 100644 x11-misc/sddm/files/sddm-0.17.0-logind-race.patch delete mode 100644 x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch (limited to 'x11-misc/sddm/files') diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch deleted file mode 100644 index f341e1863f76..000000000000 --- a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 -+++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200 -@@ -50,6 +50,10 @@ - ;; - esac - -+# Make D-Bus and ConsoleKit start properly, see: -+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit} -+command="$@" -+ - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f $HOME/.xprofile ] && . $HOME/.xprofile - -@@ -94,8 +98,8 @@ - . "$USERXSESSION" - fi - --if [ -z "$@" ]; then -+if [ -z "$command" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else -- exec $@ -+ exec $command - fi diff --git a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch deleted file mode 100644 index ca265d131454..000000000000 --- a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7bd9f322182d840f3cfaee9a49f5cbd5f426aa1b Mon Sep 17 00:00:00 2001 -From: Erik Ridderby -Date: Sat, 12 May 2018 08:04:26 +0200 -Subject: [PATCH] Fixed typo that prevents ConsoleKit to be detected (#1027) - ---- - src/daemon/LogindDBusTypes.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp -index 79c70312..011bb7f5 100644 ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -63,7 +63,7 @@ LogindPathInternal::LogindPathInternal() - available = true; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); -- managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind -+ managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind - seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat"); - sessionIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Session"); - userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User"); diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch deleted file mode 100644 index a55702061c91..000000000000 --- a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini -Date: Mon, 26 Feb 2018 09:03:05 +0100 -Subject: [PATCH] Fix race between sddm and logind - -Make sure sddm is run after logind. -An explicit dependency will make sddm run after logind every time. - -Closes: #978 ---- - services/sddm.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/services/sddm.service.in b/services/sddm.service.in -index df03d92a..9d7618c6 100644 ---- a/services/sddm.service.in -+++ b/services/sddm.service.in -@@ -2,7 +2,7 @@ - Description=Simple Desktop Display Manager - Documentation=man:sddm(1) man:sddm.conf(5) - Conflicts=getty@tty1.service --After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service -+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service - - [Service] - ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch deleted file mode 100644 index 35982bceda21..000000000000 --- a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch +++ /dev/null @@ -1,54 +0,0 @@ -Subject: [PATCH] Fix switchToGreeter not available without logind -From: Alexander Miller - -Seats can't be created until SeatManager's signals are -connected to the DisplayManager, or the latter won't see -them and switchToGreeter doesn't work. So split SeatManager -initialization from its constructor and call initialize it -only after all connections have been set up in DaemonApp's -constructor. - -With logind there may have been enough delay before seats -got actually added so things would work, but it's still -cleaner to fix the order. - -Fixes: https://bugs.gentoo.org/644718 -Fixes: https://github.com/sddm/sddm/issues/824 - ---- a/src/daemon/SeatManager.h -+++ b/src/daemon/SeatManager.h -@@ -31,8 +31,9 @@ namespace SDDM { - class SeatManager : public QObject { - Q_OBJECT - public: -- explicit SeatManager(QObject *parent = 0); -+ explicit SeatManager(QObject *parent = 0) : QObject(parent) {} - -+ void initialize(); - void createSeat(const QString &name); - void removeSeat(const QString &name); - void switchToGreeter(const QString &seat); ---- a/src/daemon/SeatManager.cpp -+++ b/src/daemon/SeatManager.cpp -@@ -93,8 +93,7 @@ namespace SDDM { - } - } - -- SeatManager::SeatManager(QObject *parent) : QObject(parent) { -- -+ void SeatManager::initialize() { - if (DaemonApp::instance()->testing() || !Logind::isAvailable()) { - //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections - createSeat(QStringLiteral("seat0")); ---- a/src/daemon/DaemonApp.cpp -+++ b/src/daemon/DaemonApp.cpp -@@ -75,6 +75,9 @@ namespace SDDM { - - // log message - qDebug() << "Starting..."; -+ -+ // initialize seats only after signals are connected -+ m_seatManager->initialize(); - } - - bool DaemonApp::testing() const { -- cgit v1.2.3