Fix Hibernate and Suspend wrt upstream #6817.

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

3 files changed, 90 insertions, 1 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 85b7e0fcc060..a35279c3df34 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.122 2010/11/08 19:30:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.123 2010/11/12 20:50:57 ssuominen Exp $
+
+*xfce4-session-4.7.1-r2 (12 Nov 2010)
+
+  12 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-session-4.7.1-r2.ebuild,
+  +files/xfce4-session-4.7.1-stop_using_subject_cookie.patch:
+  Fix Hibernate and Suspend wrt upstream #6817.
 
 *xfce4-session-4.7.1-r1 (08 Nov 2010)
 
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.7.1-stop_using_subject_cookie.patch b/xfce-base/xfce4-session/files/xfce4-session-4.7.1-stop_using_subject_cookie.patch
new file mode 100644
index 000000000000..ea856314ffee
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.7.1-stop_using_subject_cookie.patch
@@ -0,0 +1,31 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6817
+
+--- xfce4-session/xfsm-shutdown-helper.c
++++ xfce4-session/xfsm-shutdown-helper.c
+@@ -335,7 +335,7 @@
+   const gchar *consolekit_cookie;
+ #endif
+   GValue hash_elem = { 0 };
+-  gboolean subject_created = FALSE;
++//  gboolean subject_created = FALSE;
+ 
+   helper->polkit_proxy =
+     dbus_g_proxy_new_for_name (helper->system_bus,
+@@ -394,7 +394,7 @@
+               g_hash_table_insert (helper->polkit_subject_hash, g_strdup ("session-id"), &val);
+ 
+               g_free (consolekit_session);
+-              subject_created = TRUE;
++              //subject_created = TRUE;
+             }
+           else if (error)
+             {
+@@ -410,7 +410,7 @@
+    * We failed to get valid session data, then we try
+    * to check authentication using the pid.
+    **/
+-  if (subject_created == FALSE)
++  //if (subject_created == FALSE)
+     {
+       gint pid;
+       guint64 start_time;
diff --git a/xfce-base/xfce4-session/xfce4-session-4.7.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.7.1-r2.ebuild
new file mode 100644
index 000000000000..bf2010dca609
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.7.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.7.1-r2.ebuild,v 1.1 2010/11/12 20:50:57 ssuominen Exp $
+
+EAPI=3
+inherit xfconf
+
+DESCRIPTION="Session manager for Xfce4"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.7/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug gnome gnome-keyring +xfce_plugins_logout"
+
+RDEPEND=">=dev-libs/dbus-glib-0.73
+	x11-apps/iceauth
+	x11-libs/libSM
+	>=x11-libs/libwnck-2.22
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.7
+	>=xfce-base/libxfce4ui-4.7
+	>=xfce-base/xfconf-4.7
+	>=xfce-base/xfce-utils-4.7
+	gnome? ( gnome-base/gconf )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.7.2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-fix_logout_with_sudo.patch
+		"${FILESDIR}"/${P}-stop_using_subject_cookie.patch
+		)
+
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-dependency-tracking
+		--disable-static
+		$(use_enable xfce_plugins_logout panel-plugin)
+		$(use_enable gnome)
+		$(use_enable gnome-keyring libgnome-keyring)
+		$(xfconf_use_debug)
+		)
+
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+}