summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-02-05 13:19:39 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-02-05 13:19:39 +0000
commit64afd6815a66390c07987dff3ff9ca7918de7e4b (patch)
treeee980a2ff91d3bf9e6d91ffefe4b4821baf24b76 /net-misc/nxserver-freenx/files
parentClean up of the overlay: removed all ebuilds already in portage (diff)
downloadnx-64afd6815a66390c07987dff3ff9ca7918de7e4b.tar.gz
nx-64afd6815a66390c07987dff3ff9ca7918de7e4b.tar.bz2
nx-64afd6815a66390c07987dff3ff9ca7918de7e4b.zip
Added work already done from my overlay, including:
* Updated nx components (both source and nxnode for free edition) * Fixed license and upgrades handling for free edition * nx compilation support on multilib amd64 * new freenx 0.6.0 with rdesktop/vnc fix * Cleanups (DEPEND/RDEPEND, replaced nxwrapper) svn path=/testing/; revision=121
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-rw-r--r--net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.03
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch23
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch53
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch12
4 files changed, 91 insertions, 0 deletions
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0
new file mode 100644
index 0000000..2d1c7bb
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0
@@ -0,0 +1,3 @@
+MD5 504aaa2c3c93c36eefab74e2b8a6506e freenx-0.6.0.tar.gz 110758
+RMD160 6000d5fed4d11dbb4c750b43c81626991460ccbb freenx-0.6.0.tar.gz 110758
+SHA256 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca freenx-0.6.0.tar.gz 110758
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch
new file mode 100644
index 0000000..a8bdc45
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch
@@ -0,0 +1,23 @@
+--- freenx-0.6.0/nxnode 2006-10-05 21:24:20.000000000 +0200
++++ freenx-0.6.0/nxnode 2006-10-05 21:21:11.000000000 +0200
+@@ -629,6 +629,10 @@
+ imagecompressionmethod=$(getparam imagecompressionmethod)
+ imagecompressionlevel=$(getparam imagecompressionlevel)
+ geometry=$(getparam geometry)
++
++ # fullscreen variable added to fix fullscreen on client login
++ fullscreen=$(getparam fullscreen)
++
+ keyboard=$(getparam keyboard)
+ kbtype=$(getparam kbtype)
+ media=$(getparam media)
+@@ -664,7 +668,8 @@
+ status=$(getparam status)
+ host=$(getparam host)
+
+- fullscreen=""
++# commented out to fix fullscreen on client login
++# fullscreen=""
+ [ "$geometry" = "fullscreen" ] && fullscreen="1"
+
+ [ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch
new file mode 100644
index 0000000..d0deb20
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch
@@ -0,0 +1,53 @@
+--- nxloadconfig.orig 2007-01-23 04:22:50.000000000 +0100
++++ nxloadconfig 2007-01-29 17:29:38.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
+@@ -154,7 +155,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
+@@ -263,11 +264,11 @@
+ [ -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.1:$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"
+ if [ -z "$ENABLE_2_0_0_BACKEND" ]
+ then
+ ENABLE_2_0_0_BACKEND="1"
+- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
++ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
+ fi
+
+ [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
+@@ -288,7 +289,7 @@
+ ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
+ # Check for NX agents ...
+
+- [ ! -f "$PATH_BIN/nxagent" ] && \
++ [ ! -f "$REAL_PATH_BIN/nxagent" ] && \
+ ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
+
+ [ ! -f "$PATH_BIN/nxdesktop" ] && \
+@@ -509,7 +510,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')" ] && \
++ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
+ ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
+
+ [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch
new file mode 100644
index 0000000..e6ed42a
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch
@@ -0,0 +1,12 @@
+--- nxnode.orig 2007-02-02 19:54:15.000000000 +0100
++++ nxnode 2007-02-02 19:50:28.000000000 +0100
+@@ -253,6 +253,9 @@
+
+ NODE_APPLICATION=$(node_find_application "$type")
+
++ # For rdesktop/VNC, there is no application to start
++ [ -n "$NODE_APPLICATION" ] || return
++
+ #
+ # Check if we want to use a mediahelper
+ #