From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5659D138334 for ; Sun, 23 Sep 2018 11:42:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EE35E041F; Sun, 23 Sep 2018 11:42:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1E0EE041F for ; Sun, 23 Sep 2018 11:42:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE8DE335CC9 for ; Sun, 23 Sep 2018 11:42:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E04413DB for ; Sun, 23 Sep 2018 11:42:33 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1537702948.d641dc2f7e8e4431278e3d3e03227727961713b7.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch X-VCS-Directories: sys-apps/accountsservice/ sys-apps/accountsservice/files/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: d641dc2f7e8e4431278e3d3e03227727961713b7 X-VCS-Branch: master Date: Sun, 23 Sep 2018 11:42:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f6614b46-53e4-4554-bd23-d59341e18f98 X-Archives-Hash: 663c3f8cd0a81d1b11a8526d16d39eb1 commit: d641dc2f7e8e4431278e3d3e03227727961713b7 Author: Pacho Ramos gentoo org> AuthorDate: Sun Sep 23 11:42:14 2018 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Sep 23 11:42:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d641dc2f sys-apps/accountsservice: Fix switch user (#664228 by Alexander Tsoy) Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../accountsservice-0.6.50-r1.ebuild | 61 ++++++++++++++++++++++ .../accountsservice-0.6.50-loaded-state.patch | 36 +++++++++++++ 2 files changed, 97 insertions(+) diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild new file mode 100644 index 00000000000..3036d2bed67 --- /dev/null +++ b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 systemd + +DESCRIPTION="D-Bus interfaces for querying and manipulating user account information" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/" +SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="doc elogind +introspection selinux systemd" +REQUIRED_USE="?? ( elogind systemd )" + +CDEPEND=" + >=dev-libs/glib-2.44:2 + sys-auth/polkit + elogind? ( >=sys-auth/elogind-229.4 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + systemd? ( >=sys-apps/systemd-186:0= ) + !systemd? ( !elogind? ( sys-auth/consolekit ) ) +" +DEPEND="${CDEPEND} + dev-libs/libxslt + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.15 + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto ) +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-accountsd ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch + + # lib: don't set loaded state until seat is fetched (from 'master') + "${FILESDIR}"/${P}-loaded-state.patch +) + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --disable-more-warnings \ + --localstatedir="${EPREFIX}"/var \ + --enable-admin-group="wheel" \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + $(use_enable doc docbook-docs) \ + $(use_enable elogind) \ + $(use_enable introspection) \ + $(use_enable systemd) +} 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 new file mode 100644 index 00000000000..901704bc601 --- /dev/null +++ b/sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch @@ -0,0 +1,36 @@ +From c7fa612023a163e8b2352e1170c6df3fceb19b27 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Thu, 19 Jul 2018 13:14:09 -0400 +Subject: lib: don't set loaded state until seat is fetched + +At the moment we set is-loaded on the user-manager +object as soon as we start fetching the seat, but +we should waiting until the seat is fetched, so +that can_switch() will return the correct value +if the caller waited until the loaded signal +to use it. + +This commit changes the >= to > which I believe +was the original intention anyway. + +https://bugs.freedesktop.org/show_bug.cgi?id=107298 +--- + src/libaccountsservice/act-user-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c +index 325421b..e7e26b1 100644 +--- a/src/libaccountsservice/act-user-manager.c ++++ b/src/libaccountsservice/act-user-manager.c +@@ -2382,7 +2382,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 (manager->priv->seat.state >= ACT_USER_MANAGER_SEAT_STATE_GET_ID) { ++ if (manager->priv->seat.state > ACT_USER_MANAGER_SEAT_STATE_GET_ID) { + g_debug ("ActUserManager: Seat loaded, so now setting loaded property"); + } else if (manager->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"); +-- +cgit v1.1 +