summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2006-06-12 23:24:27 +0000
committerSven Wegener <swegener@gentoo.org>2006-06-12 23:24:27 +0000
commit1d9cff0de0aeb65ab4929075e71c89e4cf57bf5f (patch)
tree3486fc6b8757be2e30eab99edceb2704d75689ed /x11-misc/x11vnc
parentCorrect maintainer entry. (diff)
downloadgentoo-2-1d9cff0de0aeb65ab4929075e71c89e4cf57bf5f.tar.gz
gentoo-2-1d9cff0de0aeb65ab4929075e71c89e4cf57bf5f.tar.bz2
gentoo-2-1d9cff0de0aeb65ab4929075e71c89e4cf57bf5f.zip
Add a patch to fix the double keysym include.
(Portage version: 2.1)
Diffstat (limited to 'x11-misc/x11vnc')
-rw-r--r--x11-misc/x11vnc/ChangeLog6
-rw-r--r--x11-misc/x11vnc/files/0.8-keysym-include.patch10
-rw-r--r--x11-misc/x11vnc/x11vnc-0.8.ebuild11
3 files changed, 25 insertions, 2 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/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"