From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- x11-misc/light-locker/Manifest | 4 +- .../files/light-locker-1.9.0-elogind.patch | 132 +++++++++++++-------- x11-misc/light-locker/light-locker-1.9.0-r1.ebuild | 72 ----------- x11-misc/light-locker/light-locker-1.9.0-r2.ebuild | 72 +++++++++++ 4 files changed, 155 insertions(+), 125 deletions(-) delete mode 100644 x11-misc/light-locker/light-locker-1.9.0-r1.ebuild create mode 100644 x11-misc/light-locker/light-locker-1.9.0-r2.ebuild (limited to 'x11-misc/light-locker') diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest index ed4c397773a9..96825a635028 100644 --- a/x11-misc/light-locker/Manifest +++ b/x11-misc/light-locker/Manifest @@ -1,7 +1,7 @@ AUX light-locker-1.8.0-elogind.patch 9190 BLAKE2B c60e166a853aaee5de2ffcbb708dd0f1b25b9fc5e2ec9a862bce2c0cd8b90928b0ceb4dae2a46e9ce3f41f9665911abaebccd9a73a9cb09c9c113788de60845e SHA512 a837a458d4d221ad4a009d2461c927168f64a3f50ef5484c0aca26913477d35cd0799605d66b8b4876b7530c7c604720fe95783576c658bd6e84b5867df1ef8e -AUX light-locker-1.9.0-elogind.patch 8835 BLAKE2B ce54ca7d649d1cf88b5d6bf650a53885b023e3ca2c6b62c69a604d8c90e6a939372fd501af4a0beef2aa2a2daba88a353aea015f2446ab3e0ee5b9f6308fbbf1 SHA512 b46c09913d30127c9ce3df890b2308d9897020915960e17d36b732d6194dc269ae69f17afc4f1cc56f807c0e251a05c3b483f8baf28e8bd4820721192a9f0121 +AUX light-locker-1.9.0-elogind.patch 9704 BLAKE2B ead5c1767ac6772477e977bc57bb63392080be397a094dabbf4f4ac779b274f27f045447609c7ce39c6a1602dd2d046d84eff21688e1e4c98c29376e579b7830 SHA512 580a32670e63979691cd1a2102f49e4af23677f4bff1c597c6a87196235844fd1ba3c8d30e148f83b99466a77908f3204e35b57bb01c25fef949e0e3e37cf2f2 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 EBUILD light-locker-1.8.0-r1.ebuild 1617 BLAKE2B 340b6658d7bbe2567a4d0786476b77d3979f0aae1c0d9a6c3fe5ce798d7c8aa30d7e0fc97688ed0ade1785c1707f768ddd57402a8e2bf2a946f529da44183505 SHA512 186ae4504e45b0b6f4914e93c009ef7c2cc954cff6632c91a2d3b6ebc81aaef099340e67a59292e1adfd4d7fb68be672f9bc9ad550f464e6e4f9e8c39cd66a55 -EBUILD light-locker-1.9.0-r1.ebuild 1565 BLAKE2B c30a4b419691d87823ec2c9876ffa5c51d48701c714e582ca80a89ff8db08bef7d585d20771f2d1809c127d9a37008888924256854d3eccfee10e53d9a7eb151 SHA512 2725cc37c34e81beca17d2db2679e92b15783c654fc779fe32cc4abc1842a1c9c7a49f6f8c01e9f535ee3b352497da42461b840529fe8542c704db76e8956a7f +EBUILD light-locker-1.9.0-r2.ebuild 1565 BLAKE2B c30a4b419691d87823ec2c9876ffa5c51d48701c714e582ca80a89ff8db08bef7d585d20771f2d1809c127d9a37008888924256854d3eccfee10e53d9a7eb151 SHA512 2725cc37c34e81beca17d2db2679e92b15783c654fc779fe32cc4abc1842a1c9c7a49f6f8c01e9f535ee3b352497da42461b840529fe8542c704db76e8956a7f MISC metadata.xml 698 BLAKE2B a8f5e435f66bea6fab128e600e4bfce575c819c2de03c141e9d5ba72880dc58017fce9e4355d700c01d441c4eec56d19f0f2ec8d27027700decedc685a8a2d38 SHA512 583d1108a9be5b71a9e3867b60b20dba60a1c999fe7a27634456b9102af8193dc22e6b7a5410c520f5aa13482a290d4e6cf6bdcde070788fd7ce8d2b74ece144 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 298e75844c4b..aa630bd1fd28 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 -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 +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 ++#elif WITH_ELOGIND ++#include #endif -+#ifdef WITH_ELOGIND -+#include -+#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-r1.ebuild deleted file mode 100644 index 34e6e91e705d..000000000000 --- a/x11-misc/light-locker/light-locker-1.9.0-r1.ebuild +++ /dev/null @@ -1,72 +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}/archive/v${PV}.tar.gz -> ${P}.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 -} diff --git a/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild new file mode 100644 index 000000000000..34e6e91e705d --- /dev/null +++ b/x11-misc/light-locker/light-locker-1.9.0-r2.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 -> ${P}.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 +} -- cgit v1.2.3