* [gentoo-commits] repo/gentoo:master commit in: x11-misc/light-locker/files/, x11-misc/light-locker/
@ 2019-03-31 22:15 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-03-31 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 8cc3d677098e5bac1274f126ed5bd0c73dc5c534
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 21:46:09 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 21:48:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc3d677
x11-misc/light-locker: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/light-locker/Manifest | 1 -
.../files/light-locker-1.7.0-systemd.patch | 46 ---------------
x11-misc/light-locker/light-locker-1.7.0-r1.ebuild | 68 ----------------------
x11-misc/light-locker/light-locker-1.7.0.ebuild | 64 --------------------
x11-misc/light-locker/light-locker-1.8.0.ebuild | 64 --------------------
5 files changed, 243 deletions(-)
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index 29b918a890e..e9775ab7749 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,2 +1 @@
-DIST light-locker-1.7.0.tar.bz2 530315 BLAKE2B b93247e730a4cd30469f7e0113df1641994b6d4f1a77c8394a70235949ec6965b3115c0889b5e9dd11ba8a0b9b7ae3704843620b6aed4c0c0400676ad7138885 SHA512 dcd524ed5bf8475743585ee5a6b35dfe396d17f307418e208450ccabc12ab6b3835818fdf11324b8c7dc63332b9faacea184409b7c9c0a242fbb9d6402a2d079
DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
diff --git a/x11-misc/light-locker/files/light-locker-1.7.0-systemd.patch b/x11-misc/light-locker/files/light-locker-1.7.0-systemd.patch
deleted file mode 100644
index 757dda27329..00000000000
--- a/x11-misc/light-locker/files/light-locker-1.7.0-systemd.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.orig 2016-09-12 19:48:08.510799596 -0600
-+++ configure 2016-09-12 19:48:33.804071980 -0600
-@@ -17532,12 +17532,12 @@
- pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null`
-+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -17549,12 +17549,12 @@
- pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null`
-+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -17575,9 +17575,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1`
-+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
- else
-- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1`
-+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$SYSTEMD_PKG_ERRORS" >&5
diff --git a/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
deleted file mode 100644
index e8c99ce5fec..00000000000
--- a/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A simple locker using lightdm"
-HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
-
-RDEPEND="dev-libs/dbus-glib
- >=dev-libs/glib-2.25.6:2
- >=sys-apps/dbus-0.30
- x11-libs/cairo
- x11-libs/libX11
- x11-libs/pango
- x11-libs/libXxf86vm
- consolekit? ( sys-auth/consolekit )
- dpms? ( x11-libs/libXext )
- !gtk3? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( x11-libs/gtk+:3 )
- screensaver? ( x11-libs/libXScrnSaver )
- systemd? ( sys-apps/systemd )
- upower? ( sys-power/upower )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-perl/XML-Parser
- dev-util/intltool
- sys-devel/gettext"
-RDEPEND="${RDEPEND}
- x11-misc/lightdm"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_prepare() {
- # Not using debian's patch on configure.ac because it requires running xdg-autogen which is a mess
- epatch "${FILESDIR}/${PN}-${PV}-systemd.patch"
- eapply_user
-}
-
-src_configure() {
- econf \
- $(use_with consolekit console-kit) \
- $(use_with dpms dpms-ext) \
- $(use_with !gtk3 gtk2) \
- $(use_with screensaver x) \
- $(use_with screensaver mit-ext) \
- $(use_with systemd) \
- $(use_with upower)
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/x11-misc/light-locker/light-locker-1.7.0.ebuild b/x11-misc/light-locker/light-locker-1.7.0.ebuild
deleted file mode 100644
index e5e721f142e..00000000000
--- a/x11-misc/light-locker/light-locker-1.7.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils gnome2-utils
-
-DESCRIPTION="A simple locker using lightdm"
-HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
-
-RDEPEND="dev-libs/dbus-glib
- >=dev-libs/glib-2.25.6:2
- >=sys-apps/dbus-0.30
- x11-libs/cairo
- x11-libs/libX11
- x11-libs/pango
- x11-libs/libXxf86vm
- consolekit? ( sys-auth/consolekit )
- dpms? ( x11-libs/libXext )
- !gtk3? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( x11-libs/gtk+:3 )
- screensaver? ( x11-libs/libXScrnSaver )
- systemd? ( sys-apps/systemd )
- upower? ( sys-power/upower )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-perl/XML-Parser
- dev-util/intltool
- sys-devel/gettext"
-RDEPEND="${RDEPEND}
- x11-misc/lightdm"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_configure() {
- local myeconfargs=(
- $(use_with consolekit console-kit)
- $(use_with dpms dpms-ext)
- $(use_with !gtk3 gtk2)
- $(use_with screensaver x)
- $(use_with screensaver mit-ext)
- $(use_with systemd)
- $(use_with upower)
- )
- autotools-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/x11-misc/light-locker/light-locker-1.8.0.ebuild b/x11-misc/light-locker/light-locker-1.8.0.ebuild
deleted file mode 100644
index e5e721f142e..00000000000
--- a/x11-misc/light-locker/light-locker-1.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils gnome2-utils
-
-DESCRIPTION="A simple locker using lightdm"
-HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
-
-RDEPEND="dev-libs/dbus-glib
- >=dev-libs/glib-2.25.6:2
- >=sys-apps/dbus-0.30
- x11-libs/cairo
- x11-libs/libX11
- x11-libs/pango
- x11-libs/libXxf86vm
- consolekit? ( sys-auth/consolekit )
- dpms? ( x11-libs/libXext )
- !gtk3? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( x11-libs/gtk+:3 )
- screensaver? ( x11-libs/libXScrnSaver )
- systemd? ( sys-apps/systemd )
- upower? ( sys-power/upower )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-perl/XML-Parser
- dev-util/intltool
- sys-devel/gettext"
-RDEPEND="${RDEPEND}
- x11-misc/lightdm"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_configure() {
- local myeconfargs=(
- $(use_with consolekit console-kit)
- $(use_with dpms dpms-ext)
- $(use_with !gtk3 gtk2)
- $(use_with screensaver x)
- $(use_with screensaver mit-ext)
- $(use_with systemd)
- $(use_with upower)
- )
- autotools-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/light-locker/files/, x11-misc/light-locker/
@ 2019-05-24 3:57 Denis Dupeyron
0 siblings, 0 replies; 4+ messages in thread
From: Denis Dupeyron @ 2019-05-24 3:57 UTC (permalink / raw
To: gentoo-commits
commit: bc4bc9cdeb223250a0f74aff63a37d7d45e01aa3
Author: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 03:56:41 2019 +0000
Commit: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Fri May 24 03:56:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4bc9cd
x11-misc/light-locker: bump to 1.9.0
Manually ported the elogind patch. Note that consolekit is no longer
supported.
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Denis Dupeyron <calchan <AT> gentoo.org>
x11-misc/light-locker/Manifest | 1 +
.../files/light-locker-1.9.0-elogind.patch | 257 +++++++++++++++++++++
x11-misc/light-locker/light-locker-1.9.0.ebuild | 72 ++++++
3 files changed, 330 insertions(+)
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index e9775ab7749..9350ca78299 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1 +1,2 @@
DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
+DIST v1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
diff --git a/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
new file mode 100644
index 00000000000..298e75844c4
--- /dev/null
+++ b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
@@ -0,0 +1,257 @@
+From 76afbe0757d8846d76bfed350aa9c9e4242aef86 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Thu, 23 May 2019 13:52:12 -0600
+Subject: [PATCH] Port light-locker-1.8.0-elogind.patch
+
+---
+ README.md | 2 ++
+ configure.ac.in | 37 +++++++++++++++++++++++++++++++++++++
+ src/gs-listener-dbus.c | 34 +++++++++++++++++++---------------
+ src/light-locker.c | 6 ++++++
+ 4 files changed, 64 insertions(+), 15 deletions(-)
+
+diff --git a/README.md b/README.md
+index 86b66d0..b093a4f 100644
+--- a/README.md
++++ b/README.md
+@@ -38,6 +38,8 @@ Here is a list of the different dependencies and their configuration flags:
+
+ --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed.
+
++ --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above.
++
+ --with-upower: This adds the support for UPower.
+
+ --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
+diff --git a/configure.ac.in b/configure.ac.in
+index f95863a..5c92191 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -421,6 +421,42 @@ fi
+ AC_SUBST(SYSTEMD_CFLAGS)
+ AC_SUBST(SYSTEMD_LIBS)
+
++dnl ---------------------------------------------------------------------------
++dnl elogind
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH(elogind,
++ AS_HELP_STRING([--with-elogind],
++ [Add elogind support]),
++ [with_elogind=$withval], [with_elogind=auto])
++
++if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then
++ AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind])
++fi
++
++PKG_CHECK_MODULES(ELOGIND,
++ [libelogind],
++ [have_elogind=yes], [have_elogind=no])
++
++if test "x$with_elogind" = "xauto" ; then
++ if test x$have_elogind = xno ; then
++ use_elogind=no
++ else
++ use_elogind=yes
++ fi
++else
++ use_elogind=$with_elogind
++fi
++
++if test "x$use_elogind" = "xyes"; then
++ if test "x$have_elogind" = "xno"; then
++ AC_MSG_ERROR([Elogind support explicitly required, but elogind not found])
++ fi
++ AC_DEFINE(WITH_ELOGIND, 1, [elogind support])
++fi
++AC_SUBST(ELOGIND_CFLAGS)
++AC_SUBST(ELOGIND_LIBS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl UPower
+ dnl ---------------------------------------------------------------------------
+@@ -640,6 +676,7 @@ echo "
+ Platform:
+ ---------
+ systemd: ${use_systemd}
++ elogind: ${use_elogind}
+ UPower: ${use_upower}
+
+ Features:
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 044a2bf..164856f 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -43,6 +43,10 @@
+ #include <systemd/sd-login.h>
+ #endif
+
++#ifdef WITH_ELOGIND
++#include <elogind/systemd/sd-login.h>
++#endif
++
+ #include "gs-listener-dbus.h"
+ #include "gs-marshal.h"
+ #include "gs-debug.h"
+@@ -78,7 +82,7 @@ struct GSListenerPrivate
+ char *session_id;
+ char *seat_path;
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ gboolean have_systemd;
+ char *sd_session_id;
+ int delay_fd;
+@@ -134,7 +138,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
+
+ gs_debug ("Send switch greeter");
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ /* Compare with 0. On failure this will return < 0.
+ * In the later case we probably aren't using systemd.
+ */
+@@ -175,7 +179,7 @@ gs_listener_send_lock_session (GSListener *listener)
+
+ gs_debug ("Send lock session");
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ /* Compare with 0. On failure this will return < 0.
+ * In the later case we probably aren't using systemd.
+ */
+@@ -359,7 +363,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+
+ gs_debug ("Send idle hint: %d", idle);
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ if (listener->priv->have_systemd) {
+
+ if (listener->priv->system_connection == NULL) {
+@@ -400,7 +404,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ void
+ gs_listener_delay_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ DBusMessage *message;
+ DBusMessage *reply;
+ DBusError error;
+@@ -473,7 +477,7 @@ gs_listener_delay_suspend (GSListener *listener)
+ void
+ gs_listener_resume_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
+
+ if (listener->priv->delay_fd >= 0) {
+@@ -1076,7 +1080,7 @@ _listener_message_path_is_our_session (GSListener *listener,
+ return FALSE;
+ }
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ static gboolean
+ query_session_active (GSListener *listener)
+ {
+@@ -1212,7 +1216,7 @@ query_lid_closed (GSListener *listener)
+ #endif
+ #endif
+
+-#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
+ static gboolean
+ properties_changed_match (DBusMessage *message,
+ const char *property)
+@@ -1307,7 +1311,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+ dbus_message_get_destination (message));
+ #endif
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+
+ if (listener->priv->have_systemd) {
+
+@@ -1880,7 +1884,7 @@ gs_listener_acquire (GSListener *listener,
+ listener_dbus_system_filter_function,
+ listener,
+ NULL);
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ if (listener->priv->have_systemd) {
+ dbus_bus_add_match (listener->priv->system_connection,
+ "type='signal'"
+@@ -1971,7 +1975,7 @@ query_session_id (GSListener *listener)
+
+ dbus_error_init (&error);
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ if (listener->priv->have_systemd) {
+ dbus_uint32_t pid = getpid();
+
+@@ -2022,7 +2026,7 @@ query_session_id (GSListener *listener)
+ return NULL;
+ }
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ static char *
+ query_sd_session_id (GSListener *listener)
+ {
+@@ -2053,7 +2057,7 @@ init_session_id (GSListener *listener)
+ else
+ gs_debug ("Got session-id: %s", listener->priv->session_id);
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ g_free (listener->priv->sd_session_id);
+ listener->priv->sd_session_id = query_sd_session_id (listener);
+ if (listener->priv->sd_session_id == NULL)
+@@ -2150,7 +2154,7 @@ gs_listener_init (GSListener *listener)
+ {
+ listener->priv = GS_LISTENER_GET_PRIVATE (listener);
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ /* check if logind is running */
+ listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
+ listener->priv->delay_fd = -1;
+@@ -2179,7 +2183,7 @@ gs_listener_finalize (GObject *object)
+ g_free (listener->priv->session_id);
+ g_free (listener->priv->seat_path);
+
+-#ifdef WITH_SYSTEMD
++#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
+ g_free (listener->priv->sd_session_id);
+ #endif
+
+diff --git a/src/light-locker.c b/src/light-locker.c
+index aefc4c6..51ae519 100644
+--- a/src/light-locker.c
++++ b/src/light-locker.c
+@@ -139,6 +139,7 @@ main (int argc,
+ gs_debug ("Platform:\n"
+ "gtk: %d\n"
+ "systemd: %s\n"
++ "elogind: %s"
+ "UPower: %s",
+ GTK_MAJOR_VERSION,
+ #ifdef WITH_SYSTEMD
+@@ -146,6 +147,11 @@ main (int argc,
+ #else
+ "no",
+ #endif
++#ifdef WITH_ELOGIND
++ "yes"
++#else
++ "no"
++#endif
+ #ifdef WITH_UPOWER
+ "yes"
+ #else
+--
+2.21.0
+
diff --git a/x11-misc/light-locker/light-locker-1.9.0.ebuild b/x11-misc/light-locker/light-locker-1.9.0.ebuild
new file mode 100644
index 00000000000..d46f9cdaf37
--- /dev/null
+++ b/x11-misc/light-locker/light-locker-1.9.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A simple locker using lightdm"
+HOMEPAGE="https://github.com/the-cavalry/light-locker"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dpms elogind +screensaver systemd +upower"
+
+BDEPEND="dev-lang/perl
+ dev-perl/XML-Parser
+ dev-util/intltool
+ sys-devel/gettext"
+DEPEND="dev-libs/dbus-glib
+ dev-libs/glib
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ x11-libs/libXxf86vm
+ dpms? ( x11-libs/libXext )
+ elogind? ( sys-auth/elogind )
+ screensaver? ( x11-libs/libXScrnSaver )
+ systemd? ( sys-apps/systemd )
+ upower? ( sys-power/upower )"
+RDEPEND="${DEPEND}
+ x11-misc/lightdm"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+PATCHES=(
+ "${FILESDIR}/${P}-elogind.patch"
+)
+
+src_prepare() {
+ default
+ # Fixed upstream right after the release, remove this next time you bump
+ ln -sf README.md README || die
+ # remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf
+ sed -e "/XDT_I18N/d" configure.ac.in > configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with dpms dpms-ext)
+ $(use_with screensaver x)
+ $(use_with screensaver mit-ext)
+ $(use_with systemd)
+ $(use_with elogind)
+ $(use_with upower)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/light-locker/files/, x11-misc/light-locker/
@ 2019-06-10 14:44 Denis Dupeyron
0 siblings, 0 replies; 4+ messages in thread
From: Denis Dupeyron @ 2019-06-10 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 12dea5c03da6a3b884490a476ef057b80ce9f2d6
Author: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 14:43:37 2019 +0000
Commit: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 14:43:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12dea5c0
x11-misc/light-locker: fix elogind patch, bug 687318
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Denis Dupeyron <calchan <AT> gentoo.org>
.../files/light-locker-1.9.0-elogind.patch | 132 +++++++++++++--------
....9.0-r1.ebuild => light-locker-1.9.0-r2.ebuild} | 0
2 files changed, 81 insertions(+), 51 deletions(-)
diff --git a/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
index 298e75844c4..aa630bd1fd2 100644
--- a/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
+++ b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
@@ -1,14 +1,15 @@
-From 76afbe0757d8846d76bfed350aa9c9e4242aef86 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron <calchan@gentoo.org>
-Date: Thu, 23 May 2019 13:52:12 -0600
-Subject: [PATCH] Port light-locker-1.8.0-elogind.patch
+From 0b5dbd25a21a16b93c371fd892b910969e4b2d58 Mon Sep 17 00:00:00 2001
+From: Robert Dyer <robert.dyer@sony.com>
+Date: Mon, 3 Jun 2019 22:17:08 -0500
+Subject: [PATCH] fix-up light-locker-1.9.0-elogind.patch
---
README.md | 2 ++
- configure.ac.in | 37 +++++++++++++++++++++++++++++++++++++
- src/gs-listener-dbus.c | 34 +++++++++++++++++++---------------
+ configure.ac.in | 39 ++++++++++++++++++++++++++++++++++++++-
+ src/Makefile.am | 4 +++-
+ src/gs-listener-dbus.c | 32 +++++++++++++++++---------------
src/light-locker.c | 6 ++++++
- 4 files changed, 64 insertions(+), 15 deletions(-)
+ 5 files changed, 66 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 86b66d0..b093a4f 100644
@@ -24,9 +25,18 @@ index 86b66d0..b093a4f 100644
--with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
diff --git a/configure.ac.in b/configure.ac.in
-index f95863a..5c92191 100644
+index 67c271b..2c0678f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
+@@ -408,7 +408,7 @@ if test "x$with_systemd" = "xauto" ; then
+ use_systemd=yes
+ fi
+ else
+- use_systemd=$with_systemd
++ use_systemd=$with_systemd
+ fi
+
+ if test "x$use_systemd" = "xyes"; then
@@ -421,6 +421,42 @@ fi
AC_SUBST(SYSTEMD_CFLAGS)
AC_SUBST(SYSTEMD_LIBS)
@@ -55,7 +65,7 @@ index f95863a..5c92191 100644
+ use_elogind=yes
+ fi
+else
-+ use_elogind=$with_elogind
++ use_elogind=$with_elogind
+fi
+
+if test "x$use_elogind" = "xyes"; then
@@ -74,89 +84,109 @@ index f95863a..5c92191 100644
Platform:
---------
systemd: ${use_systemd}
-+ elogind: ${use_elogind}
++ elogind: ${use_elogind}
UPower: ${use_upower}
Features:
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0fa4ef9..be6fb0d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
+ $(DBUS_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(SYSTEMD_CFLAGS) \
++ $(ELOGIND_CFLAGS) \
+ $(NULL)
+
+ bin_PROGRAMS = \
+@@ -90,7 +91,8 @@ light_locker_SOURCES = \
+ light_locker_LDADD = \
+ $(LIGHT_LOCKER_LIBS) \
+ $(SAVER_LIBS) \
+- $(SYSTEMD_LIBS) \
++ $(SYSTEMD_LIBS) \
++ $(ELOGIND_LIBS) \
+ $(NULL)
+
+ light_locker_LDFLAGS = -export-dynamic
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index 044a2bf..164856f 100644
+index 044a2bf..3ba476e 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
-@@ -43,6 +43,10 @@
+@@ -41,6 +41,8 @@
+
+ #ifdef WITH_SYSTEMD
#include <systemd/sd-login.h>
++#elif WITH_ELOGIND
++#include <elogind/systemd/sd-login.h>
#endif
-+#ifdef WITH_ELOGIND
-+#include <elogind/systemd/sd-login.h>
-+#endif
-+
#include "gs-listener-dbus.h"
- #include "gs-marshal.h"
- #include "gs-debug.h"
-@@ -78,7 +82,7 @@ struct GSListenerPrivate
+@@ -78,7 +80,7 @@ struct GSListenerPrivate
char *session_id;
char *seat_path;
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
gboolean have_systemd;
char *sd_session_id;
int delay_fd;
-@@ -134,7 +138,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
+@@ -134,7 +136,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
gs_debug ("Send switch greeter");
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
/* Compare with 0. On failure this will return < 0.
* In the later case we probably aren't using systemd.
*/
-@@ -175,7 +179,7 @@ gs_listener_send_lock_session (GSListener *listener)
+@@ -175,7 +177,7 @@ gs_listener_send_lock_session (GSListener *listener)
gs_debug ("Send lock session");
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
/* Compare with 0. On failure this will return < 0.
* In the later case we probably aren't using systemd.
*/
-@@ -359,7 +363,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+@@ -359,7 +361,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
gs_debug ("Send idle hint: %d", idle);
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
if (listener->priv->have_systemd) {
if (listener->priv->system_connection == NULL) {
-@@ -400,7 +404,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+@@ -400,7 +402,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
void
gs_listener_delay_suspend (GSListener *listener)
{
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
DBusMessage *message;
DBusMessage *reply;
DBusError error;
-@@ -473,7 +477,7 @@ gs_listener_delay_suspend (GSListener *listener)
+@@ -473,7 +475,7 @@ gs_listener_delay_suspend (GSListener *listener)
void
gs_listener_resume_suspend (GSListener *listener)
{
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
if (listener->priv->delay_fd >= 0) {
-@@ -1076,7 +1080,7 @@ _listener_message_path_is_our_session (GSListener *listener,
+@@ -1076,7 +1078,7 @@ _listener_message_path_is_our_session (GSListener *listener,
return FALSE;
}
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
static gboolean
query_session_active (GSListener *listener)
{
-@@ -1212,7 +1216,7 @@ query_lid_closed (GSListener *listener)
+@@ -1212,7 +1214,7 @@ query_lid_closed (GSListener *listener)
#endif
#endif
@@ -165,78 +195,78 @@ index 044a2bf..164856f 100644
static gboolean
properties_changed_match (DBusMessage *message,
const char *property)
-@@ -1307,7 +1311,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+@@ -1307,7 +1309,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
dbus_message_get_destination (message));
#endif
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
if (listener->priv->have_systemd) {
-@@ -1880,7 +1884,7 @@ gs_listener_acquire (GSListener *listener,
+@@ -1880,7 +1882,7 @@ gs_listener_acquire (GSListener *listener,
listener_dbus_system_filter_function,
listener,
NULL);
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
if (listener->priv->have_systemd) {
dbus_bus_add_match (listener->priv->system_connection,
"type='signal'"
-@@ -1971,7 +1975,7 @@ query_session_id (GSListener *listener)
+@@ -1971,7 +1973,7 @@ query_session_id (GSListener *listener)
dbus_error_init (&error);
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
if (listener->priv->have_systemd) {
dbus_uint32_t pid = getpid();
-@@ -2022,7 +2026,7 @@ query_session_id (GSListener *listener)
+@@ -2022,7 +2024,7 @@ query_session_id (GSListener *listener)
return NULL;
}
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
static char *
query_sd_session_id (GSListener *listener)
{
-@@ -2053,7 +2057,7 @@ init_session_id (GSListener *listener)
+@@ -2053,7 +2055,7 @@ init_session_id (GSListener *listener)
else
gs_debug ("Got session-id: %s", listener->priv->session_id);
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
g_free (listener->priv->sd_session_id);
listener->priv->sd_session_id = query_sd_session_id (listener);
if (listener->priv->sd_session_id == NULL)
-@@ -2150,7 +2154,7 @@ gs_listener_init (GSListener *listener)
+@@ -2150,7 +2152,7 @@ gs_listener_init (GSListener *listener)
{
listener->priv = GS_LISTENER_GET_PRIVATE (listener);
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
/* check if logind is running */
listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
listener->priv->delay_fd = -1;
-@@ -2179,7 +2183,7 @@ gs_listener_finalize (GObject *object)
+@@ -2179,7 +2181,7 @@ gs_listener_finalize (GObject *object)
g_free (listener->priv->session_id);
g_free (listener->priv->seat_path);
-#ifdef WITH_SYSTEMD
-+#ifdef WITH_SYSTEMD || defined(WITH_ELOGIND)
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
g_free (listener->priv->sd_session_id);
#endif
diff --git a/src/light-locker.c b/src/light-locker.c
-index aefc4c6..51ae519 100644
+index aefc4c6..612e300 100644
--- a/src/light-locker.c
+++ b/src/light-locker.c
@@ -139,6 +139,7 @@ main (int argc,
gs_debug ("Platform:\n"
"gtk: %d\n"
"systemd: %s\n"
-+ "elogind: %s"
++ "elogind: %s\n"
"UPower: %s",
GTK_MAJOR_VERSION,
#ifdef WITH_SYSTEMD
@@ -245,9 +275,9 @@ index aefc4c6..51ae519 100644
"no",
#endif
+#ifdef WITH_ELOGIND
-+ "yes"
++ "yes",
+#else
-+ "no"
++ "no",
+#endif
#ifdef WITH_UPOWER
"yes"
diff --git a/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
similarity index 100%
rename from x11-misc/light-locker/light-locker-1.9.0-r1.ebuild
rename to x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/light-locker/files/, x11-misc/light-locker/
@ 2020-10-06 19:35 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2020-10-06 19:35 UTC (permalink / raw
To: gentoo-commits
commit: d9f21e5b0de212546b422d3699901bb8ba9ea56e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 6 19:35:19 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Oct 6 19:35:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f21e5b
x11-misc/light-locker: Drop old
Old version referenced consolekit which is now removed from gentoo
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
x11-misc/light-locker/Manifest | 1 -
.../files/light-locker-1.8.0-elogind.patch | 257 ---------------------
x11-misc/light-locker/light-locker-1.8.0-r1.ebuild | 74 ------
x11-misc/light-locker/metadata.xml | 2 -
4 files changed, 334 deletions(-)
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index cef115de560..f39b02aeefc 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,2 +1 @@
-DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
diff --git a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch
deleted file mode 100644
index 511e730f434..00000000000
--- a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-diff --git a/README b/README
-index 330ec82..d16cc6b 100644
---- a/README
-+++ b/README
-@@ -34,6 +34,7 @@ Most of these configurations will be enabled automatically when their dependenci
- Here is a list of the different dependencies and there configuration flags:
- --with-gtk2: This decides between the Gtk+-3.0 and Gtk+-2.0 dependency.
- --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed.
-+ --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above.
- --with-console-kit: This adds the support for ConsoleKit.
- --with-upower: This adds the support for UPower.
- --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
-diff --git a/configure.ac.in b/configure.ac.in
-index 929befd..8639583 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -447,6 +447,42 @@ fi
- AC_SUBST(SYSTEMD_CFLAGS)
- AC_SUBST(SYSTEMD_LIBS)
-
-+dnl ---------------------------------------------------------------------------
-+dnl elogind
-+dnl ---------------------------------------------------------------------------
-+
-+AC_ARG_WITH(elogind,
-+ AS_HELP_STRING([--with-elogind],
-+ [Add elogind support]),
-+ [with_elogind=$withval], [with_elogind=auto])
-+
-+if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then
-+ AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind])
-+fi
-+
-+PKG_CHECK_MODULES(ELOGIND,
-+ [libelogind],
-+ [have_elogind=yes], [have_elogind=no])
-+
-+if test "x$with_elogind" = "xauto" ; then
-+ if test x$have_elogind = xno ; then
-+ use_elogind=no
-+ else
-+ use_elogind=yes
-+ fi
-+else
-+ use_elogind=$with_elogind
-+fi
-+
-+if test "x$use_elogind" = "xyes"; then
-+ if test "x$have_elogind" = "xno"; then
-+ AC_MSG_ERROR([Elogind support explicitly required, but elogind not found])
-+ fi
-+ AC_DEFINE(WITH_ELOGIND, 1, [elogind support])
-+fi
-+AC_SUBST(ELOGIND_CFLAGS)
-+AC_SUBST(ELOGIND_LIBS)
-+
- dnl ---------------------------------------------------------------------------
- dnl UPower
- dnl ---------------------------------------------------------------------------
-@@ -668,6 +704,7 @@ echo "
- systemd: ${use_systemd}
- ConsoleKit: ${use_console_kit}
- UPower: ${use_upower}
-+ elogind: ${use_elogind}
-
- Features:
- ---------
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0fa4ef9..7c6a46f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -90,7 +90,8 @@ light_locker_SOURCES = \
- light_locker_LDADD = \
- $(LIGHT_LOCKER_LIBS) \
- $(SAVER_LIBS) \
-- $(SYSTEMD_LIBS) \
-+ $(SYSTEMD_LIBS) \
-+ $(ELOGIND_LIBS) \
- $(NULL)
-
- light_locker_LDFLAGS = -export-dynamic
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index cab6a9e..8928cbf 100644
---- a/src/gs-listener-dbus.c
-+++ b/src/gs-listener-dbus.c
-@@ -47,6 +47,10 @@
- #include <systemd/sd-login.h>
- #endif
-
-+#ifdef WITH_ELOGIND
-+#include <elogind/systemd/sd-login.h>
-+#endif
-+
- #include "gs-listener-dbus.h"
- #include "gs-marshal.h"
- #include "gs-debug.h"
-@@ -82,7 +86,7 @@ struct GSListenerPrivate
- char *session_id;
- char *seat_path;
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- gboolean have_systemd;
- char *sd_session_id;
- int delay_fd;
-@@ -138,7 +142,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
-
- gs_debug ("Send switch greeter");
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- /* Compare with 0. On failure this will return < 0.
- * In the later case we probably aren't using systemd.
- */
-@@ -179,7 +183,7 @@ gs_listener_send_lock_session (GSListener *listener)
-
- gs_debug ("Send lock session");
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- /* Compare with 0. On failure this will return < 0.
- * In the later case we probably aren't using systemd.
- */
-@@ -363,7 +367,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
-
- gs_debug ("Send idle hint: %d", idle);
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- if (listener->priv->have_systemd) {
-
- if (listener->priv->system_connection == NULL) {
-@@ -436,7 +440,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
- void
- gs_listener_delay_suspend (GSListener *listener)
- {
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- DBusMessage *message;
- DBusMessage *reply;
- DBusError error;
-@@ -509,7 +513,7 @@ gs_listener_delay_suspend (GSListener *listener)
- void
- gs_listener_resume_suspend (GSListener *listener)
- {
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
-
- if (listener->priv->delay_fd >= 0) {
-@@ -1112,7 +1116,7 @@ _listener_message_path_is_our_session (GSListener *listener,
- return FALSE;
- }
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- static gboolean
- query_session_active (GSListener *listener)
- {
-@@ -1248,7 +1252,7 @@ query_lid_closed (GSListener *listener)
- #endif
- #endif
-
--#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
- static gboolean
- properties_changed_match (DBusMessage *message,
- const char *property)
-@@ -1343,7 +1347,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
- dbus_message_get_destination (message));
- #endif
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
-
- if (listener->priv->have_systemd) {
-
-@@ -1963,7 +1967,7 @@ gs_listener_acquire (GSListener *listener,
- listener_dbus_system_filter_function,
- listener,
- NULL);
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- if (listener->priv->have_systemd) {
- dbus_bus_add_match (listener->priv->system_connection,
- "type='signal'"
-@@ -2075,7 +2079,7 @@ query_session_id (GSListener *listener)
-
- dbus_error_init (&error);
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- if (listener->priv->have_systemd) {
- dbus_uint32_t pid = getpid();
-
-@@ -2164,7 +2168,7 @@ query_session_id (GSListener *listener)
- #endif
- }
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- static char *
- query_sd_session_id (GSListener *listener)
- {
-@@ -2192,7 +2196,7 @@ init_session_id (GSListener *listener)
- listener->priv->session_id = query_session_id (listener);
- gs_debug ("Got session-id: %s", listener->priv->session_id);
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- g_free (listener->priv->sd_session_id);
- listener->priv->sd_session_id = query_sd_session_id (listener);
- gs_debug ("Got sd-session-id: %s", listener->priv->sd_session_id);
-@@ -2284,7 +2288,7 @@ gs_listener_init (GSListener *listener)
- {
- listener->priv = GS_LISTENER_GET_PRIVATE (listener);
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- /* check if logind is running */
- listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
- listener->priv->delay_fd = -1;
-@@ -2313,7 +2317,7 @@ gs_listener_finalize (GObject *object)
- g_free (listener->priv->session_id);
- g_free (listener->priv->seat_path);
-
--#ifdef WITH_SYSTEMD
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
- g_free (listener->priv->sd_session_id);
- #endif
-
-diff --git a/src/light-locker.c b/src/light-locker.c
-index 264b033..79de29a 100644
---- a/src/light-locker.c
-+++ b/src/light-locker.c
-@@ -144,7 +144,8 @@ main (int argc,
- "gtk: %d\n"
- "systemd: %s\n"
- "ConsoleKit: %s\n"
-- "UPower: %s",
-+ "UPower: %s\n"
-+ "elogind: %s",
- GTK_MAJOR_VERSION,
- #ifdef WITH_SYSTEMD
- "yes",
-@@ -160,6 +161,11 @@ main (int argc,
- "yes"
- #else
- "no"
-+#endif
-+#ifdef WITH_ELOGIND
-+ "yes"
-+#else
-+ "no"
- #endif
- );
- gs_debug ("Features:\n"
diff --git a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
deleted file mode 100644
index 3421ccb6d2d..00000000000
--- a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="A simple locker using lightdm"
-HOMEPAGE="https://github.com/the-cavalry/light-locker"
-SRC_URI="https://github.com/the-cavalry/light-locker/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="consolekit +dpms elogind gtk3 +screensaver systemd +upower"
-
-BDEPEND="dev-lang/perl
- dev-perl/XML-Parser
- dev-util/intltool
- sys-devel/gettext"
-DEPEND="dev-libs/dbus-glib
- dev-libs/glib
- sys-apps/dbus
- x11-libs/cairo
- x11-libs/libX11
- x11-libs/pango
- x11-libs/libXxf86vm
- consolekit? ( sys-auth/consolekit )
- dpms? ( x11-libs/libXext )
- elogind? ( sys-auth/elogind )
- !gtk3? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- screensaver? ( x11-libs/libXScrnSaver )
- systemd? ( sys-apps/systemd )
- upower? ( sys-power/upower )"
-RDEPEND="${DEPEND}
- x11-misc/lightdm"
-
-REQUIRED_USE="?? ( consolekit elogind systemd )"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-PATCHES=(
- "${FILESDIR}/${PN}-${PV}-elogind.patch"
-)
-
-src_prepare() {
- default
- # remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf
- sed -si -e "/XDT_I18N/d" configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with consolekit console-kit)
- $(use_with dpms dpms-ext)
- $(use_with !gtk3 gtk2)
- $(use_with screensaver x)
- $(use_with screensaver mit-ext)
- $(use_with systemd)
- $(use_with elogind)
- $(use_with upower)
- )
- econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/x11-misc/light-locker/metadata.xml b/x11-misc/light-locker/metadata.xml
index 3b85524b066..610b2ccac31 100644
--- a/x11-misc/light-locker/metadata.xml
+++ b/x11-misc/light-locker/metadata.xml
@@ -6,9 +6,7 @@
<name>Denis Dupeyron</name>
</maintainer>
<use>
- <flag name="consolekit">Keep track of the various users, sessions, and seats present on the system.</flag>
<flag name="dpms">Turn on the display on screensaver deactivation.</flag>
- <flag name="gtk3">Build with GTK+ 3 instead of GTK+ 2.</flag>
<flag name="screensaver">Lock the screen on screensaver activation.</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-06 19:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-31 22:15 [gentoo-commits] repo/gentoo:master commit in: x11-misc/light-locker/files/, x11-misc/light-locker/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-05-24 3:57 Denis Dupeyron
2019-06-10 14:44 Denis Dupeyron
2020-10-06 19:35 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox