| 1 |
voyageur 08/08/22 13:04:54 |
| 2 |
|
| 3 |
Added: nxserver-freenx-0.7.3-nxloadconfig.patch |
| 4 |
Removed: nxserver-freenx-0.7.0-nx3support.patch |
| 5 |
nxserver-freenx-0.7.0-xfsfonts.patch |
| 6 |
nxserver-freenx-0.7.0-kdecups.patch |
| 7 |
nxserver-freenx-0.6.0-nxloadconfig.patch |
| 8 |
Log: |
| 9 |
Version bump, remove old 0.7.0 |
| 10 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r4 x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3-nxloadconfig.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: nxserver-freenx-0.7.3-nxloadconfig.patch |
| 19 |
=================================================================== |
| 20 |
--- nxloadconfig.orig 2008-08-22 02:44:43.000000000 +0200 |
| 21 |
+++ nxloadconfig 2008-08-22 14:29:30.000000000 +0200 |
| 22 |
@@ -58,7 +58,8 @@ |
| 23 |
# Where can different nx components be found |
| 24 |
NX_DIR=/usr |
| 25 |
PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys |
| 26 |
-PATH_LIB=$NX_DIR/lib |
| 27 |
+REAL_PATH_BIN=$NX_DIR/lib/NX/bin |
| 28 |
+PATH_LIB=$NX_DIR/lib/NX/lib |
| 29 |
NX_ETC_DIR=/etc/nxserver |
| 30 |
NX_SESS_DIR=/var/lib/nxserver/db |
| 31 |
NX_HOME_DIR=/var/lib/nxserver/home |
| 32 |
@@ -185,7 +186,7 @@ |
| 33 |
DEFAULT_X_WM="" |
| 34 |
KILL_DEFAULT_X_WM="1" |
| 35 |
USER_X_STARTUP_SCRIPT=.Xclients |
| 36 |
-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession |
| 37 |
+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession |
| 38 |
COMMAND_START_KDE=startkde |
| 39 |
COMMAND_START_GNOME=gnome-session |
| 40 |
COMMAND_START_CDE=cdwm |
| 41 |
@@ -315,9 +316,9 @@ |
| 42 |
[ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB |
| 43 |
[ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB |
| 44 |
[ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB |
| 45 |
-[ -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:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" |
| 46 |
+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so" |
| 47 |
|
| 48 |
-NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') |
| 49 |
+NX_BACKEND_VERSION=$(strings $REAL_PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') |
| 50 |
|
| 51 |
[ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend |
| 52 |
|
| 53 |
@@ -354,7 +355,7 @@ |
| 54 |
ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\"" |
| 55 |
# Check for NX agents ... |
| 56 |
|
| 57 |
- [ ! -x "$PATH_BIN/nxagent" ] && \ |
| 58 |
+ [ ! -x "$REAL_PATH_BIN/nxagent" ] && \ |
| 59 |
ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components." |
| 60 |
|
| 61 |
if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ] |
| 62 |
@@ -606,7 +607,7 @@ |
| 63 |
[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \ |
| 64 |
ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\"" |
| 65 |
|
| 66 |
- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ |
| 67 |
+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ |
| 68 |
WARNING="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX." |
| 69 |
|
| 70 |
[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ |
Archives