Fri Mar 13 08:34:19 2009 UTC ()
cpp does not find tokens inside quotes, so remove the quotes so that
the search/replace can happen properly.
this was already fixed in upstream sources (Hi David!), reference:
http://cgit.freedesktop.org/xorg/app/xdm/commit/?id=b73d0c91d32bf0aa60aa5ce2bbbd4468ce21a445
(plunky)
diff -r1.1.1.1 -r1.2 xsrc/external/mit/xdm/dist/config/Xreset.cpp
diff -r1.1.1.1 -r1.2 xsrc/external/mit/xdm/dist/config/Xstartup.cpp
--- xsrc/external/mit/xdm/dist/config/Attic/Xreset.cpp 2008/07/30 04:15:20 1.1.1.1
+++ xsrc/external/mit/xdm/dist/config/Attic/Xreset.cpp 2009/03/13 08:34:19 1.2
| @@ -1,5 +1,5 @@ | | | @@ -1,5 +1,5 @@ |
1 | XCOMM!/bin/sh | | 1 | XCOMM!/bin/sh |
2 | XCOMM Deregister a login. (Derived from TakeConsole as follows:) | | 2 | XCOMM Deregister a login. (Derived from TakeConsole as follows:) |
3 | XCOMM | | 3 | XCOMM |
4 | BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ | | 4 | BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ |
5 | -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER | | 5 | -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER |
--- xsrc/external/mit/xdm/dist/config/Attic/Xstartup.cpp 2008/07/30 04:15:20 1.1.1.1
+++ xsrc/external/mit/xdm/dist/config/Attic/Xstartup.cpp 2009/03/13 08:34:19 1.2
| @@ -1,5 +1,5 @@ | | | @@ -1,5 +1,5 @@ |
1 | XCOMM!/bin/sh | | 1 | XCOMM!/bin/sh |
2 | XCOMM Register a login (derived from GiveConsole as follows:) | | 2 | XCOMM Register a login (derived from GiveConsole as follows:) |
3 | XCOMM | | 3 | XCOMM |
4 | BINDIR/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ | | 4 | BINDIR/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ |
5 | -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER | | 5 | -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER |