Add a patch to fix the double keysym include.

Package-Manager: portage-2.1

4 files changed, 40 insertions, 13 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 770ce599e637..94a5a916fdfd 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.18 2006/06/06 21:46:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.19 2006/06/12 23:24:27 swegener Exp $
+
+  12 Jun 2006; Sven Wegener <swegener@gentoo.org>
+  +files/0.8-keysym-include.patch, x11vnc-0.8.ebuild:
+  Add a patch to fix the double keysym include.
 
 *x11vnc-0.8.1 (06 Jun 2006)
 
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 77696bed3e59..91021421e6a7 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.8-keysym-include.patch 331 RMD160 1f2cbe084772aa1780ad918df583962099d4695d SHA1 a682854614b205c377ca547367084aee5293d650 SHA256 e3cb1b99ccedab5530f3625bd59c0be90836e1fc09194bfd054ef30cff94eea5
+MD5 73892b3a259f62a7d2850e8dc017a168 files/0.8-keysym-include.patch 331
+RMD160 1f2cbe084772aa1780ad918df583962099d4695d files/0.8-keysym-include.patch 331
+SHA256 e3cb1b99ccedab5530f3625bd59c0be90836e1fc09194bfd054ef30cff94eea5 files/0.8-keysym-include.patch 331
 DIST x11vnc-0.7.1.tar.gz 630613
 DIST x11vnc-0.8.1.tar.gz 1314234 RMD160 403c305e8ac529b481f09ed6a263f3150d44f7b1 SHA1 2cf637024edada25b30443084f2d5fc6c9c10b3a SHA256 77eb505eafc337d9d9255c543c0d4321cf7b91e74da9b5e4a826eae5df9fc95f
 DIST x11vnc-0.8.tar.gz 960697 RMD160 a64d5622496dcdb5d851999dfd1ee9b6da1c2009 SHA1 6eb1a02070260ab130bbb53f59e2d2a26f497c5c SHA256 c8bad000d50cd4beb534fe61d32d6811b53a9ba61da808b2f804f381ecdaeeb7
@@ -12,14 +16,14 @@ EBUILD x11vnc-0.8.1.ebuild 1252 RMD160 9ae0331b4d42e21ff3da59cf1915570258d6e464
 MD5 ce9ba13b82c1c5a4cb1690998bb9ede7 x11vnc-0.8.1.ebuild 1252
 RMD160 9ae0331b4d42e21ff3da59cf1915570258d6e464 x11vnc-0.8.1.ebuild 1252
 SHA256 bf8062324d853ecb7b1f895368048eaf1a300fd070be6a530c060d0ed1ef8bb0 x11vnc-0.8.1.ebuild 1252
