aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpotlight <spotlight@joscomputing.space>2019-07-23 17:00:17 -0500
committerAnthony G. Basile <blueness@gentoo.org>2019-08-18 20:04:16 -0400
commit7af0482c8e1c79485fac662c12c344d65b31bbfc (patch)
treec52579f281ebb5c368e4829b464cd5839898767c /sys-apps
parentx11-libs/libva-vdpau-driver: (diff)
downloadmusl-7af0482c8e1c79485fac662c12c344d65b31bbfc.tar.gz
musl-7af0482c8e1c79485fac662c12c344d65b31bbfc.tar.bz2
musl-7af0482c8e1c79485fac662c12c344d65b31bbfc.zip
sys-apps/accountservice: update to 0.6.50-r1
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/accountsservice/Manifest2
-rw-r--r--sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild (renamed from sys-apps/accountsservice/accountsservice-0.6.45.ebuild)23
-rw-r--r--sys-apps/accountsservice/files/accountsservice-0.6.43-elogind.patch110
-rw-r--r--sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch36
4 files changed, 49 insertions, 122 deletions
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 2e0a9fd..a3e3d72 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1 +1 @@
-DIST accountsservice-0.6.45.tar.xz 382740 BLAKE2B ce88e53c7d0187f53ed0a2758f81c8e2d1083ab1c95ec6cddebb2167b36706b1537ecf74b7904a9002c6179cfdf811a3268451af9443727ba9793a9af06cf8aa SHA512 09975f9fa03a3177d923de6d6f6e6acfffeb2ff4924c45eaac78c994c16974427c8e936a87034747ba494d2bb3df6e8a92ff44db387761b06e06e311d7cf105a
+DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
diff --git a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
index 8bc3ae9..a925c0e 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# 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"
@@ -12,19 +12,18 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc elogind +introspection selinux systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="doc consolekit elogind +introspection selinux systemd"
+REQUIRED_USE="^^ ( consolekit elogind systemd )"
CDEPEND="
- >=dev-libs/glib-2.37.3:2
+ >=dev-libs/glib-2.44:2
sys-auth/polkit
+ consolekit? ( sys-auth/consolekit )
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
@@ -42,9 +41,11 @@ RDEPEND="${CDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-0.6.35-gentoo-system-users.patch"
- "${FILESDIR}/${PN}-0.6.43-elogind.patch"
- "${FILESDIR}/musl-fgetspent_r.patch"
+ "${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
+ "${FILESDIR}"/musl-fgetspent_r.patch
)
src_prepare() {
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.43-elogind.patch b/sys-apps/accountsservice/files/accountsservice-0.6.43-elogind.patch
deleted file mode 100644
index cd3510e..0000000
--- a/sys-apps/accountsservice/files/accountsservice-0.6.43-elogind.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 9fdd1d95ec094a0df6d8d3dd9c8f04fa8499b845 Mon Sep 17 00:00:00 2001
-From: Sven Eden <sven.eden@gmx.de>
-Date: Tue, 6 Jun 2017 10:17:33 -0400
-Subject: configure: elogind on non-systemd systems
-
-This commit adds some configure goo to make accountsservice use
-elogind if explicitly requested for systems that don't have
-systemd.
-
-diff --git a/configure.ac b/configure.ac
-index b255e72..4b21477 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -264,22 +264,24 @@ dnl Check for xsltproc
- dnl ---------------------------------------------------------------------------
- AC_PATH_PROG([XSLTPROC], [xsltproc])
-
--# systemd
-+# systemd or elogind
-+
-+have_systemd=no
-+
-+AC_MSG_CHECKING([whether to use systemd])
-
- AC_ARG_ENABLE([systemd],
- AS_HELP_STRING([--enable-systemd], [Use systemd]),
- [enable_systemd=$enableval],
- [enable_systemd=auto])
-
-+AC_MSG_RESULT($enable_systemd)
-+
- if test x$enable_systemd != xno; then
-- PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],
-- [have_systemd=yes], [have_systemd=no])
--else
-- have_systemd=no
-+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],
-+ [have_systemd=yes])
- fi
-
--AC_MSG_CHECKING([whether to use systemd])
--
- if test x$enable_systemd = xauto ; then
- if test x$have_systemd = xno ; then
- enable_systemd=no
-@@ -288,21 +290,54 @@ if test x$enable_systemd = xauto ; then
- fi
- fi
-
--AC_MSG_RESULT($enable_systemd)
-+have_elogind=no
-+
-+AC_MSG_CHECKING([whether to use elogind])
-+
-+AC_ARG_ENABLE([elogind],
-+ AS_HELP_STRING([--enable-elogind], [Use elogind]),
-+ [enable_elogind=$enableval],
-+ [enable_elogind=no])
-+
-+AC_MSG_RESULT($enable_elogind)
-
- if test x$enable_systemd = xyes; then
- if test x$have_systemd = xno; then
-- AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-+ AC_MSG_ERROR([Systemd support explicitly requested, but libsystemd not found])
-+ fi
-+
-+ dnl Requesting to use the elogind session tracker makes no sense where
-+ dnl systemd-login is (or might be) running.
-+ if test x$enable_elogind = xyes; then
-+ AC_MSG_WARN([elogind support requested, but systemd was found.])
-+ AC_MSG_ERROR([Disable either elogind or systemd support.])
- fi
-+
-+ AC_SUBST(SYSTEMD_CFLAGS)
-+ AC_SUBST(SYSTEMD_LIBS)
-+
-+ LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $SYSTEMD_LIBS"
-+ LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $SYSTEMD_CFLAGS"
-+
- AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used])
- fi
--AC_SUBST(SYSTEMD_CFLAGS)
--AC_SUBST(SYSTEMD_LIBS)
-
--LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $SYSTEMD_LIBS"
--LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $SYSTEMD_CFLAGS"
-+if test "x$enable_elogind" != "xno"; then
-+ PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4],
-+ [have_elogind=yes])
-+
-+ if test "x$have_elogind" != "xyes"; then
-+ AC_MSG_ERROR([elogind support requested, but libelogind not found])
-+ else
-+ AC_SUBST(ELOGIND_CFLAGS)
-+ AC_SUBST(ELOGIND_LIBS)
-+
-+ LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $ELOGIND_LIBS"
-+ LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $ELOGIND_CFLAGS"
-+ fi
-+fi
-
--if test "x$have_systemd" != "xno" ; then
-+if test "x${have_systemd}" != "xno" -o "x${have_elogind}" != "xno" ; then
- AC_DEFINE(WITH_SYSTEMD, 1, [Define to enable systemd support])
- fi
-
---
-cgit v0.10.2
-
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 0000000..901704b
--- /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 <rstrode@redhat.com>
+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
+