summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscruggsj <scruggsj@localhost>2006-03-12 13:15:55 +0000
committerscruggsj <scruggsj@localhost>2006-03-12 13:15:55 +0000
commit04ae77b52de6c817824764f528548c115af92796 (patch)
tree89417e099171b483772244f4942b7e02ceeb8b5b /net-misc/nxserver-freenx/files
parentI took out the need for the patch and replaced it with a symlink line. There ... (diff)
downloadnx-04ae77b52de6c817824764f528548c115af92796.tar.gz
nx-04ae77b52de6c817824764f528548c115af92796.tar.bz2
nx-04ae77b52de6c817824764f528548c115af92796.zip
* Added xorg patch again and took out the symlink
* Added a sed line to FreeNX 0.4.4 to modify the patch to work so we don't need two patches now. :) svn path=/testing/; revision=31
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch
new file mode 100644
index 0000000..9da12ff
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch
@@ -0,0 +1,18 @@
+--- freenx-server/nxnode 2005-08-07 12:53:57.000000000 +0300
++++ freenx-server/nxnode 2006-02-02 00:00:25.000000000 +0200
+@@ -22,6 +22,26 @@
+
+ echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
+
++### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
++
++if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
++ then
++ export XKEYSYMDB=/usr/share/X11/XKeysymDB
++ fi
++
++### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
++
+ if [ "$1" != "--check" -a "$1" != "--setkey" -a "$1" != "--agent" ]
+ then
+ read CMDLINE