Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2017-09-08 20:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Fri Sep 8 20:43:35 2017 rev:23 rq:520264 version:0.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2017-07-12 19:32:54.158636751 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2017-09-08 20:43:35.873480359 +0200 @@ -1,0 +2,27 @@ +Fri Sep 1 18:28:00 UTC 2017 - [email protected] + +- Update to 0.15.0: + * Fix loading of some avatars + * CONFIG: add option EnableHiDPI to allow opt out of auto scaling + * Theme cursor + * Support optional kwallet PAM opening + * Autologin, used last used session if not explicitly set in config + * Ignore session desktop files with hidden=true + * Support elogind + * Many new and improved translations +- Remove patches, now upstream: + * 0001-Also-set-QT_IM_MODULE-in-non-testing-mode.patch + * 0001-Also-theme-the-default-cursor-for-the-root-window.patch + * 0001-Fix-display-of-user-avatars.-684.patch + * 0001-Make-the-default-cursor-themed.patch + * 0001-Parse-desktop-file-sections.patch + * 0002-Add-a-config-option-to-enable-high-DPI-scaling-701.patch + * 0002-Ignore-session-desktop-files-with-the-Hidden-propert.patch + * 0003-elarun-Update-date-and-time.patch + * 0004-Support-Non-Latin-characters-in-theme-settings-708.patch + * 0005-Cleanup-dangling-pointer-in-SocketServer-725.patch +- Refresh patches: + * 0001-Revert-Rename-XDisplay-and-WaylandDisplay-config-sec.patch + * proper_pam.diff + +------------------------------------------------------------------- Old: ---- 0001-Also-set-QT_IM_MODULE-in-non-testing-mode.patch 0001-Also-theme-the-default-cursor-for-the-root-window.patch 0001-Fix-display-of-user-avatars.-684.patch 0001-Make-the-default-cursor-themed.patch 0001-Parse-desktop-file-sections.patch 0002-Add-a-config-option-to-enable-high-DPI-scaling-701.patch 0002-Ignore-session-desktop-files-with-the-Hidden-propert.patch 0003-elarun-Update-date-and-time.patch 0004-Support-Non-Latin-characters-in-theme-settings-708.patch 0005-Cleanup-dangling-pointer-in-SocketServer-725.patch sddm-0.14.0.tar.xz New: ---- sddm-0.15.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.yO2caY/_old 2017-09-08 20:43:36.689365644 +0200 +++ /var/tmp/diff_new_pack.yO2caY/_new 2017-09-08 20:43:36.697364519 +0200 @@ -20,13 +20,13 @@ %{!?_unitdir: %global _unitdir /usr/lib/systemd/system} Name: sddm -Version: 0.14.0 +Version: 0.15.0 Release: 0 Summary: QML-based display manager License: GPL-2.0+ Group: System/GUI/KDE Url: https://github.com/sddm/sddm -Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.conf Source2: X11-displaymanagers-%{name} # PATCH-FIX-UPSTREAM 0001-Revert-Rename-XDisplay-and-WaylandDisplay-config-sec.patch -- Revert to 0.13.0 config syntax @@ -44,22 +44,8 @@ # PATCH-FIX-OPENSUSE sddm-service-handle-plymouth.patch -- sddm has some rudimentary support for plymouth handling, which only works with plymouth-quit.service # (the servce is not enabled on openSUSE). For users of sddm.service, we need to issue plymouth quit command by hand in this case Patch5: sddm-service-handle-plymouth.patch -# PATCH-FIX-UPSTREAM 0001-Make-the-default-cursor-themed.patch -- Make the default cursor themed -Patch7: 0001-Make-the-default-cursor-themed.patch # PATCH-FIX-OPENSUSE 0001-Systemd-service-unit-Use-tty7-by-default.patch -- Use tty7 by default in the systemd service unit Patch8: 0001-Systemd-service-unit-Use-tty7-by-default.patch -# PATCH-FIX-UPSTREAM 0001-Also-theme-the-default-cursor-for-the-root-window.patch -Patch9: 0001-Also-theme-the-default-cursor-for-the-root-window.patch -# Bugfixes from upstream develop branch -Patch10: 0001-Fix-display-of-user-avatars.-684.patch -Patch11: 0002-Add-a-config-option-to-enable-high-DPI-scaling-701.patch -Patch12: 0003-elarun-Update-date-and-time.patch -Patch13: 0004-Support-Non-Latin-characters-in-theme-settings-708.patch -Patch14: 0005-Cleanup-dangling-pointer-in-SocketServer-725.patch -Patch15: 0001-Also-set-QT_IM_MODULE-in-non-testing-mode.patch -# PATCH-FIX-UPSTREAM -Patch16: 0001-Parse-desktop-file-sections.patch -Patch17: 0002-Ignore-session-desktop-files-with-the-Hidden-propert.patch # PATCH-FIX-OPENSUSE Patch18: 0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch # PATCH-FIX-UPSTREAM @@ -133,17 +119,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 %patch18 -p1 %patch19 -p1 ++++++ 0001-Revert-Rename-XDisplay-and-WaylandDisplay-config-sec.patch ++++++ --- /var/tmp/diff_new_pack.yO2caY/_old 2017-09-08 20:43:36.725360583 +0200 +++ /var/tmp/diff_new_pack.yO2caY/_new 2017-09-08 20:43:36.725360583 +0200 @@ -23,11 +23,11 @@ src/helper/UserSession.cpp | 10 +++++----- 9 files changed, 28 insertions(+), 28 deletions(-) -diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in -index 3238af5..b10de94 100644 ---- a/data/man/sddm.conf.rst.in -+++ b/data/man/sddm.conf.rst.in -@@ -75,7 +75,7 @@ OPTIONS +Index: sddm-0.15.0~git/data/man/sddm.conf.rst.in +=================================================================== +--- sddm-0.15.0~git.orig/data/man/sddm.conf.rst.in ++++ sddm-0.15.0~git/data/man/sddm.conf.rst.in +@@ -76,7 +76,7 @@ OPTIONS them altogether. Default value is true. @@ -36,19 +36,19 @@ `ServerPath=` Path of the X server. -@@ -125,7 +125,7 @@ OPTIONS - increase as new displays added. - Default value is @MINIMUM_VT@. +@@ -131,7 +131,7 @@ OPTIONS + Can be either "true" or "false". + Default value is "false". -[Wayland] section: +[WaylandDisplay] section: `SessionDir=` Path of the directory containing session files. -diff --git a/src/common/Configuration.h b/src/common/Configuration.h -index f790343..666e3e6 100644 ---- a/src/common/Configuration.h -+++ b/src/common/Configuration.h +Index: sddm-0.15.0~git/src/common/Configuration.h +=================================================================== +--- sddm-0.15.0~git.orig/src/common/Configuration.h ++++ sddm-0.15.0~git/src/common/Configuration.h @@ -57,7 +57,7 @@ namespace SDDM { ); @@ -58,8 +58,8 @@ Entry(ServerPath, QString, _S("/usr/bin/X"), _S("Path to X server binary")); Entry(ServerArguments, QString, _S("-nolisten tcp"), _S("Arguments passed to the X server invocation")); Entry(XephyrPath, QString, _S("/usr/bin/Xephyr"), _S("Path to Xephyr binary")); -@@ -71,7 +71,7 @@ namespace SDDM { - Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used.")); +@@ -72,7 +72,7 @@ namespace SDDM { + Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling")); ); - Section(Wayland, @@ -67,11 +67,11 @@ Entry(SessionDir, QString, _S("/usr/share/wayland-sessions"), _S("Directory containing available Wayland sessions")); Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file")); -diff --git a/src/common/Session.cpp b/src/common/Session.cpp -index 844572c..3605176 100644 ---- a/src/common/Session.cpp -+++ b/src/common/Session.cpp -@@ -118,11 +118,11 @@ namespace SDDM { +Index: sddm-0.15.0~git/src/common/Session.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/common/Session.cpp ++++ sddm-0.15.0~git/src/common/Session.cpp +@@ -125,11 +125,11 @@ namespace SDDM { switch (type) { case X11Session: @@ -85,14 +85,14 @@ m_xdgSessionType = QStringLiteral("wayland"); break; default: -diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp -index 2c9b0d3..7dd4c4d 100644 ---- a/src/daemon/Display.cpp -+++ b/src/daemon/Display.cpp -@@ -110,9 +110,9 @@ namespace SDDM { - - // determine session type - const QString &autologinSession = mainConfig.Autologin.Session.get(); +Index: sddm-0.15.0~git/src/daemon/Display.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/daemon/Display.cpp ++++ sddm-0.15.0~git/src/daemon/Display.cpp +@@ -114,9 +114,9 @@ namespace SDDM { + if (autologinSession.isEmpty()) { + autologinSession = stateConfig.Last.Session.get(); + } - if (findSessionEntry(mainConfig.X11.SessionDir.get(), autologinSession)) { + if (findSessionEntry(mainConfig.XDisplay.SessionDir.get(), autologinSession)) { sessionType = Session::X11Session; @@ -101,10 +101,10 @@ sessionType = Session::WaylandSession; } else { qCritical() << "Unable to find autologin session entry" << autologinSession; -diff --git a/src/daemon/Seat.cpp b/src/daemon/Seat.cpp -index 3ef1b2f..915d619 100644 ---- a/src/daemon/Seat.cpp -+++ b/src/daemon/Seat.cpp +Index: sddm-0.15.0~git/src/daemon/Seat.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/daemon/Seat.cpp ++++ sddm-0.15.0~git/src/daemon/Seat.cpp @@ -57,7 +57,7 @@ namespace SDDM { if (terminalId == -1) { @@ -114,10 +114,10 @@ return m_terminalIds.contains(number); }); } -diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp -index d06d89a..a7e8436 100644 ---- a/src/daemon/XorgDisplayServer.cpp -+++ b/src/daemon/XorgDisplayServer.cpp +Index: sddm-0.15.0~git/src/daemon/XorgDisplayServer.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/daemon/XorgDisplayServer.cpp ++++ sddm-0.15.0~git/src/daemon/XorgDisplayServer.cpp @@ -95,7 +95,7 @@ namespace SDDM { file_handler.open(QIODevice::WriteOnly); file_handler.close(); @@ -174,10 +174,10 @@ // create display setup script process QProcess *displayScript = new QProcess(); -diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp -index d3ace84..7d690fb 100644 ---- a/src/greeter/SessionModel.cpp -+++ b/src/greeter/SessionModel.cpp +Index: sddm-0.15.0~git/src/greeter/SessionModel.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/greeter/SessionModel.cpp ++++ sddm-0.15.0~git/src/greeter/SessionModel.cpp @@ -41,8 +41,8 @@ namespace SDDM { SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) { // initial population @@ -206,10 +206,10 @@ } SessionModel::~SessionModel() { -diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp -index d6bb4d0..7195ddc 100644 ---- a/src/helper/Backend.cpp -+++ b/src/helper/Backend.cpp +Index: sddm-0.15.0~git/src/helper/Backend.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/helper/Backend.cpp ++++ sddm-0.15.0~git/src/helper/Backend.cpp @@ -67,7 +67,7 @@ namespace SDDM { // determine Xauthority path QString value = QStringLiteral("%1/%2") @@ -219,28 +219,28 @@ env.insert(QStringLiteral("XAUTHORITY"), value); } // TODO: I'm fairly sure this shouldn't be done for PAM sessions, investigate! -diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp -index fc10366..d7b93a8 100644 ---- a/src/helper/UserSession.cpp -+++ b/src/helper/UserSession.cpp -@@ -46,11 +46,11 @@ namespace SDDM { - if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QStringLiteral("greeter")) { +Index: sddm-0.15.0~git/src/helper/UserSession.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/helper/UserSession.cpp ++++ sddm-0.15.0~git/src/helper/UserSession.cpp +@@ -48,11 +48,11 @@ namespace SDDM { + if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QLatin1String("greeter")) { QProcess::start(m_path); - } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QStringLiteral("x11")) { -- const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.X11.SessionCommand.get()).arg(m_path); -+ const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.XDisplay.SessionCommand.get()).arg(m_path); + } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) { +- const QString cmd = QStringLiteral("%1 \"%2\"").arg(mainConfig.X11.SessionCommand.get()).arg(m_path); ++ const QString cmd = QStringLiteral("%1 \"%2\"").arg(mainConfig.XDisplay.SessionCommand.get()).arg(m_path); qInfo() << "Starting:" << cmd; QProcess::start(cmd); - } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QStringLiteral("wayland")) { + } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("wayland")) { - const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.Wayland.SessionCommand.get()).arg(m_path); + const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.WaylandDisplay.SessionCommand.get()).arg(m_path); qInfo() << "Starting:" << cmd; QProcess::start(cmd); } else { -@@ -135,8 +135,8 @@ namespace SDDM { +@@ -137,8 +137,8 @@ namespace SDDM { QString sessionLog = QStringLiteral("%1/%2") .arg(QString::fromLocal8Bit(pw->pw_dir)) - .arg(sessionType == QStringLiteral("x11") + .arg(sessionType == QLatin1String("x11") - ? mainConfig.X11.SessionLogFile.get() - : mainConfig.Wayland.SessionLogFile.get()); + ? mainConfig.XDisplay.SessionLogFile.get() @@ -248,7 +248,7 @@ // create the path QFileInfo finfo(sessionLog); -@@ -180,7 +180,7 @@ namespace SDDM { +@@ -182,7 +182,7 @@ namespace SDDM { file_handler.open(QIODevice::WriteOnly); file_handler.close(); @@ -257,6 +257,19 @@ // execute xauth FILE *fp = popen(qPrintable(cmd), "w"); --- -2.9.3 - +Index: sddm-0.15.0~git/src/greeter/GreeterApp.cpp +=================================================================== +--- sddm-0.15.0~git.orig/src/greeter/GreeterApp.cpp ++++ sddm-0.15.0~git/src/greeter/GreeterApp.cpp +@@ -249,9 +249,9 @@ int main(int argc, char **argv) { + // HiDPI + bool hiDpiEnabled = false; + if (QGuiApplication::platformName() == QLatin1String("xcb")) +- hiDpiEnabled = SDDM::mainConfig.X11.EnableHiDPI.get(); ++ hiDpiEnabled = SDDM::mainConfig.XDisplay.EnableHiDPI.get(); + else if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) +- hiDpiEnabled = SDDM::mainConfig.Wayland.EnableHiDPI.get(); ++ hiDpiEnabled = SDDM::mainConfig.WaylandDisplay.EnableHiDPI.get(); + if (hiDpiEnabled) { + qDebug() << "High-DPI autoscaling Enabled"; + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); ++++++ proper_pam.diff ++++++ --- /var/tmp/diff_new_pack.yO2caY/_old 2017-09-08 20:43:36.761355523 +0200 +++ /var/tmp/diff_new_pack.yO2caY/_new 2017-09-08 20:43:36.761355523 +0200 @@ -1,8 +1,8 @@ -diff --git a/services/sddm-autologin.pam b/services/sddm-autologin.pam -index 2432b51c94c23443012cb39d0da122af5c205f60..4fb3873a3fd347fc617843e7c2815411de39b120 100755 ---- a/services/sddm-autologin.pam -+++ b/services/sddm-autologin.pam -@@ -1,11 +1,6 @@ +Index: sddm-0.15.0/services/sddm-autologin.pam +=================================================================== +--- sddm-0.15.0.orig/services/sddm-autologin.pam ++++ sddm-0.15.0/services/sddm-autologin.pam +@@ -1,13 +1,6 @@ #%PAM-1.0 -auth required pam_env.so -auth required pam_tally.so file=/var/log/faillog onerr=succeed @@ -10,20 +10,22 @@ -auth required pam_nologin.so -auth required pam_permit.so --auth optional pam_gnome_keyring.so +--auth optional pam_kwallet5.so -account include system-local-login -password include system-local-login -session include system-local-login --session optional pam_gnome_keyring.so auto_start +--session optional pam_kwallet5.so auto_start +auth required pam_permit.so +account include common-account +password include common-password +session required pam_loginuid.so +session include common-session -diff --git a/services/sddm-greeter.pam b/services/sddm-greeter.pam -index 44e209e9046109b3ad9312a23bc210d5cd3486ef..a9c2a89d04a1dc403a08b2e5b69e926107c4abb5 100644 ---- a/services/sddm-greeter.pam -+++ b/services/sddm-greeter.pam -@@ -1,17 +1,7 @@ +Index: sddm-0.15.0/services/sddm-greeter.pam +=================================================================== +--- sddm-0.15.0.orig/services/sddm-greeter.pam ++++ sddm-0.15.0/services/sddm-greeter.pam +@@ -1,18 +1,8 @@ #%PAM-1.0 - -# Load environment from /etc/environment and ~/.pam_environment @@ -47,17 +49,27 @@ +password include common-password +session required pam_loginuid.so +session include common-session -diff --git a/services/sddm.pam b/services/sddm.pam -index bda5d8002668fb6d1c532924f020e81ff122ad2a..d21651db403edee92f3ca146e97374c43f440c6c 100755 ---- a/services/sddm.pam -+++ b/services/sddm.pam -@@ -1,6 +1,6 @@ + session optional pam_elogind.so +Index: sddm-0.15.0/services/sddm.pam +=================================================================== +--- sddm-0.15.0.orig/services/sddm.pam ++++ sddm-0.15.0/services/sddm.pam +@@ -1,15 +1,6 @@ #%PAM-1.0 - -auth include system-login +--auth optional pam_gnome_keyring.so +--auth optional pam_kwallet5.so +- -account include system-login +- -password include system-login +--password optional pam_gnome_keyring.so use_authtok +- +-session optional pam_keyinit.so force revoke -session include system-login +--session optional pam_gnome_keyring.so auto_start +--session optional pam_kwallet5.so auto_start +auth include common-auth +account include common-account +password include common-password ++++++ sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.yO2caY/_old 2017-09-08 20:43:36.801349899 +0200 +++ /var/tmp/diff_new_pack.yO2caY/_new 2017-09-08 20:43:36.805349337 +0200 @@ -1,7 +1,7 @@ -Index: sddm-0.14.0/CMakeLists.txt +Index: sddm-0.15.0~git/CMakeLists.txt =================================================================== ---- sddm-0.14.0.orig/CMakeLists.txt -+++ sddm-0.14.0/CMakeLists.txt +--- sddm-0.15.0~git.orig/CMakeLists.txt ++++ sddm-0.15.0~git/CMakeLists.txt @@ -160,6 +160,7 @@ set(SESSION_COMMAND "${DATA_ set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" CACHE PATH "Script to execute when starting the Wayland desktop session") @@ -10,16 +10,16 @@ set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") -Index: sddm-0.14.0/src/common/Configuration.h +Index: sddm-0.15.0~git/src/common/Configuration.h =================================================================== ---- sddm-0.14.0.orig/src/common/Configuration.h -+++ sddm-0.14.0/src/common/Configuration.h -@@ -90,14 +90,14 @@ namespace SDDM { +--- sddm-0.15.0~git.orig/src/common/Configuration.h ++++ sddm-0.15.0~git/src/common/Configuration.h +@@ -92,14 +92,14 @@ namespace SDDM { Section(Autologin, Entry(User, QString, QString(), _S("Username for autologin session")); -- Entry(Session, QString, QString(), _S("Name of session file for autologin session")); -+ Entry(Session, QString, _S("default.desktop"), _S("Name of session file for autologin session")); +- Entry(Session, QString, QString(), _S("Name of session file for autologin session (if empty try last logged in)")); ++ Entry(Session, QString, _S("default.desktop"), _S("Name of session file for autologin session (if empty try last logged in)")); Entry(Relogin, bool, false, _S("Whether sddm should automatically log back into sessions when they exit")); ); ); @@ -31,10 +31,10 @@ "This session will be preselected when the login screen appears.")); Entry(User, QString, QString(), _S("Name of the last logged-in user.\n" "This user will be preselected when the login screen appears")); -Index: sddm-0.14.0/src/common/Constants.h.in +Index: sddm-0.15.0~git/src/common/Constants.h.in =================================================================== ---- sddm-0.14.0.orig/src/common/Constants.h.in -+++ sddm-0.14.0/src/common/Constants.h.in +--- sddm-0.15.0~git.orig/src/common/Constants.h.in ++++ sddm-0.15.0~git/src/common/Constants.h.in @@ -33,6 +33,7 @@ #define WAYLAND_SESSION_COMMAND "@WAYLAND_SESSION_COMMAND@" @@ -43,10 +43,10 @@ #define LOG_FILE "@LOG_FILE@" #define PID_FILE "@PID_FILE@" #define MINIMUM_VT @MINIMUM_VT@ -Index: sddm-0.14.0/src/daemon/Display.cpp +Index: sddm-0.15.0~git/src/daemon/Display.cpp =================================================================== ---- sddm-0.14.0.orig/src/daemon/Display.cpp -+++ sddm-0.14.0/src/daemon/Display.cpp +--- sddm-0.15.0~git.orig/src/daemon/Display.cpp ++++ sddm-0.15.0~git/src/daemon/Display.cpp @@ -35,6 +35,7 @@ #include <QDebug> #include <QFile> @@ -55,7 +55,7 @@ #include <pwd.h> #include <unistd.h> -@@ -139,8 +140,19 @@ namespace SDDM { +@@ -143,6 +144,17 @@ namespace SDDM { // log message qDebug() << "Display server started."; @@ -71,8 +71,5 @@ + } + if ((daemonApp->first || mainConfig.Autologin.Relogin.get()) && -- !mainConfig.Autologin.User.get().isEmpty() && !mainConfig.Autologin.Session.get().isEmpty()) { -+ !mainConfig.Autologin.User.get().isEmpty()) { + !mainConfig.Autologin.User.get().isEmpty()) { // reset first flag - daemonApp->first = false; -
