diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-04-20 13:16:14 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-04-20 13:16:14 +0000 |
| commit | 478268bc347886f3201ea38a1c491cd229a576f2 (patch) | |
| tree | 3398a3e293731a0b3feb27c88334baae04a7c4f6 /net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch | |
| parent | Moved in portage (x2goserver left for the additional ldap deps) (diff) | |
| download | nx-478268bc347886f3201ea38a1c491cd229a576f2.tar.gz nx-478268bc347886f3201ea38a1c491cd229a576f2.tar.bz2 nx-478268bc347886f3201ea38a1c491cd229a576f2.zip | |
WIP updated ebuild for freenx:
* change recommanded nxsetup option
* remove arts/esd/cups configuration (does not work well, let the user do it)
* drop some misc fonts from dependencies
svn path=/testing/; revision=224
Diffstat (limited to 'net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch')
| -rw-r--r-- | net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch new file mode 100644 index 0000000..21a3326 --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch @@ -0,0 +1,43 @@ +--- nxloadconfig.orig 2009-03-12 18:29:22.000000000 +0100 ++++ nxloadconfig 2009-03-12 18:29:53.000000000 +0100 +@@ -58,7 +58,7 @@ + # Where can different nx components be found + NX_DIR=/usr + PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys +-PATH_LIB=$NX_DIR/lib ++PATH_LIB=$NX_DIR/lib/NX/lib + NX_ETC_DIR=/etc/nxserver + NX_SESS_DIR=/var/lib/nxserver/db + NX_HOME_DIR=/var/lib/nxserver/home +@@ -194,11 +194,11 @@ + KILL_DEFAULT_X_WM="1" + BOOTSTRAP_X_SESSION="0" + USER_X_STARTUP_SCRIPT=.Xclients +-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession ++DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession + COMMAND_GDM_X_SESSION="/etc/gdm/Xsession custom" + if [ ! -x "$COMMAND_GDM_X_SESSION" ] + then +- COMMAND_GDM_X_SESSION="/etc/X11/Xsession" ++ COMMAND_GDM_X_SESSION="/etc/X11/Sessions/Xsession" + fi + COMMAND_START_KDE=startkde + COMMAND_START_GNOME=gnome-session +@@ -224,7 +224,7 @@ + COMMAND_NXSHADOWACL="$PATH_BIN/nxshadowacl" + COMMAND_NXACL="$PATH_BIN/nxacl" + COMMAND_NXCHECKLOAD="$PATH_BIN/nxcheckload" +-COMMAND_NXAGENT="$PATH_BIN/nxagent" ++COMMAND_NXAGENT="REAL_PATH_LIB/nxagent" + + # Guest directives + ENABLE_GUEST_LOGIN="0" +@@ -357,7 +357,7 @@ + [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB + [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB + [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB +-[ -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" ++[ -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" + + NX_BACKEND_VERSION=$(strings $COMMAND_NXAGENT 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') + |