Added patch for Gentoo/FreeBSD compatibility as per bug #103521. See also gnome bug #314311.

(Portage version: 2.0.51.22)

6 files changed, 97 insertions, 7 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index c5de13484680..4bb84d89feb2 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.36 2005/08/25 00:40:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.37 2005/08/26 09:29:13 flameeyes Exp $
+
+*vino-2.10.0-r1 (26 Aug 2005)
+
+  26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/vino-2.10.0-fbsd.patch, +vino-2.10.0-r1.ebuild,
+  vino-2.11.92.ebuild:
+  Added patch for Gentoo/FreeBSD compatibility as per bug #103521. See also
+  gnome bug #314311.
 
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org> vino-2.10.0.ebuild:
   stable on ia64
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index ed1fbcf28b2f..21f7740b8f9e 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,9 +1,11 @@
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 38d8b4da835d583fe3a849c1fdf6f8fd vino-2.11.92.ebuild 1260
 MD5 f8c4534eeaf06df676de7d940d5fe310 ChangeLog 3842
 MD5 b355d978b16a86813ab93eef55b5890f vino-2.8.1.ebuild 973
-MD5 66a78e5f9505ed791550c3e65f950de8 vino-2.10.0.ebuild 979
-MD5 27066a8bafffd3133ecb32c63dd421ea vino-2.11.92.ebuild 1178
-MD5 6a6e29695e536c76e6b01b930d65c430 files/digest-vino-2.10.0 64
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e16a18d35e47cb82f2ee77068f101659 vino-2.10.0-r1.ebuild 1064
+MD5 8998fdcfa6d5c111f54a22a2170ade9f files/digest-vino-2.8.1 63
 MD5 4bd66cdedeb8bff32c00a891417978e9 files/vino-2.11-zlib_fix.patch 633
+MD5 504fdaa2353d2b5208bec26cbf5f45c2 files/vino-2.10.0-fbsd.patch 741
+MD5 6a6e29695e536c76e6b01b930d65c430 files/digest-vino-2.10.0-r1 64
+MD5 6a6e29695e536c76e6b01b930d65c430 files/digest-vino-2.10.0 64
 MD5 22b49a8af8c89540c961f8cbad576d4d files/digest-vino-2.11.92 65
-MD5 8998fdcfa6d5c111f54a22a2170ade9f files/digest-vino-2.8.1 63
diff --git a/net-misc/vino/files/digest-vino-2.10.0-r1 b/net-misc/vino/files/digest-vino-2.10.0-r1
new file mode 100644
index 000000000000..f2555bd27b04
--- /dev/null
+++ b/net-misc/vino/files/digest-vino-2.10.0-r1
@@ -0,0 +1 @@
+MD5 a9b5c811807e01e7fb420f52820f0150 vino-2.10.0.tar.bz2 581602
diff --git a/net-misc/vino/files/vino-2.10.0-fbsd.patch b/net-misc/vino/files/vino-2.10.0-fbsd.patch
new file mode 100644
index 000000000000..d1a2acd7aed9
--- /dev/null
+++ b/net-misc/vino/files/vino-2.10.0-fbsd.patch
@@ -0,0 +1,28 @@
+Index: vino-2.10.0/server/libvncserver/rfb/rfbproto.h
+===================================================================
+--- vino-2.10.0.orig/server/libvncserver/rfb/rfbproto.h
++++ vino-2.10.0/server/libvncserver/rfb/rfbproto.h
+@@ -60,9 +60,11 @@
+ #include <rfb/rfbint.h>
+ #else
+ #include <config.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+ #endif
++#endif
+ #include <rfb/keysym.h>
+ 
+ #ifdef HAVE_LIBZ
+Index: vino-2.10.0/server/vino-fb.c
+===================================================================
+--- vino-2.10.0.orig/server/vino-fb.c
++++ vino-2.10.0/server/vino-fb.c
+@@ -36,6 +36,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <gdk/gdkx.h>
diff --git a/net-misc/vino/vino-2.10.0-r1.ebuild b/net-misc/vino/vino-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..7ca7e191e240
--- /dev/null
+++ b/net-misc/vino/vino-2.10.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.10.0-r1.ebuild,v 1.1 2005/08/26 09:29:13 flameeyes Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="VNC server"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#IUSE="jpeg zlib gnutls crypt"
+IUSE="jpeg gnutls crypt"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2.5.2
+	>=gnome-base/orbit-2
+	>=gnome-base/libbonobo-2
+	sys-libs/zlib
+	jpeg? ( media-libs/jpeg )
+	gnutls? ( >=net-libs/gnutls-1 )
+	crypt? ( >=dev-libs/libgcrypt-1.1.90 )"
+#	zlib? ( sys-libs/zlib )
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
+
+USE_DESTDIR="1"
+
+G2CONF="${G2CONF} \
+	--with-zlib \
+	$(use_with jpeg) \
+	$(use_enable gnutls) \
+	$(use_enable crypt gcrypt)"
+#	$(use_with zlib) \
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fbsd.patch
+}
+
diff --git a/net-misc/vino/vino-2.11.92.ebuild b/net-misc/vino/vino-2.11.92.ebuild
index e2c38db9ce71..42f5423712a8 100644
--- a/net-misc/vino/vino-2.11.92.ebuild
+++ b/net-misc/vino/vino-2.11.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.11.92.ebuild,v 1.1 2005/08/22 23:45:05 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.11.92.ebuild,v 1.2 2005/08/26 09:29:13 flameeyes Exp $
 
 inherit eutils gnome2
 
@@ -43,4 +43,6 @@ src_unpack() {
 
 	# Fix compilation if --without-libz is passed
 	epatch ${FILESDIR}/${PN}-2.11-zlib_fix.patch
+	# Fix compilation for Gentoo/FreeBSD
+	epatch ${FILESDIR}/${PN}-2.10.0-fbsd.patch
 }