diff options
Diffstat (limited to 'net-misc/tightvnc/files')
| -rw-r--r-- | net-misc/tightvnc/files/digest-tightvnc-1.2.9-r4 | 3 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/digest-tightvnc-1.3.8-r1 | 3 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch | 169 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch | 52 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch | 20 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch | 37 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch | 22 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch | 150 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch | 30 | ||||
| -rw-r--r-- | net-misc/tightvnc/files/x86.patch | 48 |
10 files changed, 0 insertions, 534 deletions
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r4 b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r4 deleted file mode 100644 index d72709d4f9b6..000000000000 --- a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f804b26c098625e3a2675a0aa7709e31 tightvnc-1.2.9_unixsrc.tar.bz2 1738256 -RMD160 57c4d24bbc008b7188ae4bb177fbb409bc1d26d3 tightvnc-1.2.9_unixsrc.tar.bz2 1738256 -SHA256 c1ba77f832d6c81349f05219802c48b3435cfb6db88f496c9bb08b52b8405548 tightvnc-1.2.9_unixsrc.tar.bz2 1738256 diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3.8-r1 b/net-misc/tightvnc/files/digest-tightvnc-1.3.8-r1 deleted file mode 100644 index bc139c537f55..000000000000 --- a/net-misc/tightvnc/files/digest-tightvnc-1.3.8-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9b9b0465834289d1b7899982c0096440 tightvnc-1.3.8_unixsrc.tar.bz2 1766473 -RMD160 98013a7074c488d1cfc85ea2d7a9665a05ee2431 tightvnc-1.3.8_unixsrc.tar.bz2 1766473 -SHA256 cd76e1c5c6843fec2a7a5c493158cdb3642eb1ef4caecee7a89bfd2078881178 tightvnc-1.3.8_unixsrc.tar.bz2 1766473 diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch deleted file mode 100644 index c1473bfe1416..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff -rc vnc_unixsrc.org/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf -*** vnc_unixsrc.org/Xvnc/config/cf/linux.cf Tue Jan 31 11:22:43 2006 ---- vnc_unixsrc/Xvnc/config/cf/linux.cf Tue Jan 31 22:37:34 2006 -*************** -*** 295,301 **** - #define OptimizedCDebugFlags -O2 - #define LinuxMachineDefines -D__x86_64__ - #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -! #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines - #endif /* x86_64PCArchitecture */ - - #ifdef ArmArchitecture ---- 295,301 ---- - #define OptimizedCDebugFlags -O2 - #define LinuxMachineDefines -D__x86_64__ - #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -! #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 - #endif /* x86_64PCArchitecture */ - - #ifdef ArmArchitecture -diff -rc vnc_unixsrc.org/Xvnc/include/Xmd.h vnc_unixsrc/Xvnc/include/Xmd.h -*** vnc_unixsrc.org/Xvnc/include/Xmd.h Sun Jun 11 07:00:52 2000 ---- vnc_unixsrc/Xvnc/include/Xmd.h Tue Jan 31 15:15:02 2006 -*************** -*** 59,65 **** - #ifdef CRAY - #define WORD64 /* 64-bit architecture */ - #endif -! #if defined(__alpha) || defined(__alpha__) - #define LONG64 /* 32/64-bit architecture */ - #endif - #ifdef __sgi ---- 59,65 ---- - #ifdef CRAY - #define WORD64 /* 64-bit architecture */ - #endif -! #if defined(__alpha) || defined(__alpha__) || defined(__x86_64__) - #define LONG64 /* 32/64-bit architecture */ - #endif - #ifdef __sgi -diff -rc vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c -*** vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c Sun Jun 11 07:00:52 2000 ---- vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c Tue Jan 31 15:15:02 2006 -*************** -*** 79,85 **** - byte, - glyph, - scan; -! int sizes[GLYPHPADOPTIONS]; - { - int widthBits, - widthBytes, ---- 79,85 ---- - byte, - glyph, - scan; -! CARD32 sizes[GLYPHPADOPTIONS]; - { - int widthBits, - widthBytes, -diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c -*** vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c Sun Jun 11 07:00:51 2000 ---- vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c Tue Jan 31 15:15:02 2006 -*************** -*** 404,409 **** ---- 404,410 ---- - */ - void - NoopDDA( -+ #undef NeedVarargsPrototypes - #if NeedVarargsPrototypes - void* f, ... - #endif -diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c -*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c Tue Apr 8 17:18:33 2003 ---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c Tue Jan 31 15:15:02 2006 -*************** -*** 39,44 **** ---- 39,45 ---- - #endif - #if USE_LIBWRAP - #include <tcpd.h> -+ #include <arpa/inet.h> - #endif - - #include "rfb.h" -diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c -*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c Fri Feb 27 06:22:47 2004 ---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c Tue Jan 31 15:15:02 2006 -*************** -*** 80,85 **** ---- 80,86 ---- - #include <sys/param.h> - #include "dix.h" - #include "rfb.h" -+ #include <time.h> - - #ifdef CORBA - #include <vncserverctrl.h> -diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h -*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h Fri Feb 27 06:22:47 2004 ---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h Tue Jan 31 15:15:02 2006 -*************** -*** 30,35 **** ---- 30,36 ---- - #include <rfbproto.h> - #include <vncauth.h> - #include <zlib.h> -+ #include <stdarg.h> - - /* It's a good idea to keep these values a bit greater than required. */ - #define MAX_ENCODINGS 10 -diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c -*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c Sun Oct 27 06:36:02 2002 ---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c Tue Jan 31 15:15:02 2006 -*************** -*** 42,47 **** ---- 42,48 ---- - #include <sys/time.h> - #include <sys/socket.h> - #include <netinet/in.h> -+ #include <arpa/inet.h> - #include <netinet/tcp.h> - #include <netdb.h> - #include <fcntl.h> -diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h -*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h Sun Jun 11 07:00:52 2000 ---- vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h Tue Jan 31 15:15:02 2006 -*************** -*** 479,484 **** ---- 479,485 ---- - ); - - extern void NoopDDA( -+ #undef NeedVarargsPrototypes - #if NeedVarargsPrototypes - void *, - ... -diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h -*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h Wed Feb 19 10:39:54 2003 ---- vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h Tue Jan 31 17:05:16 2006 -*************** -*** 374,379 **** ---- 374,398 ---- - #define NO_ONE_RECT - #endif - -+ /* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha. -+ */ -+ #ifdef __x86_64__ -+ # define BITMAP_SCANLINE_UNIT 64 -+ # define BITMAP_SCANLINE_PAD 64 -+ # define LOG2_BITMAP_PAD 6 -+ # define LOG2_BYTES_PER_SCANLINE_PAD 3 -+ -+ /* Add for handling protocol XPutImage and XGetImage; see comment in -+ * Alpha section. -+ */ -+ #define INTERNAL_VS_EXTERNAL_PADDING -+ #define BITMAP_SCANLINE_UNIT_PROTO 32 -+ -+ #define BITMAP_SCANLINE_PAD_PROTO 32 -+ #define LOG2_BITMAP_PAD_PROTO 5 -+ #define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2 -+ #endif -+ - #endif /* SVR4 / BSD / i386 */ - - #if defined (linux) && defined (__mc68000__) diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch deleted file mode 100644 index 50e577a71753..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- vnc_unixsrc/Xvnc/lib/Xau/AuRead.c.old 2004-09-17 20:34:15.226303649 -0700 -+++ vnc_unixsrc/Xvnc/lib/Xau/AuRead.c 2004-09-17 20:34:31.743582524 -0700 -@@ -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; ---- vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c.old 2004-09-17 20:37:50.192903801 -0700 -+++ vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c 2004-09-17 20:37:58.067083299 -0700 -@@ -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) ---- vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c.old 2004-09-17 20:35:33.598137184 -0700 -+++ vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c 2004-09-17 20:35:40.435424729 -0700 -@@ -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; ---- vnc_unixsrc/Xvnc/include/Xpoll.h.old 2004-09-19 18:10:11.646953351 -0700 -+++ vnc_unixsrc/Xvnc/include/Xpoll.h 2004-09-19 18:31:06.019245838 -0700 -@@ -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 --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch deleted file mode 100644 index ab65aec892f9..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.security.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /tmp/vncserver 2003-02-21 17:29:45.000000000 +0000 -+++ vncserver 2003-02-21 17:30:10.000000000 +0000 -@@ -153,15 +153,8 @@ - $desktopLog = "$vncUserDir/$host:$displayNumber.log"; - unlink($desktopLog); - --# Make an X server cookie - use as the seed the sum of the current time, our --# PID and part of the encrypted form of the password. Ideally we'd use --# /dev/urandom, but that's only available on Linux. -- --srand(time+$$+unpack("L",`cat $vncUserDir/passwd`)); --$cookie = ""; --for (1..16) { -- $cookie .= sprintf("%02x", int(rand(256))); --} -+# Make an X server cookie - use mcookie -+$cookie = `/usr/bin/mcookie`; - - system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie"); - system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch deleted file mode 100644 index 9d5ccc58ad76..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- vnc_unixsrc/Xvnc/config/imake/imake.c.orig 2000-06-11 14:00:51.000000000 +0200 -+++ vnc_unixsrc/Xvnc/config/imake/imake.c 2003-09-01 22:59:25.000000000 +0200 -@@ -913,12 +913,25 @@ - static void get_libc_version(inFile) - FILE* inFile; - { -- char *aout = tmpnam (NULL); -+ char aout[PATH_MAX]; - FILE *fp; - const char *format = "%s -o %s -x c -"; - char *cc; - int len; - char *command; -+ char *tmpdir; -+ int tmpfd; -+ -+ if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (PATH_MAX-13)) -+ strcpy(aout, tmpdir); -+ else -+ strcpy(aout, "/tmp"); -+ strcat(aout, "/imakeXXXXXX"); -+ -+ if((tmpfd = mkstemp(aout)) == -1) { -+ perror("mkstemp"); -+ abort(); -+ } - - cc = getenv ("CC"); - if (cc == NULL) -@@ -930,6 +943,7 @@ - if (snprintf (command , len, format, cc, aout) == len) - abort (); - -+ close(tmpfd); - fp = popen (command, "w"); - if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0 - || pclose (fp) != 0) diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch deleted file mode 100644 index b9818aeeaf2f..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.2.9-pathfixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vncserver.ok 2007-02-03 19:41:44.000000000 +0100 -+++ vncserver 2007-02-03 19:43:48.000000000 +0100 -@@ -36,15 +36,15 @@ - $geometry = "1024x768"; - $depth = 24; - $desktopName = "X"; --$vncClasses = "/usr/local/vnc/classes"; -+$vncClasses = "/usr/share/tightvnc/classes"; - $vncUserDir = "$ENV{HOME}/.vnc"; --$fontPath = "unix/:7100"; -+$fontPath = "unix/:-1"; - - # 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/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 diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch deleted file mode 100644 index 9b7153465e7f..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.3.8-amd64.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- vnc_unixsrc.org/Xvnc/config/cf/Imake.cf 2003-02-06 19:11:28.000000000 +0100 -+++ vnc_unixsrc/Xvnc/config/cf/Imake.cf 2006-09-14 21:37:48.000000000 +0200 -@@ -801,6 +801,10 @@ - # ifdef PpcArchitecture - # define PowerPCArchitecture - # endif -+# ifdef __x86_64__ -+# define x86_64Architecture -+# undef __x86_64__ -+# endif - #endif /* linux */ - - #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) ---- vnc_unixsrc.org/Xvnc/config/cf/linux.cf 2002-03-20 11:49:23.000000000 +0100 -+++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2006-09-14 21:37:48.000000000 +0200 -@@ -43,7 +43,7 @@ - #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \ - defined(SparcArchitecture) || defined(ArmArchitecure) || \ - defined(i386Architecture) || defined(s390Architecture) || \ -- defined(s390xArchitecture) -+ defined(s390xArchitecture) || defined(x86_64Architecture) - #define DefaultLinuxCLibMajorVersion 6 - #else - #define DefaultLinuxCLibMajorVersion 5 -@@ -290,6 +290,14 @@ - #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines - #endif /* PowerPCArchitecture */ - -+#ifdef x86_64Architecture -+#define DefaultCCOptions -fsigned-char -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__x86_64__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -+#endif /* x86_64PCArchitecture */ -+ - #ifdef ArmArchitecture - #define DefaultCCOptions -fsigned-char - #define OptimizedCDebugFlags -O2 ---- vnc_unixsrc.org/Xvnc/include/Xmd.h 2000-06-11 14:00:52.000000000 +0200 -+++ vnc_unixsrc/Xvnc/include/Xmd.h 2006-09-14 21:29:47.000000000 +0200 -@@ -59,7 +59,7 @@ - #ifdef CRAY - #define WORD64 /* 64-bit architecture */ - #endif --#if defined(__alpha) || defined(__alpha__) -+#if defined(__alpha) || defined(__alpha__) || defined(__x86_64__) - #define LONG64 /* 32/64-bit architecture */ - #endif - #ifdef __sgi ---- vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c 2000-06-11 14:00:52.000000000 +0200 -+++ vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c 2006-09-14 21:29:47.000000000 +0200 -@@ -79,7 +79,7 @@ - byte, - glyph, - scan; -- int sizes[GLYPHPADOPTIONS]; -+ CARD32 sizes[GLYPHPADOPTIONS]; - { - int widthBits, - widthBytes, ---- vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c 2000-06-11 14:00:51.000000000 +0200 -+++ vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c 2006-09-14 21:29:47.000000000 +0200 -@@ -404,6 +404,7 @@ - */ - void - NoopDDA( -+#undef NeedVarargsPrototypes - #if NeedVarargsPrototypes - void* f, ... - #endif ---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c 2003-04-09 00:18:33.000000000 +0200 -+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c 2006-09-14 21:29:47.000000000 +0200 -@@ -39,6 +39,7 @@ - #endif - #if USE_LIBWRAP - #include <tcpd.h> -+#include <arpa/inet.h> - #endif - - #include "rfb.h" ---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c 2006-08-15 09:05:07.000000000 +0200 -+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c 2006-09-14 21:29:47.000000000 +0200 -@@ -80,6 +80,7 @@ - #include <sys/param.h> - #include "dix.h" - #include "rfb.h" -+#include <time.h> - - #ifdef CORBA - #include <vncserverctrl.h> ---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h 2004-02-27 13:22:47.000000000 +0100 -+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h 2006-09-14 21:29:47.000000000 +0200 -@@ -30,6 +30,7 @@ - #include <rfbproto.h> - #include <vncauth.h> - #include <zlib.h> -+#include <stdarg.h> - - /* It's a good idea to keep these values a bit greater than required. */ - #define MAX_ENCODINGS 10 ---- vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c 2002-10-27 13:36:02.000000000 +0100 -+++ vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c 2006-09-14 21:29:47.000000000 +0200 -@@ -42,6 +42,7 @@ - #include <sys/time.h> - #include <sys/socket.h> - #include <netinet/in.h> -+#include <arpa/inet.h> - #include <netinet/tcp.h> - #include <netdb.h> - #include <fcntl.h> ---- vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h 2000-06-11 14:00:52.000000000 +0200 -+++ vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h 2006-09-14 21:29:47.000000000 +0200 -@@ -479,6 +479,7 @@ - ); - - extern void NoopDDA( -+#undef NeedVarargsPrototypes - #if NeedVarargsPrototypes - void *, - ... ---- vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h 2003-02-19 17:39:54.000000000 +0100 -+++ vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h 2006-09-14 21:29:47.000000000 +0200 -@@ -374,6 +374,25 @@ - #define NO_ONE_RECT - #endif - -+/* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha. -+ */ -+#ifdef __x86_64__ -+# define BITMAP_SCANLINE_UNIT 64 -+# define BITMAP_SCANLINE_PAD 64 -+# define LOG2_BITMAP_PAD 6 -+# define LOG2_BYTES_PER_SCANLINE_PAD 3 -+ -+/* Add for handling protocol XPutImage and XGetImage; see comment in -+ * Alpha section. -+ */ -+#define INTERNAL_VS_EXTERNAL_PADDING -+#define BITMAP_SCANLINE_UNIT_PROTO 32 -+ -+#define BITMAP_SCANLINE_PAD_PROTO 32 -+#define LOG2_BITMAP_PAD_PROTO 5 -+#define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2 -+#endif -+ - #endif /* SVR4 / BSD / i386 */ - - #if defined (linux) && defined (__mc68000__) - diff --git a/net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch b/net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch deleted file mode 100644 index b2124b07e0ff..000000000000 --- a/net-misc/tightvnc/files/tightvnc-ppcsparc-server.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- vnc-3.3.3r2.orig/Xvnc/programs/Xserver/include/servermd.h Mon Jul 28 10:17:34 1997 -+++ vnc-3.3.3r2/Xvnc/programs/Xserver/include/servermd.h Tue Dec 12 13:40:57 2000 -@@ -380,6 +380,27 @@ - #define GETLEFTBITS_ALIGNMENT 1 - - #endif /* linux/m68k */ -+ -+#if defined (linux) && defined (PPC) -+ -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#define GLYPHPADBYTES 4 -+#define GETLEFTBITS_ALIGNMENT 1 -+ -+#define LARGE_INSTRUCTION_CACHE -+#define FAST_CONSTANT_OFFSET_MODE -+ -+#endif /* linux/PPC */ -+ -+#if defined (linux) && defined (__sparc__) -+ -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#define GLYPHPADBYTES 4 -+#define GETLEFTBITS_ALIGNMENT 1 -+ -+#endif /* linux/__sparc__ */ - - #ifdef sgi - diff --git a/net-misc/tightvnc/files/x86.patch b/net-misc/tightvnc/files/x86.patch deleted file mode 100644 index 64ed196a30ef..000000000000 --- a/net-misc/tightvnc/files/x86.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- vnc_unixsrc/Xvnc/config/cf/Imake.cf.x86_64 2003-03-04 15:33:20.000000000 +0100 -+++ vnc_unixsrc/Xvnc/config/cf/Imake.cf 2003-03-04 15:35:06.000000000 +0100 -@@ -579,6 +579,10 @@ - # define PowerPCArchitecture - # undef __powerpc__ - # endif -+# ifdef __x86_64__ -+# define x86_64Architecture -+# undef __x86_64__ -+# endif - #endif /* linux */ - - #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) ---- vnc_unixsrc/Xvnc/config/cf/linux.cf 2002-03-20 11:49:23.000000000 +0100 -+++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2006-11-01 00:46:39.000000000 +0100 -@@ -43,7 +43,8 @@ - #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \ - defined(SparcArchitecture) || defined(ArmArchitecure) || \ - defined(i386Architecture) || defined(s390Architecture) || \ -- defined(s390xArchitecture) -+ defined(s390xArchitecture) || defined(x86_64Architecture) || \ -+ defined(HPArchitecture) - #define DefaultLinuxCLibMajorVersion 6 - #else - #define DefaultLinuxCLibMajorVersion 5 -@@ -290,6 +291,22 @@ - #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines - #endif /* PowerPCArchitecture */ - -+#ifdef x86_64Architecture -+#define DefaultCCOptions -fsigned-char -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__x86_64__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -+#endif /* x86_64PCArchitecture */ -+ -+#ifdef HPArchitecture -+#define DefaultCCOptions -+#define OptimizedCDebugFlags -O2 -+#define LinuxMachineDefines -D__hppa__ -+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -+#endif /* HPArchitecture */ -+ - #ifdef ArmArchitecture - #define DefaultCCOptions -fsigned-char - #define OptimizedCDebugFlags -O2 |