Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/nxserver-freenx/nxserver-freenx-0.5.0-xorg71.patch

    Annotation of /trunk/nxserver-freenx/nxserver-freenx-0.5.0-xorg71.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 113 - (hide annotations) (download)
    Sun Mar 18 15:42:37 2007 UTC (17 years, 2 months ago) by niro
    File size: 2774 byte(s) 
    xorg-71 fixes
    1 niro 113 diff -Naur freenx-0.5.0/node.conf.sample freenx-0.5.0-xorg71/node.conf.sample
    2     --- freenx-0.5.0/node.conf.sample 2006-07-01 19:03:39.000000000 +0200
    3     +++ freenx-0.5.0-xorg71/node.conf.sample 2007-03-18 16:21:27.000000000 +0100
    4     @@ -293,10 +293,10 @@
    5     # session will be run.
    6     # Depending on distribution USER_X_STARTUP_SCRIPT might be .Xclients, .xinitrc
    7     # and .Xsession
    8     -# Depending on distribution DEFAULT_X_SESSION might be /etc/X11/xdm/Xsession,
    9     -# /etc/X11/Sessions/Xsession or /etc/X11/xinit/xinitrc
    10     +# Depending on distribution DEFAULT_X_SESSION might be /usr/lib/X11/xdm/Xsession,
    11     +# /etc/X11/xdm/Xsession, /etc/X11/Sessions/Xsession or /etc/X11/xinit/xinitrc
    12     #USER_X_STARTUP_SCRIPT=.Xclients
    13     -#DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
    14     +#DEFAULT_X_SESSION=/usr/lib/X11/xdm/Xsession
    15    
    16     # The key that contains the name of the script that starts a KDE session.
    17     # It's run when a 'unix-kde' session is requested by the client.
    18     @@ -317,7 +317,7 @@
    19    
    20     # The key that contains the name of the complete path of command name
    21     # 'xauth'.
    22     -#COMMAND_XAUTH=/usr/X11R6/bin/xauth
    23     +#COMMAND_XAUTH=/usr/bin/xauth
    24    
    25     # The key that contains the name of the complete path of command name
    26     # 'smbmount'.
    27     @@ -378,7 +378,7 @@
    28     # for examples of useful parameters.
    29     #AGENT_EXTRA_OPTIONS_RFB=""
    30     #AGENT_EXTRA_OPTIONS_RDP=""
    31     -#AGENT_EXTRA_OPTIONS_X=""
    32     +#AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
    33    
    34     # The number of seconds we wait for the nxagent to start before
    35     # deciding startup has failed
    36     diff -Naur freenx-0.5.0/nxclient freenx-0.5.0-xorg71/nxclient
    37     --- freenx-0.5.0/nxclient 2005-08-02 19:49:08.000000000 +0200
    38     +++ freenx-0.5.0-xorg71/nxclient 2007-03-18 16:11:12.000000000 +0100
    39     @@ -60,7 +60,7 @@
    40     else
    41     dialog_interface="xmessage"
    42     xmessage=$(which xmessage 2>/dev/null)
    43     - [ -z "$xmessage" ] && xmessage="/usr/X11R6/bin/xmessage"
    44     + [ -z "$xmessage" ] && xmessage="/usr/bin/xmessage"
    45     fi
    46    
    47     #
    48     diff -Naur freenx-0.5.0/nxloadconfig freenx-0.5.0-xorg71/nxloadconfig
    49     --- freenx-0.5.0/nxloadconfig 2006-07-01 19:03:39.000000000 +0200
    50     +++ freenx-0.5.0-xorg71/nxloadconfig 2007-03-18 16:19:55.000000000 +0100
    51     @@ -156,12 +156,12 @@
    52     DEFAULT_X_WM=""
    53     KILL_DEFAULT_X_WM="1"
    54     USER_X_STARTUP_SCRIPT=.Xclients
    55     -DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
    56     +DEFAULT_X_SESSION=/usr/lib/X11/xdm/Xsession
    57     COMMAND_START_KDE=startkde
    58     COMMAND_START_GNOME=gnome-session
    59     COMMAND_START_CDE=cdwm
    60     COMMAND_XTERM=xterm
    61     -COMMAND_XAUTH=/usr/X11R6/bin/xauth
    62     +COMMAND_XAUTH=/usr/bin/xauth
    63     COMMAND_SMBMOUNT=smbmount
    64     COMMAND_SMBUMOUNT=smbumount
    65     COMMAND_NETCAT=netcat
    66     @@ -184,7 +184,7 @@
    67     COMMAND_SESSREG="sessreg"
    68     AGENT_EXTRA_OPTIONS_RFB=""
    69     AGENT_EXTRA_OPTIONS_RDP=""
    70     -AGENT_EXTRA_OPTIONS_X=""
    71     +AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
    72     AGENT_STARTUP_TIMEOUT="60"
    73     AGENT_FONT_SERVER=""
    74     PROXY_TCP_NODELAY=""