diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-11-30 04:05:12 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-11-30 04:05:12 +0800 |
commit | a3b5135851621cb514e7708d11f9dc82f851ea5c (patch) | |
tree | b2b32cc424aeb8dc4d13263958511bf8ca92bc34 /x11/gdm/files/patch-data_Xsession.in | |
parent | 095098375dd5bb1d27d533ffc7dc27305e105c95 (diff) | |
download | marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.gz marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.bz2 marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.lz marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.xz marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.zst marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.zip |
Remove these ports now that they are in the ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13266 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files/patch-data_Xsession.in')
-rw-r--r-- | x11/gdm/files/patch-data_Xsession.in | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/x11/gdm/files/patch-data_Xsession.in b/x11/gdm/files/patch-data_Xsession.in deleted file mode 100644 index 894c97d16..000000000 --- a/x11/gdm/files/patch-data_Xsession.in +++ /dev/null @@ -1,39 +0,0 @@ ---- data/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400 -+++ data/Xsession.in 2008-06-09 01:29:59.000000000 -0400 -@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then - fi - fi - -+is_gnome=0 -+if [ "x$command" = "xgnome-session" ]; then -+ is_gnome=1 -+fi -+ -+# add seahorse-agent if found -+if [ ${is_gnome} = 1 ]; then -+ seahorseagent="`gdmwhich seahorse-agent`" -+ if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then -+ command="dbus-launch --exit-with-session $seahorseagent --execute $command" -+ elif [ -z "$seahorseagent" ] ; then -+ echo "$0: seahorse-agent not found!" -+ fi -+fi -+ - # add ssh-agent if found --sshagent="`gdmwhich ssh-agent`" --if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then -- command="$sshagent -- $command" --elif [ -z "$sshagent" ] ; then -- echo "$0: ssh-agent not found!" -+# ssh-agent functionality is handled by gnome-keyring-daemon which is launched -+# from gnome-session -+if [ ${is_gnome} != 1 ]; then -+ sshagent="`gdmwhich ssh-agent`" -+ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then -+ command="$sshagent -- $command" -+ elif [ -z "$sshagent" ] ; then -+ echo "$0: ssh-agent not found!" -+ fi - fi - - echo "$0: Setup done, will execute: $command" |