From e47450ddbd7b205b47760c84242d3e404a8b7470 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 24 Dec 2022 09:22:28 -0500 Subject: [PATCH] Update to new snapshot - Add patch to support non-default wayland socket names for sway/weston/etc. - Refreshed patch for waiting on logind seat0 initialization --- .gitignore | 1 + ...lay-for-logind-and-fallback-to-seat0.patch | 12 ++-- ...0.20.0-allow-hiding-wayland-sessions.patch | 58 ------------------- sddm.spec | 21 ++++--- sources | 2 +- 5 files changed, 22 insertions(+), 72 deletions(-) delete mode 100644 sddm-0.20.0-allow-hiding-wayland-sessions.patch diff --git a/.gitignore b/.gitignore index b1a7c49..15c5303 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /sddm-21e965aab8d93180966bbb19788bc42bdf2baee7.tar.gz /sddm-fc24321541f6f65b7d1aac89cd82336ffd53e1a0.tar.gz /sddm-1d156897ab763d1442b0d6b0341c091f0c38b496.tar.gz +/sddm-3e486499b9300ce8f9c62bd102e5119b27a2fad1.tar.gz diff --git a/0001-Delay-for-logind-and-fallback-to-seat0.patch b/0001-Delay-for-logind-and-fallback-to-seat0.patch index b0cd884..8fa1e6d 100644 --- a/0001-Delay-for-logind-and-fallback-to-seat0.patch +++ b/0001-Delay-for-logind-and-fallback-to-seat0.patch @@ -1,4 +1,4 @@ -From 57f91b5f23fcaacaaafd5d8263f65ed58d0cdf15 Mon Sep 17 00:00:00 2001 +From 5e6c0f872272fd617228628ab46c491313750019 Mon Sep 17 00:00:00 2001 From: Jeremy Linton Date: Fri, 22 Oct 2021 14:51:54 -0500 Subject: [PATCH] Delay for logind, and fallback to seat0 @@ -17,6 +17,10 @@ is generally a better strategy than what happens a good amount of time now, where sddm is started and silent about why the screen is blank. +References: +* https://bugzilla.redhat.com/2011991 +* https://bugzilla.redhat.com/2016310 + Signed-off-by: Jeremy Linton --- src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++---------- @@ -75,7 +79,7 @@ index 011bb7f..6255c69 100644 if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { qDebug() << "Console kit interface found"; diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp -index 60d22ea..96d2b82 100644 +index 429ed19..9f569bb 100644 --- a/src/daemon/SeatManager.cpp +++ b/src/daemon/SeatManager.cpp @@ -26,6 +26,9 @@ @@ -98,7 +102,7 @@ index 60d22ea..96d2b82 100644 void SeatManager::createSeat(const QString &name) { @@ -152,6 +157,23 @@ namespace SDDM { - m_seats.value(name)->createDisplay(); + m_seats.value(name)->createDisplay(Display::defaultDisplayServerType()); } + // this is a bit hacky, but linux DRM drivers @@ -134,5 +138,5 @@ index b2f9796..aa43047 100644 } -- -2.33.1 +2.38.1 diff --git a/sddm-0.20.0-allow-hiding-wayland-sessions.patch b/sddm-0.20.0-allow-hiding-wayland-sessions.patch deleted file mode 100644 index f5cd769..0000000 --- a/sddm-0.20.0-allow-hiding-wayland-sessions.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7168262e2174046e335c445e72504758dbf7049b Mon Sep 17 00:00:00 2001 -From: Jeremy Linton -Date: Mon, 25 Oct 2021 14:56:14 -0500 -Subject: [PATCH] greeter: Do not populate Wayland sessions if /dev/dri does - not exist - -Check for /dev/dri which should indicate that the Wayland will work -on this hardware. - -Signed-off-by: Jeremy Linton ---- - src/greeter/SessionModel.cpp | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp -index a0eb3b1..92f6d1a 100644 ---- a/src/greeter/SessionModel.cpp -+++ b/src/greeter/SessionModel.cpp -@@ -22,6 +22,7 @@ - - #include "Configuration.h" - -+#include - #include - #include - #include -@@ -40,19 +41,26 @@ namespace SDDM { - }; - - SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) { -+ // Check for flag to show Wayland sessions -+ bool dri_active = QFileInfo::exists(QStringLiteral("/dev/dri")); -+ - // initial population - beginResetModel(); -- populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); -+ if (dri_active) -+ populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); - populate(Session::X11Session, mainConfig.X11.SessionDir.get()); - endResetModel(); - - // refresh everytime a file is changed, added or removed - QFileSystemWatcher *watcher = new QFileSystemWatcher(this); - connect(watcher, &QFileSystemWatcher::directoryChanged, [this](const QString &path) { -+ // Recheck for flag to show Wayland sessions -+ bool dri_active = QFileInfo::exists(QStringLiteral("/dev/dri")); - beginResetModel(); - d->sessions.clear(); - d->displayNames.clear(); -- populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); -+ if (dri_active) -+ populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get()); - populate(Session::X11Session, mainConfig.X11.SessionDir.get()); - endResetModel(); - }); --- -2.33.1 - diff --git a/sddm.spec b/sddm.spec index 559bb2d..1e932b2 100644 --- a/sddm.spec +++ b/sddm.spec @@ -14,8 +14,8 @@ %bcond_without sddm_wayland_default %endif -%global commit 1d156897ab763d1442b0d6b0341c091f0c38b496 -%global commitdate 20221114 +%global commit 3e486499b9300ce8f9c62bd102e5119b27a2fad1 +%global commitdate 20221123 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: sddm @@ -35,19 +35,17 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz ## upstreamable patches -# Disable wayland sessions when /dev/dri doesn't exist -# https://bugzilla.redhat.com/1952431 -# https://bugzilla.redhat.com/show_bug.cgi?id=2016788 -# https://bugzilla.redhat.com/show_bug.cgi?id=2016310 -# Submitted: https://github.com/sddm/sddm/pull/1489 -Patch10: sddm-0.20.0-allow-hiding-wayland-sessions.patch - # Fix race with logind restart, and start seat0 if !CanGraphical on timer # https://bugzilla.redhat.com/show_bug.cgi?id=2011991 # https://bugzilla.redhat.com/show_bug.cgi?id=2016310 # Submmited: https://github.com/sddm/sddm/pull/1494 Patch11: 0001-Delay-for-logind-and-fallback-to-seat0.patch +# Support non-default "wayland-?" socket names +# required for sway, weston, et al +# Submitted: https://github.com/sddm/sddm/pull/1509 +Patch12: sddm-0.20.0-support-non-default-wayland-socket-names.patch + ## downstream patches Patch101: sddm-0.20.0-fedora_config.patch @@ -299,6 +297,11 @@ fi %changelog +* Sat Dec 24 2022 Neal Gompa - 0.19.0^git20221123.3e48649-1 +- Update to new snapshot +- Add patch to support non-default wayland socket names for sway/weston/etc. +- Refreshed patch for waiting on logind seat0 initialization + * Mon Nov 14 2022 Neal Gompa - 0.19.0^git20221114.1d15689-1 - Update to new snapshot diff --git a/sources b/sources index af3ed08..ebd34a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sddm-1d156897ab763d1442b0d6b0341c091f0c38b496.tar.gz) = 6d1186c0d6b9795d0b3468741ffde7dd7648c073da816118f99be5d5a5f44f08814da2df85102661c52f1ff1de819000c4c1609bc38ffbb478e39e4339c14bae +SHA512 (sddm-3e486499b9300ce8f9c62bd102e5119b27a2fad1.tar.gz) = 7c1317cc479947aaee535c5f319ec7e7294d5aeec867bee7ce42fb3da0e6874134c9bc7840488ab8f9348d41690f3f05bd1ee2ae64fb02dc3709419f095a894e