Magellan Linux

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

    Annotation of /trunk/nxserver-freenx/patches/nxserver-freenx-0.7.1-xorg71.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 382 - (hide annotations) (download)
    Thu Oct 18 23:42:38 2007 UTC (16 years, 7 months ago) by niro
    File size: 2805 byte(s) 
    -rediffed against 0.7.1
    1 niro 382 diff -Naur freenx-0.7.1/node.conf.sample freenx-0.7.1-magellan/node.conf.sample
    2     --- freenx-0.7.1/node.conf.sample 2007-10-15 00:25:14.000000000 +0200
    3     +++ freenx-0.7.1-magellan/node.conf.sample 2007-10-19 01:33:03.000000000 +0200
    4     @@ -370,10 +370,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     @@ -394,7 +394,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     @@ -476,7 +476,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.7.1/nxdialog freenx-0.7.1-magellan/nxdialog
    37     --- freenx-0.7.1/nxdialog 2007-10-15 00:25:14.000000000 +0200
    38     +++ freenx-0.7.1-magellan/nxdialog 2007-10-19 01:36:03.000000000 +0200
    39     @@ -107,7 +107,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.7.1/nxloadconfig freenx-0.7.1-magellan/nxloadconfig
    49     --- freenx-0.7.1/nxloadconfig 2007-10-15 00:25:14.000000000 +0200
    50     +++ freenx-0.7.1-magellan/nxloadconfig 2007-10-19 01:35:39.000000000 +0200
    51     @@ -171,12 +171,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_SMBMOUNT_CIFS=/sbin/mount.cifs
    66     @@ -205,7 +205,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=""