[Pkg-xfce-commits] r8047 - in /desktop/branches/experimental/xfce4-session/debian: changelog control patches/02_runtime-logind-support.patch patches/series rules
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Wed Nov 6 18:28:18 UTC 2013
Author: mrpouit-guest
Date: Wed Nov 6 18:28:18 2013
New Revision: 8047
URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8047
Log:
* Check for logind support at runtime:
- debian/patches/02_runtime-logind-support.patch: added.
- debian/rules:
+ call xdt-autogen after patching
+ clean up autogenerated files modified by xdt-autogen.
- debian/control:
+ add build-dep on libpolkit-gobject-1-dev.
+ add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
after patching.
+ don't recommend consolekit anymore.
* debian/control: update my email address.
Added:
desktop/branches/experimental/xfce4-session/debian/patches/02_runtime-logind-support.patch
Modified:
desktop/branches/experimental/xfce4-session/debian/changelog
desktop/branches/experimental/xfce4-session/debian/control
desktop/branches/experimental/xfce4-session/debian/patches/series
desktop/branches/experimental/xfce4-session/debian/rules
Modified: desktop/branches/experimental/xfce4-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-session/debian/changelog?rev=8047&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog (original)
+++ desktop/branches/experimental/xfce4-session/debian/changelog Wed Nov 6 18:28:18 2013
@@ -1,3 +1,19 @@
+xfce4-session (4.10.1-4) UNRELEASED; urgency=low
+
+ * Check for logind support at runtime:
+ - debian/patches/02_runtime-logind-support.patch: added.
+ - debian/rules:
+ + call xdt-autogen after patching
+ + clean up autogenerated files modified by xdt-autogen.
+ - debian/control:
+ + add build-dep on libpolkit-gobject-1-dev.
+ + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
+ after patching.
+ + don't recommend consolekit anymore.
+ * debian/control: update my email address.
+
+ -- Lionel Le Folgoc <lionel at lefolgoc.net> Wed, 06 Nov 2013 19:06:25 +0100
+
xfce4-session (4.10.1-3) unstable; urgency=low
[ Jackson Doak ]
Modified: desktop/branches/experimental/xfce4-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-session/debian/control?rev=8047&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-session/debian/control (original)
+++ desktop/branches/experimental/xfce4-session/debian/control Wed Nov 6 18:28:18 2013
@@ -2,12 +2,12 @@
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <lionel at lefolgoc.net>
Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl,
libdbus-1-dev, libdbus-glib-1-dev, libxfce4util-dev (>= 4.10.0),
libxfce4ui-1-dev (>= 4.10.0), libwnck-dev, x11-xserver-utils,
libxfconf-0-dev (>= 4.10.0), libglade2-dev, intltool (>= 0.31),
- dpkg-dev (>= 1.16.1)
+ libpolkit-gobject-1-dev, xfce4-dev-tools, libtool, dpkg-dev (>= 1.16.1)
Standards-Version: 3.9.4
Homepage: http://www.xfce.org/
Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
@@ -20,7 +20,7 @@
Replaces: xfce4-utils
Pre-Depends: ${misc:Pre-Depends}, multiarch-support
Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings (>= 4.10.0), xfconf
-Recommends: xfwm4, xfdesktop4, consolekit, upower, dbus-x11, x11-xserver-utils,
+Recommends: xfwm4, xfdesktop4, upower, dbus-x11, x11-xserver-utils,
xscreensaver
Suggests: sudo, fortunes-mod
Provides: x-session-manager
Added: desktop/branches/experimental/xfce4-session/debian/patches/02_runtime-logind-support.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-session/debian/patches/02_runtime-logind-support.patch?rev=8047&op=file
==============================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/02_runtime-logind-support.patch (added)
+++ desktop/branches/experimental/xfce4-session/debian/patches/02_runtime-logind-support.patch Wed Nov 6 18:28:18 2013
@@ -0,0 +1,394 @@
+Description: Add runtime logind support
+Bug-Ubuntu: https://bugs.launchpad.net/xfce4-session/+bug/1178373
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9952
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10076
+Origin: other, https://bugzilla.xfce.org/attachment.cgi?id=5117
+
+--- xfce4-session-4.10.1.orig/configure.ac
++++ xfce4-session-4.10.1/configure.ac
+@@ -103,7 +103,7 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0
+
+ dnl Check for polkit / systemd integration
+ XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100],
+- [systemd], [Systemd support (through polit)])
++ [systemd], [Systemd support (through polkit)])
+
+ dnl Check for debugging support
+ XDT_FEATURE_DEBUG([xfsm_debug_default])
+@@ -207,10 +207,10 @@ echo " * Legacy session management:
+ else
+ echo " * Legacy session management: no"
+ fi
+-if test x"$GNOME_KEYRING_FOUND" = x"yes"; then
+-echo " * Gnome Keyring support: yes"
++if test x"$SYSTEMD_FOUND" = x"yes"; then
++echo " * Systemd support (through polkit): yes"
+ else
+-echo " * Gnome Keyring support: no"
++echo " * Systemd support (through polkit): no"
+ fi
+
+ echo
+--- xfce4-session-4.10.1.orig/xfce4-session/Makefile.am
++++ xfce4-session-4.10.1/xfce4-session/Makefile.am
+@@ -38,6 +38,8 @@ xfce4_session_SOURCES = \
+ xfsm-compat-gnome.h \
+ xfsm-compat-kde.c \
+ xfsm-compat-kde.h \
++ xfsm-consolekit.c \
++ xfsm-consolekit.h \
+ xfsm-dns.c \
+ xfsm-dns.h \
+ xfsm-error.c \
+@@ -67,10 +69,6 @@ if HAVE_SYSTEMD
+ xfce4_session_SOURCES += \
+ xfsm-systemd.c \
+ xfsm-systemd.h
+-else
+-xfce4_session_SOURCES += \
+- xfsm-consolekit.c \
+- xfsm-consolekit.h
+ endif
+
+ xfce4_session_CFLAGS = \
+--- xfce4-session-4.10.1.orig/xfce4-session/xfsm-shutdown.c
++++ xfce4-session-4.10.1/xfce4-session/xfsm-shutdown.c
+@@ -63,6 +63,7 @@
+ #include <xfce4-session/xfsm-shutdown.h>
+ #include <xfce4-session/xfsm-compat-gnome.h>
+ #include <xfce4-session/xfsm-compat-kde.h>
++#include <xfce4-session/xfsm-consolekit.h>
+ #include <xfce4-session/xfsm-fadeout.h>
+ #include <xfce4-session/xfsm-global.h>
+ #include <xfce4-session/xfsm-legacy.h>
+@@ -70,8 +71,6 @@
+
+ #ifdef HAVE_SYSTEMD
+ #include <xfce4-session/xfsm-systemd.h>
+-#else
+-#include <xfce4-session/xfsm-consolekit.h>
+ #endif
+
+ static void xfsm_shutdown_finalize (GObject *object);
+@@ -98,9 +97,8 @@ struct _XfsmShutdown
+
+ #ifdef HAVE_SYSTEMD
+ XfsmSystemd *systemd;
+-#else
+- XfsmConsolekit *consolekit;
+ #endif
++ XfsmConsolekit *consolekit;
+ XfsmUPower *upower;
+
+ /* kiosk settings */
+@@ -139,10 +137,14 @@ xfsm_shutdown_init (XfsmShutdown *shutdo
+ XfceKiosk *kiosk;
+
+ #ifdef HAVE_SYSTEMD
+- shutdown->systemd = xfsm_systemd_get ();
+-#else
+- shutdown->consolekit = xfsm_consolekit_get ();
++ shutdown->consolekit = NULL;
++ shutdown->systemd = NULL;
++ if (LOGIND_RUNNING())
++ shutdown->systemd = xfsm_systemd_get ();
++ else
+ #endif
++ shutdown->consolekit = xfsm_consolekit_get ();
++
+ shutdown->upower = xfsm_upower_get ();
+ shutdown->helper_state = SUDO_NOT_INITIAZED;
+ shutdown->helper_require_password = FALSE;
+@@ -162,10 +164,11 @@ xfsm_shutdown_finalize (GObject *object)
+ XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
+
+ #ifdef HAVE_SYSTEMD
+- g_object_unref (G_OBJECT (shutdown->systemd));
+-#else
+- g_object_unref (G_OBJECT (shutdown->consolekit));
++ if (shutdown->systemd != NULL)
++ g_object_unref (G_OBJECT (shutdown->systemd));
+ #endif
++ if (shutdown->consolekit != NULL)
++ g_object_unref (G_OBJECT (shutdown->consolekit));
+ g_object_unref (G_OBJECT (shutdown->upower));
+
+ /* close down helper */
+@@ -657,10 +660,11 @@ xfsm_shutdown_try_restart (XfsmShutdown
+ return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
+ else
+ #ifdef HAVE_SYSTEMD
+- return xfsm_systemd_try_restart (shutdown->systemd, error);
+-#else
+- return xfsm_consolekit_try_restart (shutdown->consolekit, error);
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_restart (shutdown->systemd, error);
++ else
+ #endif
++ return xfsm_consolekit_try_restart (shutdown->consolekit, error);
+ }
+
+
+@@ -678,10 +682,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown
+ return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
+ else
+ #ifdef HAVE_SYSTEMD
+- return xfsm_systemd_try_shutdown (shutdown->systemd, error);
+-#else
+- return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_shutdown (shutdown->systemd, error);
++ else
+ #endif
++ return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
+ }
+
+
+@@ -692,6 +697,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown
+ {
+ g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_suspend (shutdown->systemd, error);
++ else
++#endif
+ return xfsm_upower_try_suspend (shutdown->upower, error);
+ }
+
+@@ -703,6 +713,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdow
+ {
+ g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_try_hibernate (shutdown->systemd, error);
++ else
++#endif
+ return xfsm_upower_try_hibernate (shutdown->upower, error);
+ }
+
+@@ -722,10 +737,14 @@ xfsm_shutdown_can_restart (XfsmShutdown
+ }
+
+ #ifdef HAVE_SYSTEMD
+- if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error))
+-#else
+- if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
++ if (shutdown->systemd != NULL)
++ {
++ if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error))
++ return TRUE;
++ }
++ else
+ #endif
++ if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
+ return TRUE;
+
+ if (xfsm_shutdown_sudo_init (shutdown, error))
+@@ -753,10 +772,14 @@ xfsm_shutdown_can_shutdown (XfsmShutdown
+ }
+
+ #ifdef HAVE_SYSTEMD
+- if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error))
+-#else
+- if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
++ if (shutdown->systemd != NULL)
++ {
++ if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error))
++ return TRUE;
++ }
++ else
+ #endif
++ if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
+ return TRUE;
+
+ if (xfsm_shutdown_sudo_init (shutdown, error))
+@@ -784,6 +807,12 @@ xfsm_shutdown_can_suspend (XfsmShutdown
+ return TRUE;
+ }
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_can_suspend (shutdown->systemd, can_suspend,
++ auth_suspend, error);
++ else
++#endif
+ return xfsm_upower_can_suspend (shutdown->upower, can_suspend,
+ auth_suspend, error);
+ }
+@@ -804,6 +833,12 @@ xfsm_shutdown_can_hibernate (XfsmShutdow
+ return TRUE;
+ }
+
++#ifdef HAVE_SYSTEMD
++ if (shutdown->systemd != NULL)
++ return xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate,
++ auth_hibernate, error);
++ else
++#endif
+ return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
+ auth_hibernate, error);
+ }
+--- xfce4-session-4.10.1.orig/xfce4-session/xfsm-systemd.c
++++ xfce4-session-4.10.1/xfce4-session/xfsm-systemd.c
+@@ -24,6 +24,7 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
++#include <libxfsm/xfsm-util.h>
+ #include <xfce4-session/xfsm-systemd.h>
+
+
+@@ -33,8 +34,12 @@
+ #define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
+ #define SYSTEMD_REBOOT_ACTION "Reboot"
+ #define SYSTEMD_POWEROFF_ACTION "PowerOff"
++#define SYSTEMD_SUSPEND_ACTION "Suspend"
++#define SYSTEMD_HIBERNATE_ACTION "Hibernate"
+ #define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot"
+ #define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off"
++#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend"
++#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate"
+
+
+
+@@ -93,6 +98,22 @@ xfsm_systemd_finalize (GObject *object)
+ }
+
+
++
++static gboolean
++xfsm_systemd_lock_screen (GError **error)
++{
++ XfconfChannel *channel;
++ gboolean ret = TRUE;
++
++ channel = xfsm_open_config ();
++ if (xfconf_channel_get_bool (channel, "/shutdown/LockScreen", FALSE))
++ ret = g_spawn_command_line_async ("xflock4", error);
++
++ return ret;
++}
++
++
++
+ static gboolean
+ xfsm_systemd_can_method (XfsmSystemd *systemd,
+ gboolean *can_method,
+@@ -205,6 +226,34 @@ xfsm_systemd_try_shutdown (XfsmSystemd
+
+
+ gboolean
++xfsm_systemd_try_suspend (XfsmSystemd *systemd,
++ GError **error)
++{
++ if (!xfsm_systemd_lock_screen (error))
++ return FALSE;
++
++ return xfsm_systemd_try_method (systemd,
++ SYSTEMD_SUSPEND_ACTION,
++ error);
++}
++
++
++
++gboolean
++xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
++ GError **error)
++{
++ if (!xfsm_systemd_lock_screen (error))
++ return FALSE;
++
++ return xfsm_systemd_try_method (systemd,
++ SYSTEMD_HIBERNATE_ACTION,
++ error);
++}
++
++
++
++gboolean
+ xfsm_systemd_can_restart (XfsmSystemd *systemd,
+ gboolean *can_restart,
+ GError **error)
+@@ -227,3 +276,39 @@ xfsm_systemd_can_shutdown (XfsmSystemd
+ SYSTEMD_POWEROFF_TEST,
+ error);
+ }
++
++
++
++gboolean
++xfsm_systemd_can_suspend (XfsmSystemd *systemd,
++ gboolean *can_suspend,
++ gboolean *auth_suspend,
++ GError **error)
++{
++ gboolean ret = FALSE;
++
++ ret = xfsm_systemd_can_method (systemd,
++ can_suspend,
++ SYSTEMD_SUSPEND_TEST,
++ error);
++ *auth_suspend = *can_suspend;
++ return ret;
++}
++
++
++
++gboolean
++xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
++ gboolean *can_hibernate,
++ gboolean *auth_hibernate,
++ GError **error)
++{
++ gboolean ret = FALSE;
++
++ ret = xfsm_systemd_can_method (systemd,
++ can_hibernate,
++ SYSTEMD_HIBERNATE_TEST,
++ error);
++ *auth_hibernate = *can_hibernate;
++ return ret;
++}
+--- xfce4-session-4.10.1.orig/xfce4-session/xfsm-systemd.h
++++ xfce4-session-4.10.1/xfce4-session/xfsm-systemd.h
+@@ -22,6 +22,8 @@
+ #ifndef __XFSM_SYSTEMD_H__
+ #define __XFSM_SYSTEMD_H__
+
++#define LOGIND_RUNNING() (access ("/run/systemd/seats/", F_OK) >= 0)
++
+ typedef struct _XfsmSystemdClass XfsmSystemdClass;
+ typedef struct _XfsmSystemd XfsmSystemd;
+
+@@ -42,6 +44,12 @@ gboolean xfsm_systemd_try_restart (
+ gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
+ GError **error);
+
++gboolean xfsm_systemd_try_suspend (XfsmSystemd *systemd,
++ GError **error);
++
++gboolean xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
++ GError **error);
++
+ gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd,
+ gboolean *can_restart,
+ GError **error);
+@@ -50,6 +58,16 @@ gboolean xfsm_systemd_can_shutdown (
+ gboolean *can_shutdown,
+ GError **error);
+
++gboolean xfsm_systemd_can_suspend (XfsmSystemd *systemd,
++ gboolean *can_suspend,
++ gboolean *auth_suspend,
++ GError **error);
++
++gboolean xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
++ gboolean *can_hibernate,
++ gboolean *auth_hibernate,
++ GError **error);
++
+ G_END_DECLS
+
+ #endif /* __XFSM_SYSTEMD_H__ */
Modified: desktop/branches/experimental/xfce4-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-session/debian/patches/series?rev=8047&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/series (original)
+++ desktop/branches/experimental/xfce4-session/debian/patches/series Wed Nov 6 18:28:18 2013
@@ -1 +1,2 @@
01_fix-xrdb-call.patch
+02_runtime-logind-support.patch
Modified: desktop/branches/experimental/xfce4-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-session/debian/rules?rev=8047&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules (original)
+++ desktop/branches/experimental/xfce4-session/debian/rules Wed Nov 6 18:28:18 2013
@@ -11,7 +11,13 @@
dh_strip --dbg-package=xfce4-session-dbg
override_dh_auto_configure:
+ NOCONFIGURE=1 xdt-autogen
dh_auto_configure -- --disable-silent-rules
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f $$(find -name 'Makefile.in*') INSTALL ltmain.sh depcomp
+ rm -f aclocal.m4 config.guess config.h.in config.sub configure
%:
dh $@ --parallel
More information about the Pkg-xfce-commits
mailing list