tightvnc: updated to version 1.3.9

6 files changed, 20 insertions, 70 deletions

diff --git a/tightvnc/.footprint b/tightvnc/.footprint
index 215c8054a..46a030d93 100644
--- a/tightvnc/.footprint
+++ b/tightvnc/.footprint
@@ -17,10 +17,12 @@ drwxr-xr-x	root/root	usr/share/vnc/
 drwxr-xr-x	root/root	usr/share/vnc/classes/
 -rw-r--r--	root/root	usr/share/vnc/classes/AuthPanel.class
 -rw-r--r--	root/root	usr/share/vnc/classes/ButtonPanel.class
+-rw-r--r--	root/root	usr/share/vnc/classes/CapabilityInfo.class
+-rw-r--r--	root/root	usr/share/vnc/classes/CapsContainer.class
 -rw-r--r--	root/root	usr/share/vnc/classes/ClipboardFrame.class
 -rw-r--r--	root/root	usr/share/vnc/classes/DesCipher.class
--rw-r--r--	root/root	usr/share/vnc/classes/HTTPConnectSocket.class
--rw-r--r--	root/root	usr/share/vnc/classes/HTTPConnectSocketFactory.class
+-rw-r--r--	root/root	usr/share/vnc/classes/InStream.class
+-rw-r--r--	root/root	usr/share/vnc/classes/MemInStream.class
 -rw-r--r--	root/root	usr/share/vnc/classes/OptionsFrame.class
 -rw-r--r--	root/root	usr/share/vnc/classes/RecordingFrame.class
 -rw-r--r--	root/root	usr/share/vnc/classes/ReloginPanel.class
@@ -28,6 +30,8 @@ drwxr-xr-x	root/root	usr/share/vnc/classes/
 -rw-r--r--	root/root	usr/share/vnc/classes/SessionRecorder.class
 -rw-r--r--	root/root	usr/share/vnc/classes/SocketFactory.class
 -rw-r--r--	root/root	usr/share/vnc/classes/VncCanvas.class
+-rw-r--r--	root/root	usr/share/vnc/classes/VncCanvas2.class
 -rw-r--r--	root/root	usr/share/vnc/classes/VncViewer.class
 -rw-r--r--	root/root	usr/share/vnc/classes/VncViewer.jar
+-rw-r--r--	root/root	usr/share/vnc/classes/ZlibInStream.class
 -rw-r--r--	root/root	usr/share/vnc/classes/index.vnc
diff --git a/tightvnc/.md5sum b/tightvnc/.md5sum
index 2cd031b99..9d6197c54 100644
--- a/tightvnc/.md5sum
+++ b/tightvnc/.md5sum
@@ -1,3 +1,2 @@
-f804b26c098625e3a2675a0aa7709e31  tightvnc-1.2.9_unixsrc.tar.bz2
-a56ee2536e932f1d41c0463da6873029  tightvnc-config.patch
-e96009678734768ab89419ca83ebdfee  tightvnc-gcc3.4.patch
+49a0748ea52793f2e3069e05af28f716  tightvnc-1.3.9_unixsrc.tar.bz2
+a4afa69d2ca558eceeef01fa6988c53c  tightvnc-config.patch
diff --git a/tightvnc/Pkgfile b/tightvnc/Pkgfile
index 110da6ae8..70819204a 100644
--- a/tightvnc/Pkgfile
+++ b/tightvnc/Pkgfile
@@ -5,17 +5,15 @@
 # Depends on: xorg
 
 name=tightvnc
