[Pkg-xfce-commits] r6331 - in desktop/branches/experimental/xfce4-session/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sat Jan 21 11:08:53 UTC 2012
Author: mrpouit-guest
Date: 2012-01-21 23:08:52 +0000 (Sat, 21 Jan 2012)
New Revision: 6331
Added:
desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch
Modified:
desktop/branches/experimental/xfce4-session/debian/changelog
desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch
desktop/branches/experimental/xfce4-session/debian/patches/series
desktop/branches/experimental/xfce4-session/debian/prerm
Log:
rebased on trunk
Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog 2012-01-21 19:27:19 UTC (rev 6330)
+++ desktop/branches/experimental/xfce4-session/debian/changelog 2012-01-21 23:08:52 UTC (rev 6331)
@@ -1,4 +1,4 @@
-xfce4-session (4.8.2-2~exp1) UNRELEASED; urgency=low
+xfce4-session (4.8.2-3~exp1) UNRELEASED; urgency=low
* debian/patches:
- 05_force-xfsettingsd-start.patch: updated for xfce4-settings 4.9.0
@@ -9,6 +9,30 @@
-- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 10 Sep 2011 15:00:26 +0200
+xfce4-session (4.8.2-3) unstable; urgency=low
+
+ * debian/prerm:
+ - don't remove the x-session-manager alternative on upgrades.
+ closes: #653834
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 02 Jan 2012 07:57:30 +0100
+
+xfce4-session (4.8.2-2) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/patches:
+ - 04_fix-missing-lm refreshed (cherry-pick the upstream one).
+
+ [ Lionel Le Folgoc ]
+ * debian/patches:
+ - 03_respect-save-settings-logout-plugin.patch: added, let the logout panel
+ plugin respect the '/general/SaveOnExit' xfconf key. closes: #651842
+ - 04_fix-missing-lm.patch: fix to apply cleanly (configure.in.in doesn't
+ exist).
+ - series: updated.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 20 Dec 2011 15:51:07 +0100
+
xfce4-session (4.8.2-1) unstable; urgency=low
* New upstream release.
Added: desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch (rev 0)
+++ desktop/branches/experimental/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch 2012-01-21 23:08:52 UTC (rev 6331)
@@ -0,0 +1,72 @@
+From d7311f2dcedd96f5833acceb27f9d17275893e1e Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <lionel at lefolgoc.net>
+Date: Thu, 25 Aug 2011 14:22:24 +0200
+Subject: Do not always save session with xfce4-logout-plugin (Bug #7915)
+
+Respect the value of the "/general/SaveOnExit" option from xfce4-session in the
+logout panel plugin as well.
+---
+ panel-plugin/Makefile.am | 2 ++
+ panel-plugin/xfsm-logout-plugin.c | 14 +++++++++++++-
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 0675e2e..fd0609b 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -18,6 +18,7 @@ libxfsm_logout_plugin_la_SOURCES = \
+ libxfsm_logout_plugin_la_CFLAGS = \
+ $(LIBX11_CFLAGS) \
+ $(LIBXFCE4PANEL_CFLAGS) \
++ $(XFCONF_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
+ $(GTK_CFLAGS) \
+@@ -26,6 +27,7 @@ libxfsm_logout_plugin_la_CFLAGS = \
+ libxfsm_logout_plugin_la_LIBADD = \
+ $(LIBX11_LIBS) \
+ $(LIBXFCE4PANEL_LIBS) \
++ $(XFCONF_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(LIBXFCE4UI_LIBS) \
+ $(GTK_LIBS) \
+diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
+index b8e25ab..12dec0f 100644
+--- a/panel-plugin/xfsm-logout-plugin.c
++++ b/panel-plugin/xfsm-logout-plugin.c
+@@ -43,6 +43,7 @@
+
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4ui/libxfce4ui.h>
++#include <xfconf/xfconf.h>
+ #include <libxfce4panel/libxfce4panel.h>
+
+ #include "xfsm-logout-plugin-ui.h"
+@@ -207,12 +208,23 @@ static void
+ xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
+ XfsmShutdownType type)
+ {
++ GError *error = NULL;
++ XfconfChannel *channel;
+ gint resp = GTK_RESPONSE_ACCEPT;
+
+ g_return_if_fail(logout_plugin != NULL);
+ g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
+
+- logout_plugin->allow_save = TRUE;
++ if (G_UNLIKELY (!xfconf_init (&error))) {
++ g_warning ("Unable to contact settings server: %s", error->message);
++ g_error_free (error);
++ logout_plugin->allow_save = TRUE;
++ }
++ else {
++ channel = xfconf_channel_get ("xfce4-session");
++ logout_plugin->allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
++ xfconf_shutdown ();
++ }
+
+ if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
+ GtkWidget *dialog, *topvbox, *hbox, *image, *label;
+--
+1.7.2.5
+
Modified: desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch 2012-01-21 19:27:19 UTC (rev 6330)
+++ desktop/branches/experimental/xfce4-session/debian/patches/04_fix-missing-lm.patch 2012-01-21 23:08:52 UTC (rev 6331)
@@ -1,12 +1,42 @@
-Index: xfce4-session-4.8.2/engines/balou/Makefile.am
-===================================================================
---- xfce4-session-4.8.2.orig/engines/balou/Makefile.am 2011-09-13 18:17:10.000000000 +0200
-+++ xfce4-session-4.8.2/engines/balou/Makefile.am 2011-09-13 23:21:51.910831369 +0200
-@@ -29,6 +29,7 @@
- -module
+commit eeaea26d3b777afb98c21317ad83170e3f725fd0
+Author: Brian J. Tarricone <brian at tarricone.org>
+Date: Mon Sep 26 01:18:48 2011 -0700
+
+ explicitly link to libm where needed (bug #7953)
+
+ we use rint() but aren't linking to libm; probably getting picked up
+ implicitly by a dependency like libpng, which recently dropped that flag
+ from its .pc file.
+
+ Patch slightly updated for Debian to apply cleanly: changes to configure.in.in
+ are made to configure.in instead.
+
+diff --git a/configure.in b/configure.in
+index 141d427..8eff947 100644
+--- a/configure.in
++++ b/configure.in
+@@ -63,6 +63,10 @@ AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \
+ AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \
+ sigaction strdup sync vfork])
++dnl Check for required libraries
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl Check for X11 installed
+ XDT_CHECK_LIBX11_REQUIRE()
+
+diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
+index 96ae5c5..d049a35 100644
+--- a/engines/balou/Makefile.am
++++ b/engines/balou/Makefile.am
+@@ -31,7 +31,8 @@ libbalou_la_LDFLAGS = \
libbalou_la_LIBADD = \
-+ -lm \
$(top_builddir)/libxfsm/libxfsm-4.6.la \
$(LIBXFCE4UI_LIBS) \
- $(XFCONF_LIBS)
+- $(XFCONF_LIBS)
++ $(XFCONF_LIBS) \
++ $(LIBM)
+
+
+ libbalou_la_DEPENDENCIES = \
Modified: desktop/branches/experimental/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/series 2012-01-21 19:27:19 UTC (rev 6330)
+++ desktop/branches/experimental/xfce4-session/debian/patches/series 2012-01-21 23:08:52 UTC (rev 6331)
@@ -1,4 +1,5 @@
02_fix-fortune-path.patch
+03_respect-save-settings-logout-plugin.patch
04_fix-missing-lm.patch
05_force-xfsettingsd-start.patch
06_no-settings-helper-in-490.patch
Modified: desktop/branches/experimental/xfce4-session/debian/prerm
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/prerm 2012-01-21 19:27:19 UTC (rev 6330)
+++ desktop/branches/experimental/xfce4-session/debian/prerm 2012-01-21 23:08:52 UTC (rev 6331)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
+if [ "$1" = "remove" ]; then
update-alternatives --remove x-session-manager /usr/bin/xfce4-session
fi
More information about the Pkg-xfce-commits
mailing list