Porting patches to 1.2.9-r1 closing bug#98536

Package-Manager: portage-2.0.53_rc7

4 files changed, 231 insertions, 3 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 65ce9bd2b065..38580f24d9d7 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.63 2006/02/11 22:08:31 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.64 2006/02/11 22:47:38 morfic Exp $
+
+  11 Feb 2006; Daniel Goller <morfic@gentoo.org>
+  +files/tightvnc-1.2.9-amd64.patch, +files/tightvnc-1.2.9-gcc34.patch,
+  tightvnc-1.2.9-r1.ebuild:
+  Porting patches to 1.2.9-r1 closing bug#98536
 
   11 Feb 2006; Daniel Goller <morfic@gentoo.org>
   -files/tightvnc-1.2.7-gentoo.diff, -files/tightvnc-1.3_alpha5-gcc34.patch,
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch
new file mode 100644
index 000000000000..c1473bfe1416
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.2.9-amd64.patch
@@ -0,0 +1,169 @@
+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
new file mode 100644
index 000000000000..50e577a71753
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.2.9-gcc34.patch
@@ -0,0 +1,52 @@
+--- 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/tightvnc-1.2.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
index 7eb2be97b70d..9fc2384862d4 100644
--- a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.14 2005/04/27 15:07:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.15 2006/02/11 22:47:38 morfic Exp $
 
 inherit eutils
 
@@ -30,7 +30,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 	epatch ${FILESDIR}/x86.patch
+	epatch ${FILESDIR}/${P}-amd64.patch
 }
 
 src_compile() {