Magellan Linux

Contents of /trunk/nxserver-freenx/patches/nxserver-freenx-0.5.0-nx2-backend-4.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 151 - (show annotations) (download)
Tue May 8 20:26:14 2007 UTC (17 years ago) by niro
File size: 3064 byte(s)
-moved to patches subdir

1 diff -Naur freenx-0.5.0.orig/node.conf.sample freenx-0.5.0/node.conf.sample
2 --- freenx-0.5.0.orig/node.conf.sample 2007-01-03 19:35:41.000000000 +0100
3 +++ freenx-0.5.0/node.conf.sample 2007-01-03 19:37:28.000000000 +0100
4 @@ -346,7 +346,7 @@
5 #########################################################################
6
7 # When you installed a 2.0.0 NX Backend, set this to 1.
8 -#ENABLE_2_0_0_BACKEND="0"
9 +#ENABLE_2_0_0_BACKEND="1"
10
11 # When set to 1 this will automatically resume started sessions
12 #ENABLE_AUTORECONNECT="0"
13 diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
14 --- freenx-0.5.0.orig/nxloadconfig 2007-01-03 19:35:41.000000000 +0100
15 +++ freenx-0.5.0/nxloadconfig 2007-01-03 19:37:15.000000000 +0100
16 @@ -173,7 +173,7 @@
17
18 # Misc directives
19
20 -ENABLE_2_0_0_BACKEND="0"
21 +ENABLE_2_0_0_BACKEND="1"
22 ENABLE_AUTORECONNECT="0"
23 ENABLE_AUTORECONNECT_BEFORE_140="1"
24 EXPORT_USERIP="0"
25 diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
26 --- freenx-0.5.0.orig/nxloadconfig 2007-01-03 21:25:11.000000000 +0100
27 +++ freenx-0.5.0/nxloadconfig 2007-01-03 21:26:23.000000000 +0100
28 @@ -511,8 +511,9 @@
29 [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
30 ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
31
32 - [ -z "$(strings $PATH_BIN/nxagent | grep 'NXAGENT - Version 1.5.0')" ] && \
33 - ERROR="yes" && echo "Error: Could not find 1.5.0 version string in nxagent. NX 1.5.0 backend is needed for this version of FreeNX."
34 + # disabled, nxagent is a wrapper
35 + #[ -z "$(strings $PATH_BIN/nxagent | grep 'NXAGENT - Version 1.5.0')" ] && \
36 + # ERROR="yes" && echo "Error: Could not find 1.5.0 version string in nxagent. NX 1.5.0 backend is needed for this version of FreeNX."
37
38 [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
39 ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
40 diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
41 --- freenx-0.5.0.orig/nxloadconfig 2007-01-03 23:11:32.000000000 +0100
42 +++ freenx-0.5.0/nxloadconfig 2007-01-03 23:12:04.000000000 +0100
43 @@ -265,7 +265,7 @@
44 [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
45 [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
46 [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
47 -[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so.1:$APPLICATION_LIBRARY_PATH/libXcompext.so.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
48 +[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so.2:$APPLICATION_LIBRARY_PATH/libXcompext.so.2:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
49
50 [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
51 [ -z "$KDE_PRINTRC" -a -z "$KDEHOME" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"