[gentoo-commits] gentoo-x86 commit in net-misc/nxserver-freenx/files: nxserver-freenx-0.7.2-cups.patch nxserver-freenx-0.7.2-nxloadconfig.patch

[gentoo-commits] gentoo-x86 commit in net-misc/nxserver-freenx/files: nxserver-freenx-0.7.2-cups.patch nxserver-freenx-0.7.2-nxloadconfig.patch

[Bernard Cafarelli (voyageur)]

voyageur    08/03/18 23:42:40

  Added:                nxserver-freenx-0.7.2-cups.patch
                        nxserver-freenx-0.7.2-nxloadconfig.patch
  Log:
  New version
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch?rev=1.1&content-type=text/plain

Index: nxserver-freenx-0.7.2-cups.patch
===================================================================
diff -Naur freenx-0.7.1.orig/node.conf.sample freenx-0.7.1/node.conf.sample
--- freenx-0.7.1.orig/node.conf.sample	2007-10-31 13:47:45.000000000 +0100
+++ freenx-0.7.1/node.conf.sample	2007-10-31 13:48:35.000000000 +0100
@@ -319,12 +319,12 @@
 # of available ppd drivers via the $COMMAND_FOOMATIC command.
 
 #ENABLE_FOOMATIC="1"
-#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+#COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile"
 
 # CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS 
 # installation.
 
-#CUPS_BACKEND="/usr/lib/cups/backend"
+#CUPS_BACKEND="/usr/libexec/cups/backend"
 #CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
 #CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
 #CUPS_ETC="/etc/cups"
diff -Naur freenx-0.7.1.orig/nxloadconfig freenx-0.7.1/nxloadconfig
--- freenx-0.7.1.orig/nxloadconfig	2007-10-31 13:47:45.000000000 +0100
+++ freenx-0.7.1/nxloadconfig	2007-10-31 13:48:43.000000000 +0100
@@ -155,9 +155,9 @@
 ENABLE_CUPS_SEAMLESS="0"
 CUPS_SEAMLESS_DELAY="10"
 ENABLE_FOOMATIC="1"
-COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile"
+COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile"
 
-CUPS_BACKEND="/usr/lib/cups/backend"
+CUPS_BACKEND="/usr/libexec/cups/backend"
 CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp"
 CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
 CUPS_ETC="/etc/cups/"



1.1                  net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nxloadconfig.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nxloadconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-nxloadconfig.patch?rev=1.1&content-type=text/plain

Index: nxserver-freenx-0.7.2-nxloadconfig.patch
===================================================================
diff -Naur freenx-server-0.7.2.orig/nxloadconfig freenx-server-0.7.2/nxloadconfig
--- freenx-server-0.7.2.orig/nxloadconfig	2008-03-19 00:26:08.000000000 +0100
+++ freenx-server-0.7.2/nxloadconfig	2008-03-19 00:27:44.000000000 +0100
@@ -58,7 +58,8 @@
 # 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
+REAL_PATH_BIN=$NX_DIR/lib/NX/bin
+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
@@ -179,7 +180,7 @@
 DEFAULT_X_WM=""
 KILL_DEFAULT_X_WM="1"
 USER_X_STARTUP_SCRIPT=.Xclients
-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
 COMMAND_START_KDE=startkde
 COMMAND_START_GNOME=gnome-session
 COMMAND_START_CDE=cdwm
@@ -307,9 +308,9 @@
 [ -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 $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
+NX_BACKEND_VERSION=$(strings $REAL_PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g')
 
 [ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend
 
@@ -346,7 +347,7 @@
 		ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
 	# Check for NX agents ...
 	
-	[ ! -x "$PATH_BIN/nxagent" ] && \
+	[ ! -x "$REAL_PATH_BIN/nxagent" ] && \
 		ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
 	
 	if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ]
@@ -598,7 +599,7 @@
 	[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
 		ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
 
-	[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && \
+	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && \
 		ERROR="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.[01].0 backend is needed for this version of FreeNX."
 		
 	[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \



-- 
gentoo-commits@lists.gentoo.org mailing list