Closing #51701.

4 files changed, 66 insertions, 15 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index a484276f0ff8..fe6b883a6527 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.30 2004/04/11 19:14:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.31 2004/05/24 23:25:46 aliz Exp $
+
+  24 May 2004; Daniel Ahlberg <aliz@gentoo.org>
+  tightvnc-4.0_beta20031113.ebuild:
+  Added patch for linux 2.6 headers from Ed Catmur <ed@catmur.co.uk> in #51701.
 
   11 Apr 2004; Jason Wever <weeve@gentoo.org>
   tightvnc-4.0_beta20031113.ebuild:
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 30024b136004..f4f75c1768c5 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,21 +1,22 @@
-MD5 6c650009c2ef10073d4f0177583a7062 ChangeLog 4444
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 e3d97376c0f029056522d630552f86f6 tightvnc-1.2.8.ebuild 1614
 MD5 e08d2f58129095e93553ce233ba4556c tightvnc-1.2.9-r1.ebuild 1923
-MD5 a291cd215a891538dee09099f523e67d tightvnc-4.0_beta20031113.ebuild 2555
-MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
-MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
-MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
+MD5 835e43a852e75a7cadf5fa755fdadb7e tightvnc-4.0_beta20031113.ebuild 2617
+MD5 324642b197fd47433de7bc691ef43503 ChangeLog 4608
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 8a5968ab6bd3fdd835fe13c589e1cc4d files/digest-tightvnc-4.0_beta20031113 367
-MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
-MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
-MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
+MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
 MD5 31639d1ccaa2c2a4e9dd869fd32f4602 files/tightvnc-1.2.9-gentoo.diff 653
-MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
+MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
 MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
+MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
+MD5 e6b8161e8381fd5be315641819de6425 files/tightvnc-4.0_linux-headers.patch 1359
 MD5 e77df1134e59b0a9881ef1221eeffd37 files/tightvnc_cvs20031113.patch.bz2 19007
-MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
-MD5 19c42aff4dfa179a0b028316e845e14f files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch 949
-MD5 55068075897cef6ddd710f410ba25c21 files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692
+MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
+MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
+MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
 MD5 da10d05f6a76bdc27a59276c0acde9d9 files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch 364
+MD5 55068075897cef6ddd710f410ba25c21 files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692
+MD5 19c42aff4dfa179a0b028316e845e14f files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch 949
diff --git a/net-misc/tightvnc/files/tightvnc-4.0_linux-headers.patch b/net-misc/tightvnc/files/tightvnc-4.0_linux-headers.patch
new file mode 100644
index 000000000000..5595d9fa0c02
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-4.0_linux-headers.patch
@@ -0,0 +1,43 @@
+--- programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2004/05/21 19:54:16	1.1
++++ programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2004/05/21 19:58:29
+@@ -99,6 +99,14 @@ GetKbdLeds(InputInfoPtr pInfo)
+ #include <asm/kbio.h>
+ #endif
+ 
++/* Deal with spurious kernel header change */
++#include <linux/version.h>
++#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
++#  define rate period
++# endif
++#endif
++
+ static int
+ KDKBDREP_ioctl_ok(int rate, int delay) {
+ #if defined(KDKBDREP) && !defined(__sparc__)
+@@ -160,6 +168,14 @@ KIOCSRATE_ioctl_ok(int rate, int delay) 
+ #endif /* KIOCSRATE */
+ }
+ 
++/* Deal with spurious kernel header change */
++#include <linux/version.h>
++#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
++#  undef rate
++# endif
++#endif
++
+ static void
+ SetKbdRepeat(InputInfoPtr pInfo, char rad)
+ {
+--- programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2004/05/21 19:53:03	1.1
++++ programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2004/05/21 19:55:24
+@@ -73,6 +73,7 @@ xf86GetKbdLeds()
+ #endif
+ 
+ /* Deal with spurious kernel header change */
++#include <linux/version.h>
+ #if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
+ #  define rate period
+
diff --git a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
index d9b0df8b19e3..5eb0b3c3f61c 100644
--- a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
+++ b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild,v 1.4 2004/04/11 19:14:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild,v 1.5 2004/05/24 23:25:46 aliz Exp $
 
 inherit eutils
 IUSE="java tcpd"
@@ -68,6 +68,9 @@ src_unpack() {
 	cd ${S}/rfb
 	sed -i 's:#include "jpeg/jpeglib.h":#include "jpeglib.h":g' TightEncoder.h
 	sed -i 's:#include <rfb/TightEncoder.h>:#include <rfb/TightEncoder.h>\nextern "C" {\n#include <jpeglib.h>\n}:g' TightEncoder.cxx
+
+	cd ${S}/xc
+	epatch ${FILESDIR}/${PN}-4.0_linux-headers.patch
 }
 src_compile() {
 	autoconf