freenx 0.5 support for NX 2.x clients

(Portage version: 2.1.2.2)

4 files changed, 49 insertions, 3 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 317ed7748409..54589c55d74f 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.20 2007/03/21 10:15:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.21 2007/03/21 12:18:15 voyageur Exp $
+
+*nxserver-freenx-0.5.0-r2 (21 Mar 2007)
+
+  21 Mar 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/freenx-0.5.0-backingstore.patch, -nxserver-freenx-0.5.0-r1.ebuild,
+  +nxserver-freenx-0.5.0-r2.ebuild:
+  Added support for 2.x NX clients, closes bug #155063
 
 *nxserver-freenx-0.6.0 (21 Mar 2007)
 
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r2
index 183d59abfc16..183d59abfc16 100644
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r1
+++ b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0-r2
diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch
new file mode 100644
index 000000000000..2abef89877c7
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/freenx-0.5.0-backingstore.patch
@@ -0,0 +1,37 @@
+diff -ruN freenx~/etc/nxserver/node.conf.sample freenx/etc/nxserver/node.conf.sample
+--- freenx~/etc/nxserver/node.conf.sample	2006-09-29 17:46:03.000000000 +0200
++++ freenx/etc/nxserver/node.conf.sample	2006-11-21 12:12:03.254604158 +0100
+@@ -346,7 +346,7 @@
+ #########################################################################
+ 
+ # When you installed a 2.0.0 NX Backend, set this to 1.
+-#ENABLE_2_0_0_BACKEND="1"
++#ENABLE_2_0_0_BACKEND="0"
+ 
+ # When set to 1 this will automatically resume started sessions
+ #ENABLE_AUTORECONNECT="0"
+diff -ruN freenx~/usr/bin/nxloadconfig freenx/usr/bin/nxloadconfig
+--- freenx~/usr/bin/nxloadconfig	2006-09-29 17:46:03.000000000 +0200
++++ freenx/usr/bin/nxloadconfig	2006-11-21 12:11:48.400187438 +0100
+@@ -173,7 +173,7 @@
+ 
+ # Misc directives
+ 
+-ENABLE_2_0_0_BACKEND="1"
++ENABLE_2_0_0_BACKEND="0"
+ ENABLE_AUTORECONNECT="0"
+ ENABLE_AUTORECONNECT_BEFORE_140="1"
+ EXPORT_USERIP="0"
+diff -ruN freenx~/usr/bin/nxnode freenx/usr/bin/nxnode
+--- freenx~/usr/bin/nxnode	2006-09-29 17:46:03.000000000 +0200
++++ freenx/usr/bin/nxnode	2006-11-21 12:11:01.696589165 +0100
+@@ -252,7 +252,8 @@
+ 	[ -n "$keyboard" ] && K="-keyboard $keyboard"
+ 	[ -n "$kbtype" ] && K="-kbtype $kbtype"
+ 	B=""
+-	[ -n "$backingstore" -a "$ENABLE_2_0_0_BACKEND" != "1" ] && B="-bs $backingstore"
++	[ -n "$backingstore" -a "$backingstore" = "1" ] && B="+bs"
++	[ -n "$backingstore" -a "$backingstore" != "1" ] && B="-bs $backingstore"
+ 	G=""
+ 	[ -n "$geometry" ] && G="-geometry $geometry"
+ 	R="-D"
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild
index eb207cd7fa05..b1b0c8082300 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r1.ebuild,v 1.1 2006/11/08 21:46:59 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.5.0-r2.ebuild,v 1.1 2007/03/21 12:18:15 voyageur Exp $
 
 inherit multilib eutils rpm
 
@@ -47,6 +47,8 @@ src_unpack() {
 	epatch ${FILESDIR}/freenx-0.5.0-startup.patch
 	# fix fullscreen support; see bug 150200
 	epatch ${FILESDIR}/freenx-0.5.0-fullscreen.patch
+	# fix newer clients support; bug 155063
+	epatch ${FILESDIR}/freenx-0.5.0-backingstore.patch
 
 	mv etc/nxserver/node.conf.sample etc/nxserver/node.conf || die