diffstat for xfce4-session-4.12.1 xfce4-session-4.12.1 changelog | 6 control | 6 patches/0001-Add-DesktopNames-to-.desktop-file.patch | 25 - patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch | 34 - patches/02_add-light-locker-to-xflock4.patch | 10 patches/03_runtime-logind-support.patch | 394 ---------------- 6 files changed, 9 insertions(+), 466 deletions(-) diff -Nru xfce4-session-4.12.1/debian/changelog xfce4-session-4.12.1/debian/changelog --- xfce4-session-4.12.1/debian/changelog 2015-05-16 08:26:58.000000000 +0000 +++ xfce4-session-4.12.1/debian/changelog 2015-07-06 20:50:26.000000000 +0000 @@ -1,3 +1,9 @@ +xfce4-session (4.12.1-3+devuan1) unstable; urgency=medium + + * Removed the libpam-systemd recommendation + + -- Dima Krasner Mon, 06 Jul 2015 23:28:44 +0300 + xfce4-session (4.12.1-3) unstable; urgency=medium * debian/rules: diff -Nru xfce4-session-4.12.1/debian/control xfce4-session-4.12.1/debian/control --- xfce4-session-4.12.1/debian/control 2015-05-12 18:42:31.000000000 +0000 +++ xfce4-session-4.12.1/debian/control 2015-07-06 20:50:26.000000000 +0000 @@ -1,8 +1,8 @@ Source: xfce4-session Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers -Uploaders: Yves-Alexis Perez , Lionel Le Folgoc +Maintainer: Dima Krasner +Uploaders: Dima Krasner 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.12.1), libwnck-dev, x11-xserver-utils, @@ -21,7 +21,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, libpam-systemd [linux-any], systemd-shim | systemd-sysv [linux-any], upower, dbus-x11, x11-xserver-utils, +Recommends: xfwm4, xfdesktop4, upower, dbus-x11, x11-xserver-utils, xscreensaver Suggests: sudo, fortunes-mod, pm-utils Provides: x-session-manager diff -Nru xfce4-session-4.12.1/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch xfce4-session-4.12.1/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch --- xfce4-session-4.12.1/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch 2014-10-20 20:59:02.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/0001-Add-DesktopNames-to-.desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From 860aea2d6686e9dcf0359a6dfab3ccdb9caf34c3 Mon Sep 17 00:00:00 2001 -From: Eric Koegel -Date: Mon, 20 Oct 2014 17:04:32 +0300 -Subject: [PATCH] Add DesktopNames to .desktop file - -GDM looks for a DesktopNames property added in the desktop file -to set the XDG_CURRENT_DESKTOP env variable with. See -https://bugzilla.gnome.org/show_bug.cgi?id=727546 -Thanks to Guido Berhoerster for pointing this out. ---- - xfce.desktop.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xfce.desktop.in b/xfce.desktop.in -index f4d6926..58fb274 100644 ---- a/xfce.desktop.in -+++ b/xfce.desktop.in -@@ -5,3 +5,4 @@ _Comment=Use this session to run Xfce as your desktop environment - Exec=startxfce4 - Icon= - Type=Application -+DesktopNames=XFCE --- -2.1.1 - diff -Nru xfce4-session-4.12.1/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch xfce4-session-4.12.1/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch --- xfce4-session-4.12.1/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch 2014-10-20 20:59:02.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From 4daf68ebb6991194848756ff4f05a3ed736118bb Mon Sep 17 00:00:00 2001 -From: Eric Koegel -Date: Mon, 20 Oct 2014 08:17:13 +0300 -Subject: [PATCH] Export XDG_CURRENT_DESKTOP (Bug #11239) - -We already have been using XDG_CURRENT_DESKTOP in things such as -garcon and other libraries but xfce4-session hasn't been setting -it if it was left unset. This is now used by things like QT5 for -theme decorations. Patch provided in: -https://forum.manjaro.org/index.php?topic=13728 ---- - scripts/xinitrc.in.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in -index c67232e..b234407 100755 ---- a/scripts/xinitrc.in.in -+++ b/scripts/xinitrc.in.in -@@ -22,6 +22,12 @@ if test "x$DESKTOP_SESSION" = "x"; then - export DESKTOP_SESSION - fi - -+# set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme -+if test "x$XDG_CURRENT_DESKTOP" = "x"; then -+ XDG_CURRENT_DESKTOP="XFCE" -+ export XDG_CURRENT_DESKTOP -+fi -+ - # $XDG_CONFIG_HOME defines the base directory relative to which user specific - # configuration files should be stored. If $XDG_CONFIG_HOME is either not set - # or empty, a default equal to $HOME/.config should be used. --- -2.1.1 - diff -Nru xfce4-session-4.12.1/debian/patches/02_add-light-locker-to-xflock4.patch xfce4-session-4.12.1/debian/patches/02_add-light-locker-to-xflock4.patch --- xfce4-session-4.12.1/debian/patches/02_add-light-locker-to-xflock4.patch 2014-08-16 10:32:20.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/02_add-light-locker-to-xflock4.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- a/scripts/xflock4 -+++ b/scripts/xflock4 -@@ -27,6 +27,7 @@ export PATH - # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running - for lock_cmd in \ - "xscreensaver-command -lock" \ -+ "light-locker-command --lock" \ - "gnome-screensaver-command --lock" - do - $lock_cmd >/dev/null 2>&1 && exit diff -Nru xfce4-session-4.12.1/debian/patches/03_runtime-logind-support.patch xfce4-session-4.12.1/debian/patches/03_runtime-logind-support.patch --- xfce4-session-4.12.1/debian/patches/03_runtime-logind-support.patch 2014-07-15 22:01:14.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/03_runtime-logind-support.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,394 +0,0 @@ -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 - #include - #include -+#include - #include - #include - #include -@@ -70,8 +71,6 @@ - - #ifdef HAVE_SYSTEMD - #include --#else --#include - #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 - #include - -+#include - #include - - -@@ -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__ */