network/tightvnc: Fix script.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 65 insertions, 1 deletions

diff --git a/network/tightvnc/README b/network/tightvnc/README
index e6132561f5..6c055516e3 100644
--- a/network/tightvnc/README
+++ b/network/tightvnc/README
@@ -13,3 +13,17 @@ TightVNC is:
 
 TightVNC also ships with Xvnc, a headless X server that speaks the VNC
 protocol.
+
+NOTE: vncserver/Xvnc requires a configuration file (tightvncserver.conf) in
+/etc to operate.  A suitable, basic, configuration file is by this slackbuild
+in /usr/doc/tightvnc-1.3.10.  Copy this file to /etc before attempting to
+launch vncserver/Xvnc.
+
+Also included is a small, optional, patch to vncserver (vncserver.patch),
+contributed by Andrei Descul얢, which modifies the vncserver startup to use
+the system configured xinitrc instead of the minimal xterm/twm configuration 
+used by default.  Note that if you have launched vncserver prior to applying
+the optional patch, you will need to remove the $HOME/.vnc/xstartup file to
+use the alternate configuration.  If you wish to use the optional patch, you
+will need to apply it manually (i.e., using the 'patch' command from the
+command line).
diff --git a/network/tightvnc/tightvnc.SlackBuild b/network/tightvnc/tightvnc.SlackBuild
index d6219e6301..2e946b2b4f 100644
--- a/network/tightvnc/tightvnc.SlackBuild
+++ b/network/tightvnc/tightvnc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for tightvnc
 
-# Copyright 2014 Richard Ellis (USA)
+# Copyright 2014-2021 Richard Ellis (USA)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -69,6 +69,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Apply patch to tightvncserver.conf for Slack 14.2 font and rgb.txt path
+# locations
+patch < $CWD/tightvncserver.conf.patch
+
 xmkmf
 make World
 
diff --git a/network/tightvnc/tightvncserver.conf.patch b/network/tightvnc/tightvncserver.conf.patch
new file mode 100644
index 0000000000..fc8e5ebe99
--- /dev/null
+++ b/network/tightvnc/tightvncserver.conf.patch
@@ -0,0 +1,16 @@
+--- tightvncserver.conf.orig	2021-03-27 00:33:41.773056870 -0400
++++ tightvncserver.conf	2021-03-27 00:38:34.195076768 -0400
+@@ -23,11 +23,11 @@
+ # $vncUserDir = "$ENV{HOME}/.vnc";
+ # $fontPath = "unix/:7100";
+ # $authType = "-rfbauth $vncUserDir/passwd";
+-# $colorPath = "/usr/lib/X11/rgb";
++$colorPath = "/usr/share/X11/rgb";
+ 
+ ## Here is another example of setting the font path:
+ #
+-# $fontPath = "/usr/lib/X11/fonts/misc/"
++$fontPath = "/usr/share/fonts/misc/"
+ # $fontPath = "$fontPath,/usr/lib/X11/fonts/75dpi/";
+ 
+ ## You might wish to make your vnc directory under /tmp, to make sure
diff --git a/network/tightvnc/vncserver.patch b/network/tightvnc/vncserver.patch
new file mode 100644
index 0000000000..0c3bc23380
--- /dev/null
+++ b/network/tightvnc/vncserver.patch
@@ -0,0 +1,30 @@
+--- vncserver.orig	2009-02-12 06:27:18.000000000 +0200
++++ vncserver	2021-03-27 08:35:57.331183132 -0400
+@@ -48,10 +48,12 @@
+ 
+ $defaultXStartup
+     = ("#!/bin/sh\n\n".
+-       "xrdb \$HOME/.Xresources\n".
+-       "xsetroot -solid grey\n".
+-       "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
+-       "twm &\n");
++       "#xrdb \$HOME/.Xresources\n".
++       "#xsetroot -solid grey\n".
++       "#xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
++       "#twm &\n".
++       "# Start X session using xinitrc \n".
++       "/etc/X11/xinit/xinitrc &\n");
+ 
+ $xauthorityFile = "$ENV{XAUTHORITY}";
+ 
+@@ -161,7 +163,9 @@
+ 
+ $cmd = "Xvnc :$displayNumber";
+ $cmd .= " -desktop " . &quotedString($desktopName);
+-$cmd .= " -httpd $vncClasses";
++if ( -d $vncCllasses ) {
++   $cmd .= " -httpd $vncClasses";
++}
+ $cmd .= " -auth $xauthorityFile";
+ $cmd .= " -geometry $geometry" if ($geometry);
+ $cmd .= " -depth $depth" if ($depth);