-EBUILD x11vnc-0.8.ebuild 1251 RMD160 d7a3639990bba2d3ce6218e3e45de9b9d54c9bed SHA1 ea693c418639a79e8a010d18dd0fcbb8ef9f203e SHA256 9f5ed39430044faca2a4fa4d8bad365c13ae6013e87688c137265389b4dc3f00
-MD5 0783e4591afcf3f5d503961d03e5d3c9 x11vnc-0.8.ebuild 1251
-RMD160 d7a3639990bba2d3ce6218e3e45de9b9d54c9bed x11vnc-0.8.ebuild 1251
-SHA256 9f5ed39430044faca2a4fa4d8bad365c13ae6013e87688c137265389b4dc3f00 x11vnc-0.8.ebuild 1251
-MISC ChangeLog 2748 RMD160 f95c090cdee7f7315d164171cc0db9ce9163a1c0 SHA1 b35f909ab5de2712914b3890e70e4c1ae3fa6005 SHA256 5d4e62622ffdc197c819feece17a7edbc704519171d60c8365c9d086e5ef672d
-MD5 4c33201eac377265716e41841a22a718 ChangeLog 2748
-RMD160 f95c090cdee7f7315d164171cc0db9ce9163a1c0 ChangeLog 2748
-SHA256 5d4e62622ffdc197c819feece17a7edbc704519171d60c8365c9d086e5ef672d ChangeLog 2748
+EBUILD x11vnc-0.8.ebuild 1356 RMD160 be413eedda099bbb7cef80abdd8c6eaaf2497314 SHA1 32b22697c86fac098faccfff6218a9f81af58181 SHA256 02d8e2219ef638b99e43383148459d85a90b9b0b234aab9a7bc4013f8e180af5
+MD5 68d61eb059ea91fc731beef31235c40b x11vnc-0.8.ebuild 1356
+RMD160 be413eedda099bbb7cef80abdd8c6eaaf2497314 x11vnc-0.8.ebuild 1356
+SHA256 02d8e2219ef638b99e43383148459d85a90b9b0b234aab9a7bc4013f8e180af5 x11vnc-0.8.ebuild 1356
+MISC ChangeLog 2901 RMD160 0c2c1bc51fbe724a6361a035342e170d68139862 SHA1 badc62439c7f58f4310e99702330cc38d74c401a SHA256 6cd53a69e7b3fff1529a8c92c8f94db28aa6b66bdb4d4910de37d274b11dac98
+MD5 2aa77c609ec93e3eca9b2c411aba9240 ChangeLog 2901
+RMD160 0c2c1bc51fbe724a6361a035342e170d68139862 ChangeLog 2901
+SHA256 6cd53a69e7b3fff1529a8c92c8f94db28aa6b66bdb4d4910de37d274b11dac98 ChangeLog 2901
 MISC metadata.xml 470 RMD160 e28f318dea15e363ed346a16359632c5754a18ca SHA1 de92437c7fd69913fbf1fa7b2a17838daa6ae4d7 SHA256 c614534b55596a07d64afe7362630a15ec79b17102dead075415dccea9fde412
 MD5 8845b35c56be21370ef600f1b3eca775 metadata.xml 470
 RMD160 e28f318dea15e363ed346a16359632c5754a18ca metadata.xml 470
@@ -36,7 +40,7 @@ SHA256 03f42a7a31935b75795370c4b1988bf10f4e882da90f65a8ba2af321e6971173 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhfeOI1lqEGTUzyQRAk7LAKCy5L1wUUVDfo9Nfvzfphrfno0U3QCgxRdV
-y+lSHTlBMh57KN0MxB5MCsc=
-=1VEA
+iD8DBQFEjfegI1lqEGTUzyQRAjhrAJ9Iktk3eMzclpN5UxZK06L3OR7FyACgk2dy
+yS7Fj70bKruyIngRKj1yhwg=
+=hbPL
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/files/0.8-keysym-include.patch b/x11-misc/x11vnc/files/0.8-keysym-include.patch
new file mode 100644
index 000000000000..b46a46f0bcb4
--- /dev/null
+++ b/x11-misc/x11vnc/files/0.8-keysym-include.patch
@@ -0,0 +1,10 @@
+diff -Nur x11vnc-0.8.orig/rfb/keysym.h x11vnc-0.8/rfb/keysym.h
+--- x11vnc-0.8.orig/rfb/keysym.h	2003-02-18 17:02:45.000000000 +0000
++++ x11vnc-0.8/rfb/keysym.h	2006-06-12 23:19:12.184884500 +0000
+@@ -1,5 +1,4 @@
+-#ifndef KEYSYM_H
+-#define KEYSYM_H
++#ifndef XK_0
+ 
+ /* $XConsortium: keysym.h,v 1.15 94/04/17 20:10:55 rws Exp $ */
+ 
diff --git a/x11-misc/x11vnc/x11vnc-0.8.ebuild b/x11-misc/x11vnc/x11vnc-0.8.ebuild
index 422610db0ca0..57f24d6708f5 100644
--- a/x11-misc/x11vnc/x11vnc-0.8.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.8.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.ebuild,v 1.2 2006/04/14 20:21:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.8.ebuild,v 1.3 2006/06/12 23:24:27 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="A VNC server for real X displays"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/"
@@ -36,6 +38,13 @@ DEPEND="${RDEPEND}
 			x11-proto/xextproto
 		) virtual/x11 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/0.8-keysym-include.patch
+}
+
 src_compile() {
 	local myconf=""
 	use jpeg && myconf="${myconf} --with-zlib"