-version=1.2.9
-release=5
+version=1.3.9
+release=1
 source=(http://download.sourceforge.net/sourceforge/vnc-tight/${name}-${version}_unixsrc.tar.bz2  \
-	$name-config.patch $name-gcc3.4.patch )
+	$name-config.patch)
 
 build() {
 	cd vnc_unixsrc
 	
-	# thanks to Jaeger
-	patch -p1 < $SRC/$name-gcc3.4.patch
-	patch < $SRC/$name-config.patch
+	patch -p1 < $SRC/$name-config.patch
 
 	xmkmf
 	make World
diff --git a/tightvnc/README b/tightvnc/README
index b485932cc..f42e9714e 100644
--- a/tightvnc/README
+++ b/tightvnc/README
@@ -3,6 +3,10 @@ REQUIREMENTS
 
    Remove any other VNC software (like x11vnc).
 
+   You need these dependencies to build this port (tightvnc):
+	- xorg-gccmakedep
+	- xorg-imake
+
 PRE-INSTALL
 
 POST-INSTALL
diff --git a/tightvnc/tightvnc-config.patch b/tightvnc/tightvnc-config.patch
index 7d1dad66b..1dc9abf76 100644
--- a/tightvnc/tightvnc-config.patch
+++ b/tightvnc/tightvnc-config.patch
@@ -1,6 +1,6 @@
---- vncserver~	2003-07-31 08:19:37.000000000 -0600
-+++ vncserver	2005-07-17 14:34:38.000000000 -0600
-@@ -36,12 +36,12 @@
+--- vnc_unixsrc/vncserver	2007-04-26 12:57:06.000000000 +0200
++++ vnc_unixsrc-new/vncserver	2007-05-08 14:29:16.000000000 +0200
+@@ -36,13 +36,13 @@
  $geometry = "1024x768";
  $depth = 24;
  $desktopName = "X";
@@ -9,6 +9,7 @@
  $vncUserDir = "$ENV{HOME}/.vnc";
 -$fontPath = "unix/:7100";
 +$fontPath = "/usr/X11R6/lib/X11/fonts/misc,/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/75dpi";
+ $authType = "-rfbauth $vncUserDir/passwd";
  
  # Here is another example of setting the font path:
 -# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
diff --git a/tightvnc/tightvnc-gcc3.4.patch b/tightvnc/tightvnc-gcc3.4.patch
deleted file mode 100644
index 5ba1c1b4c..000000000
--- a/tightvnc/tightvnc-gcc3.4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -urN vnc_unixsrc.orig/Xvnc/include/Xpoll.h vnc_unixsrc/Xvnc/include/Xpoll.h
---- vnc_unixsrc.orig/Xvnc/include/Xpoll.h	2002-04-30 08:07:30.000000000 -0500
-+++ vnc_unixsrc/Xvnc/include/Xpoll.h	2005-05-05 08:16:42.269634912 -0500
-@@ -65,6 +65,8 @@
- #define NBBY	8		/* number of bits in a byte */
- #endif
- 
-+#define fds_bits __fds_bits
-+
- #ifndef NFDBITS
- #define NFDBITS (sizeof(fd_mask) * NBBY)	/* bits per mask */
- #endif
-diff -urN vnc_unixsrc.orig/Xvnc/lib/Xau/AuRead.c vnc_unixsrc/Xvnc/lib/Xau/AuRead.c
---- vnc_unixsrc.orig/Xvnc/lib/Xau/AuRead.c	2000-06-11 07:00:52.000000000 -0500
-+++ vnc_unixsrc/Xvnc/lib/Xau/AuRead.c	2005-05-05 08:15:18.355391816 -0500
-@@ -49,7 +49,7 @@
- FILE	*file;
- {
-     unsigned short  len;
--    char	    *data, *malloc ();
-+    char	    *data;
- 
-     if (read_short (&len, file) == 0)
- 	return 0;
-@@ -76,7 +76,6 @@
- {
-     Xauth   local;
-     Xauth   *ret;
--    char    *malloc ();
- 
-     if (read_short (&local.family, auth_file) == 0)
- 	return 0;
-diff -urN vnc_unixsrc.orig/Xvnc/lib/Xau/AuWrite.c vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c
---- vnc_unixsrc.orig/Xvnc/lib/Xau/AuWrite.c	2000-06-11 07:00:52.000000000 -0500
-+++ vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c	2005-05-05 08:15:40.295056480 -0500
-@@ -61,8 +61,6 @@
- FILE	*auth_file;
- Xauth	*auth;
- {
--    char    *malloc ();
--
-     if (write_short (auth->family, auth_file) == 0)
- 	return 0;
-     if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
-diff -urN vnc_unixsrc.orig/Xvnc/lib/Xdmcp/Alloc.c vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c
---- vnc_unixsrc.orig/Xvnc/lib/Xdmcp/Alloc.c	2000-06-11 07:00:52.000000000 -0500
-+++ vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c	2005-05-05 08:15:58.108348448 -0500
-@@ -31,8 +31,6 @@
- 
- /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
- 
--extern char	*malloc (), *realloc ();
--
- unsigned long *
- Xalloc (amount)
-     unsigned	amount;