[arch-commits] CVS update of extra/network/tightvnc (2 files)

[Paul Mattal]

    Date: Thursday, June 21, 2007 @ 21:32:35
  Author: paul
    Path: /home/cvs-extra/extra/network/tightvnc

   Added: tightvnc-fontpath-xcolors.patch (1.1)
 Removed: fix_1.2.9.patch (1.1)

upgpkg: tightvnc 1.3.9-1
update to 1.3.9


---------------------------------+
 fix_1.2.9.patch                 |   48 --------------------------------------
 tightvnc-fontpath-xcolors.patch |   21 ++++++++++++++++
 2 files changed, 21 insertions(+), 48 deletions(-)


Index: extra/network/tightvnc/fix_1.2.9.patch
diff -u extra/network/tightvnc/fix_1.2.9.patch:1.1 extra/network/tightvnc/fix_1.2.9.patch:removed
--- extra/network/tightvnc/fix_1.2.9.patch:1.1	Thu Feb 23 15:51:44 2006
+++ extra/network/tightvnc/fix_1.2.9.patch	Thu Jun 21 21:32:35 2007
@@ -1,48 +0,0 @@
---- Xvnc/lib/Xau/AuRead.c.orig	2000-06-11 08:00:52.000000000 -0400
-+++ Xvnc/lib/Xau/AuRead.c	2006-02-23 14:18:09.000000000 -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;
---- Xvnc/lib/Xau/AuWrite.c.orig	2000-06-11 08:00:52.000000000 -0400
-+++ Xvnc/lib/Xau/AuWrite.c	2006-02-23 14:18:05.000000000 -0500
-@@ -61,7 +61,6 @@
- FILE	*auth_file;
- Xauth	*auth;
- {
--    char    *malloc ();
- 
-     if (write_short (auth->family, auth_file) == 0)
- 	return 0;
---- vncserver.orig	2003-07-31 10:19:37.000000000 -0400
-+++ vncserver	2006-02-23 15:33:38.000000000 -0500
-@@ -38,13 +38,13 @@
- $desktopName = "X";
- $vncClasses = "/usr/local/vnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+#$fontPath = "unix/:7100";
- 
- # Here is another example of setting the font path:
--# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
- 
- # X colors database path is optional, uncomment and edit to use:
--# $colorPath = "/usr/lib/X11/rgb";
-+$colorPath = "/usr/share/X11/rgb";
- 
- # You might wish to make your vnc directory under /tmp, to make sure
- # passwords are always kept on the local filesystem. To do that, just
Index: extra/network/tightvnc/tightvnc-fontpath-xcolors.patch
diff -u /dev/null extra/network/tightvnc/tightvnc-fontpath-xcolors.patch:1.1
--- /dev/null	Thu Jun 21 21:32:35 2007
+++ extra/network/tightvnc/tightvnc-fontpath-xcolors.patch	Thu Jun 21 21:32:35 2007
@@ -0,0 +1,21 @@
+diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver
+--- vnc_unixsrc/vncserver	2007-04-26 06:57:06.000000000 -0400
++++ vnc_unixsrc.fixed/vncserver	2007-06-17 19:08:02.000000000 -0400
+@@ -38,14 +38,14 @@
+ $desktopName = "X";
+ $vncClasses = "/usr/local/vnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++#$fontPath = "unix/:7100";
+ $authType = "-rfbauth $vncUserDir/passwd";
+ 
+ # Here is another example of setting the font path:
+-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
+ 
+ # X colors database path is optional, uncomment and edit to use:
+-# $colorPath = "/usr/lib/X11/rgb";
++$colorPath = "/usr/share/X11/rgb.txt";
+ 
+ # You might wish to make your vnc directory under /tmp, to make sure
+ # passwords are always kept on the local filesystem. To do that, just