diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-09-24 17:21:33 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-09-24 17:36:31 +0000 |
| commit | 505a7155b2e84e495ed8ce95daf21db3a0d59903 (patch) | |
| tree | d6ff7a4a2d8f3786dcc4dd6e2a91e7cfbe52c699 | |
| parent | 0d9036a6d38cb7c434eff4d48828cda4db24383e (diff) | |
| download | ports-505a7155b2e84e495ed8ce95daf21db3a0d59903.tar.gz ports-505a7155b2e84e495ed8ce95daf21db3a0d59903.zip | |
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)
| -rw-r--r-- | sysutils/accountsservice/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/accountsservice/files/patch-src_libaccountsservice_act-user-manager.c | 24 |
2 files changed, 25 insertions, 0 deletions
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 <rstrode@redhat.com> +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"); + |