[arch-commits] Commit in xorg-xdm/repos (2 files)

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 13:39:17
  Author: jgc
Revision: 3236

Merged revisions 3206-3235 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-xdm/trunk

........
  r3235 | jgc | 2008-06-21 17:38:59 +0000 (Sat, 21 Jun 2008) | 2 lines
  
  Add missing patch
........

Added:
  xorg-xdm/repos/extra-x86_64/Xsession-loginshell.patch
    (from rev 3235, xorg-xdm/trunk/Xsession-loginshell.patch)
Modified:
  xorg-xdm/repos/extra-x86_64/	(properties)

---------------------------+
 Xsession-loginshell.patch |   15 +++++++++++++++
 1 file changed, 15 insertions(+)


Property changes on: xorg-xdm/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-xdm/trunk:1-3205
   + /xorg-xdm/trunk:1-3235

Copied: xorg-xdm/repos/extra-x86_64/Xsession-loginshell.patch (from rev 3235, xorg-xdm/trunk/Xsession-loginshell.patch)
===================================================================
--- extra-x86_64/Xsession-loginshell.patch	                        (rev 0)
+++ extra-x86_64/Xsession-loginshell.patch	2008-06-21 17:39:17 UTC (rev 3236)
@@ -0,0 +1,15 @@
+--- config/Xsession.cpp.orig	2008-06-21 13:57:36.000000000 +0000
++++ config/Xsession.cpp	2008-06-21 14:01:25.000000000 +0000
+@@ -56,11 +56,7 @@
+ resources=$HOME/.Xresources
+ 
+ if [ -s "$startup" ]; then
+-	if [ -x "$startup" ]; then
+-		exec "$startup"
+-	else
+-		exec /bin/sh "$startup"
+-	fi
++	exec /bin/sh -ls -c "$startup"
+ else
+ 	if [ -r "$resources" ]; then
+ 		BINDIR/xrdb -load "$resources"