casta
/
portage
1
Fork 0
Code Issues Pull Requests Releases Activity

now in tree

This commit is contained in:
Guillaume Castagnino 2019-03-30 11:07:25 +01:00
parent 55f465a8bb
commit 710b04be66
4 changed files with 0 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11-misc/light-locker/Manifest
View File

@ -1,4 +0,0 @@
AUX light-locker-1.8.0-elogind.patch 9190 BLAKE2B c60e166a853aaee5de2ffcbb708dd0f1b25b9fc5e2ec9a862bce2c0cd8b90928b0ceb4dae2a46e9ce3f41f9665911abaebccd9a73a9cb09c9c113788de60845e SHA512 a837a458d4d221ad4a009d2461c927168f64a3f50ef5484c0aca26913477d35cd0799605d66b8b4876b7530c7c604720fe95783576c658bd6e84b5867df1ef8e
DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
EBUILD light-locker-1.8.0-r1.ebuild 1630 BLAKE2B fa633cbbbfddc0ae5f6000132c92a46ca43878930efce48fd5729a47fb937d98cf389996f3c29505b339c24640bbb345f6d375ab09779dd0891b45b2eb0875b4 SHA512 8395b5e97d6988766d16fd63619bc6eea374216aabdb8e15e5c0d8c239872051c29d5ffea11ef48ed73aa5d95ca6ff2f934c2b37947ae128a765750f99e96712
MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144

257
x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch
View File

@ -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"

75
x11-misc/light-locker/light-locker-1.8.0-r1.ebuild
View File

@ -1,75 +0,0 @@
# 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}/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
eapply_user
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
}

17
x11-misc/light-locker/metadata.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>calchan@gentoo.org</email>
<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>
<remote-id type="github">the-cavalry/light-locker</remote-id>
</upstream>
</pkgmetadata>