1 |
commit: d641dc2f7e8e4431278e3d3e03227727961713b7 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 23 11:42:14 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 23 11:42:28 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d641dc2f |
7 |
|
8 |
sys-apps/accountsservice: Fix switch user (#664228 by Alexander Tsoy) |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
.../accountsservice-0.6.50-r1.ebuild | 61 ++++++++++++++++++++++ |
13 |
.../accountsservice-0.6.50-loaded-state.patch | 36 +++++++++++++ |
14 |
2 files changed, 97 insertions(+) |
15 |
|
16 |
diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild |
17 |
new file mode 100644 |
18 |
index 00000000000..3036d2bed67 |
19 |
--- /dev/null |
20 |
+++ b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild |
21 |
@@ -0,0 +1,61 @@ |
22 |
+# Copyright 1999-2018 Gentoo Foundation |
23 |
+# Distributed under the terms of the GNU General Public License v2 |
24 |
+ |
25 |
+EAPI=6 |
26 |
+GNOME2_EAUTORECONF="yes" |
27 |
+ |
28 |
+inherit gnome2 systemd |
29 |
+ |
30 |
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information" |
31 |
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/" |
32 |
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" |
33 |
+ |
34 |
+LICENSE="GPL-3+" |
35 |
+SLOT="0" |
36 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
37 |
+ |
38 |
+IUSE="doc elogind +introspection selinux systemd" |
39 |
+REQUIRED_USE="?? ( elogind systemd )" |
40 |
+ |
41 |
+CDEPEND=" |
42 |
+ >=dev-libs/glib-2.44:2 |
43 |
+ sys-auth/polkit |
44 |
+ elogind? ( >=sys-auth/elogind-229.4 ) |
45 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) |
46 |
+ systemd? ( >=sys-apps/systemd-186:0= ) |
47 |
+ !systemd? ( !elogind? ( sys-auth/consolekit ) ) |
48 |
+" |
49 |
+DEPEND="${CDEPEND} |
50 |
+ dev-libs/libxslt |
51 |
+ dev-util/gdbus-codegen |
52 |
+ >=dev-util/gtk-doc-am-1.15 |
53 |
+ >=dev-util/intltool-0.40 |
54 |
+ sys-devel/gettext |
55 |
+ virtual/pkgconfig |
56 |
+ doc? ( |
57 |
+ app-text/docbook-xml-dtd:4.1.2 |
58 |
+ app-text/xmlto ) |
59 |
+" |
60 |
+RDEPEND="${CDEPEND} |
61 |
+ selinux? ( sec-policy/selinux-accountsd ) |
62 |
+" |
63 |
+ |
64 |
+PATCHES=( |
65 |
+ "${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch |
66 |
+ |
67 |
+ # lib: don't set loaded state until seat is fetched (from 'master') |
68 |
+ "${FILESDIR}"/${P}-loaded-state.patch |
69 |
+) |
70 |
+ |
71 |
+src_configure() { |
72 |
+ gnome2_src_configure \ |
73 |
+ --disable-static \ |
74 |
+ --disable-more-warnings \ |
75 |
+ --localstatedir="${EPREFIX}"/var \ |
76 |
+ --enable-admin-group="wheel" \ |
77 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
78 |
+ $(use_enable doc docbook-docs) \ |
79 |
+ $(use_enable elogind) \ |
80 |
+ $(use_enable introspection) \ |
81 |
+ $(use_enable systemd) |
82 |
+} |
83 |
|
84 |
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch b/sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch |
85 |
new file mode 100644 |
86 |
index 00000000000..901704bc601 |
87 |
--- /dev/null |
88 |
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch |
89 |
@@ -0,0 +1,36 @@ |
90 |
+From c7fa612023a163e8b2352e1170c6df3fceb19b27 Mon Sep 17 00:00:00 2001 |
91 |
+From: Ray Strode <rstrode@××××××.com> |
92 |
+Date: Thu, 19 Jul 2018 13:14:09 -0400 |
93 |
+Subject: lib: don't set loaded state until seat is fetched |
94 |
+ |
95 |
+At the moment we set is-loaded on the user-manager |
96 |
+object as soon as we start fetching the seat, but |
97 |
+we should waiting until the seat is fetched, so |
98 |
+that can_switch() will return the correct value |
99 |
+if the caller waited until the loaded signal |
100 |
+to use it. |
101 |
+ |
102 |
+This commit changes the >= to > which I believe |
103 |
+was the original intention anyway. |
104 |
+ |
105 |
+https://bugs.freedesktop.org/show_bug.cgi?id=107298 |
106 |
+--- |
107 |
+ src/libaccountsservice/act-user-manager.c | 2 +- |
108 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
109 |
+ |
110 |
+diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c |
111 |
+index 325421b..e7e26b1 100644 |
112 |
+--- a/src/libaccountsservice/act-user-manager.c |
113 |
++++ b/src/libaccountsservice/act-user-manager.c |
114 |
+@@ -2382,7 +2382,7 @@ maybe_set_is_loaded (ActUserManager *manager) |
115 |
+ /* Don't set is_loaded yet unless the seat is already loaded enough |
116 |
+ * or failed to load. |
117 |
+ */ |
118 |
+- if (manager->priv->seat.state >= ACT_USER_MANAGER_SEAT_STATE_GET_ID) { |
119 |
++ if (manager->priv->seat.state > ACT_USER_MANAGER_SEAT_STATE_GET_ID) { |
120 |
+ g_debug ("ActUserManager: Seat loaded, so now setting loaded property"); |
121 |
+ } else if (manager->priv->seat.state == ACT_USER_MANAGER_SEAT_STATE_UNLOADED) { |
122 |
+ g_debug ("ActUserManager: Seat wouldn't load, so giving up on it and setting loaded property"); |
123 |
+-- |
124 |
+cgit v1.1 |
125 |
+ |