From owner-dev-commits-ports-branches@freebsd.org Fri Sep 24 17:36:43 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 5A2F567135C; Fri, 24 Sep 2021 17:36:43 +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 4HGK2z24gsz3Q7Y; Fri, 24 Sep 2021 17:36:43 +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 272D11AE96; Fri, 24 Sep 2021 17:36:43 +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 18OHah0X010875; Fri, 24 Sep 2021 17:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18OHahx4010874; Fri, 24 Sep 2021 17:36:43 GMT (envelope-from git) Date: Fri, 24 Sep 2021 17:36:43 GMT Message-Id: <202109241736.18OHahx4010874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Tobias C. Berner" Subject: git: 505a7155b2e8 - 2021Q3 - sysutils/accountsservice: unbreak update to 0.6.55 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 505a7155b2e84e495ed8ce95daf21db3a0d59903 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 17:36:43 -0000 The branch 2021Q3 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=505a7155b2e84e495ed8ce95daf21db3a0d59903 commit 505a7155b2e84e495ed8ce95daf21db3a0d59903 Author: Tobias C. Berner AuthorDate: 2021-09-24 17:21:33 +0000 Commit: Tobias C. Berner CommitDate: 2021-09-24 17:36:31 +0000 sysutils/accountsservice: unbreak update to 0.6.55 In ffb1311e56725702208e807cfc63c8163c6b4a52 the port was updated to 0.6.55, which unfortunately broke some functionality in gdm. Add the patch from OpenBSD to fix this. Reported by: rm Obtained from: https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/sysutils/accountsservice/patches/patch-src_libaccountsservice_act-user-manager_c PR: 249445 (cherry picked from commit fa6b589dc7cf40675fad8764fd86788107e085e7) --- sysutils/accountsservice/Makefile | 1 + ...patch-src_libaccountsservice_act-user-manager.c | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index 70e6c3b40850..b1367455fd36 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -2,6 +2,7 @@ PORTNAME= accountsservice PORTVERSION= 0.6.55 +PORTREVISION= 1 CATEGORIES= sysutils devel MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/ diff --git a/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c new file mode 100644 index 000000000000..9026883f2cc6 --- /dev/null +++ b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c @@ -0,0 +1,24 @@ +Obtained from: + https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/sysutils/accountsservice/patches/patch-src_libaccountsservice_act-user-manager_c + +$OpenBSD: patch-src_libaccountsservice_act-user-manager_c,v 1.2 2021/08/30 19:15:24 ajacoutot Exp $ + +REVERT: (breaks listing users in gdm and gnome-cc and unlocking screenshield) +From c7fa612023a163e8b2352e1170c6df3fceb19b27 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Thu, 19 Jul 2018 13:14:09 -0400 +Subject: [PATCH] lib: don't set loaded state until seat is fetched + +Index: src/libaccountsservice/act-user-manager.c +--- src/libaccountsservice/act-user-manager.c.orig ++++ src/libaccountsservice/act-user-manager.c +@@ -2547,7 +2547,7 @@ maybe_set_is_loaded (ActUserManager *manager) + /* Don't set is_loaded yet unless the seat is already loaded enough + * or failed to load. + */ +- if (priv->seat.state > ACT_USER_MANAGER_SEAT_STATE_GET_ID) { ++ if (priv->seat.state >= ACT_USER_MANAGER_SEAT_STATE_GET_ID) { + g_debug ("ActUserManager: Seat loaded, so now setting loaded property"); + } else if (priv->seat.state == ACT_USER_MANAGER_SEAT_STATE_UNLOADED) { + g_debug ("ActUserManager: Seat wouldn't load, so giving up on it and setting loaded property"); +