summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-03-01 18:02:20 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-03-01 18:02:20 +0000
commit7dd20c201528d422c05a1a030475c6e4e09949fc (patch)
tree7dedc7ca707a018583b0413254c32c0a17389310 /net-misc/nxserver-freenx/files
parentCleanup: removed old blockers and virtual/x11 dep (diff)
downloadnx-7dd20c201528d422c05a1a030475c6e4e09949fc.tar.gz
nx-7dd20c201528d422c05a1a030475c6e4e09949fc.tar.bz2
nx-7dd20c201528d422c05a1a030475c6e4e09949fc.zip
Fixed rootless mode image compression
svn path=/testing/; revision=132
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-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-rootless-mode.patch39
2 files changed, 39 insertions, 23 deletions
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
deleted file mode 100644
index a8bdc45..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-fullscreen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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-rootless-mode.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch
new file mode 100644
index 0000000..eb30df2
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch
@@ -0,0 +1,39 @@
+--- freenx-server/trunk/nxnode 2007/02/04 01:05:52 313
++++ freenx-server/trunk/nxnode 2007/02/25 23:50:49 331
+@@ -969,7 +969,7 @@
+ sync=$(getparam sync)
+ samba=$(getparam samba)
+ cups=$(getparam cups)
+- agent_server=$(getparam agent_server)
++ agent_server=$(getparam agent_server | sed 's/%3A/:/g')
+ agent_user=$(getparam agent_user)
+ agent_password=$(getparam agent_password)
+ agent_domain=$(getparam agent_domain)
+@@ -991,13 +991,17 @@
+ rootless=0
+ # Its still the clients decision
+ [ "$ENABLE_ROOTLESS_MODE" = "1" ] && rootless=$(getparam rootless)
++
++ # Rootless fix from 2x nxserver 1.5.0
++ realtype=$type
++ [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop"
+
+ # FreeNX specific variables
+ clientproto=$(getparam clientproto)
+ status=$(getparam status)
+ host=$(getparam host)
+
+- fullscreen=""
++ fullscreen=$(getparam fullscreen)
+ [ "$geometry" = "fullscreen" ] && fullscreen="1"
+
+ [ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
+@@ -1061,7 +1065,7 @@
+ umask 0077
+
+ cat << EOF > $USER_FAKE_HOME/.nx/C-$sess_id/options
+-${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$type,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
++${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
+ EOF
+ umask $OLD_UMASK
+ #samba=$samba,