Date: Sun, 3 Oct 2021 10:32:52 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a75a4f873323 - main - x11/sddm: Remove unused patch. Message-ID: <202110031032.193AWq67035517@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a75a4f873323c87f52e22e17e22c63ad9d26a65d commit a75a4f873323c87f52e22e17e22c63ad9d26a65d Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2021-10-03 10:32:06 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2021-10-03 10:32:47 +0000 x11/sddm: Remove unused patch. --- x11/sddm/files/git-patch-147cec38d | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/x11/sddm/files/git-patch-147cec38d b/x11/sddm/files/git-patch-147cec38d deleted file mode 100644 index 91c44e245192..000000000000 --- a/x11/sddm/files/git-patch-147cec38d +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp -index 5abfc9a..57d7ecb 100644 ---- src/daemon/Display.cpp -+++ src/daemon/Display.cpp -@@ -339,7 +339,9 @@ namespace SDDM { - } else { - //we only want to unlock the session if we can lock in, so we want to go via PAM auth, but not start a new session - //by not setting the session and the helper will emit authentication and then quit -- connect(m_auth, &Auth::authentication, this, [=](){ -+ connect(m_auth, &Auth::authentication, this, [=](const QString &, bool success){ -+ if(!success) -+ return; - qDebug() << "activating existing seat"; - OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(), Logind::managerPath(), QDBusConnection::systemBus()); - manager.UnlockSession(existingSessionId); -diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp -index 69cbd2c..5467282 100644 ---- src/helper/backend/PamBackend.cpp -+++ src/helper/backend/PamBackend.cpp -@@ -219,8 +219,6 @@ namespace SDDM { - - if (user == QStringLiteral("sddm") && m_greeter) - service = QStringLiteral("sddm-greeter"); -- else if (m_app->session()->path().isEmpty()) -- service = QStringLiteral("sddm-check"); - else if (m_autologin) - service = QStringLiteral("sddm-autologin"); - result = m_pam->start(service, user);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110031032.193AWq67035517>