diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-10 07:27:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-10 07:27:51 +0000 |
| commit | eba605f37f1699651614dd9e6c3a4bf333c1b20a (patch) | |
| tree | a480f7cd6a20db34c6fdf9936e89f371ef1c3f50 /xfce-base | |
| parent | Version bump. (diff) | |
| download | gentoo-2-eba605f37f1699651614dd9e6c3a4bf333c1b20a.tar.gz gentoo-2-eba605f37f1699651614dd9e6c3a4bf333c1b20a.tar.bz2 gentoo-2-eba605f37f1699651614dd9e6c3a4bf333c1b20a.zip | |
Run ck-launch-session again to restore functionality with Thunar disk handling wrt upstream #6690.
(Portage version: 2.2_rc78/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/xfce-utils/ChangeLog | 8 | ||||
| -rw-r--r-- | xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch | 31 | ||||
| -rw-r--r-- | xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild | 7 |
3 files changed, 43 insertions, 3 deletions
diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog index 82dac3bb8b1a..cf2796156916 100644 --- a/xfce-base/xfce-utils/ChangeLog +++ b/xfce-base/xfce-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for xfce-base/xfce-utils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.161 2010/09/09 12:31:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.162 2010/09/10 07:27:51 ssuominen Exp $ + + 10 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce-utils-4.7.0.ebuild, + +files/xfce-utils-4.7.0-ck-launch-session-2.patch: + Run ck-launch-session again to restore functionality with Thunar disk + handling wrt upstream #6690. 09 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> xfce-utils-4.7.0.ebuild, +files/xfce-utils-4.7.0-ck-launch-session.patch: diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch b/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch new file mode 100644 index 000000000000..c446cda18e48 --- /dev/null +++ b/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch @@ -0,0 +1,31 @@ +From ad0a04125051a4638a31e6e0c2d1dc711676e1ef Mon Sep 17 00:00:00 2001 +From: Mike Massonnet <mmassonnet@xfce.org> +Date: Wed, 8 Sep 2010 22:01:50 +0200 +Subject: [PATCH] Launch xfce4-session with ck-launch-session and dbus-launch. + +Makes shutdown/reboot and mount/unmount work for gvfs when login through +a tty. +--- + scripts/xinitrc.in.in | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in +index 2bd43ec..241d00f 100755 +--- a/scripts/xinitrc.in.in ++++ b/scripts/xinitrc.in.in +@@ -196,7 +196,11 @@ fi + + # Run xfce4-session if installed + if which xfce4-session >/dev/null 2>&1; then +- xfce4-session ++ if test -z "$XDG_SESSION_COOKIE" -a x"`which ck-launch-session 2>/dev/null`" != x""; then ++ ck-launch-session dbus-launch --sh-syntax --exit-with-session xfce4-session ++ else ++ xfce4-session ++ fi + + if test "$ssh_agent_kill_cmd"; then + echo "running '$ssh_agent_kill_cmd'" +-- +1.7.2.3 + diff --git a/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild b/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild index f1eedd591081..53a3397dd41f 100644 --- a/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild +++ b/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild,v 1.5 2010/09/09 12:31:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild,v 1.6 2010/09/10 07:27:51 ssuominen Exp $ EAPI=3 inherit xfconf @@ -33,7 +33,10 @@ DEPEND="${RDEPEND} sys-devel/gettext" pkg_setup() { - PATCHES=( "${FILESDIR}"/${P}-ck-launch-session.patch ) + PATCHES=( + "${FILESDIR}"/${P}-ck-launch-session.patch + "${FILESDIR}"/${P}-ck-launch-session-2.patch + ) XFCONF="--docdir=${EPREFIX}/usr/share/doc/${PF} --disable-dependency-tracking $(use_enable dbus) |