From owner-dev-commits-ports-all@freebsd.org Sun Oct 3 10:32:52 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E0596B5934; Sun, 3 Oct 2021 10:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HMgCm3dlCz4n31; Sun, 3 Oct 2021 10:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D326248EA; Sun, 3 Oct 2021 10:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 193AWq8E035518; Sun, 3 Oct 2021 10:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 193AWq67035517; Sun, 3 Oct 2021 10:32:52 GMT (envelope-from git) Date: Sun, 3 Oct 2021 10:32:52 GMT Message-Id: <202110031032.193AWq67035517@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: a75a4f873323 - main - x11/sddm: Remove unused patch. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a75a4f873323c87f52e22e17e22c63ad9d26a65d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Oct 2021 10:32:52 -0000 The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a75a4f873323c87f52e22e17e22c63ad9d26a65d commit a75a4f873323c87f52e22e17e22c63ad9d26a65d Author: Gleb Popov AuthorDate: 2021-10-03 10:32:06 +0000 Commit: Gleb Popov 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);