x11-drivers/xf86-input-vmmouse: add patch to fix header inclusion on newer glibc

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 901AB08A)

3 files changed, 87 insertions, 2 deletions

diff --git a/x11-drivers/xf86-input-vmmouse/ChangeLog b/x11-drivers/xf86-input-vmmouse/ChangeLog
index 3c97a843a700..2f6efccbf0ca 100644
--- a/x11-drivers/xf86-input-vmmouse/ChangeLog
+++ b/x11-drivers/xf86-input-vmmouse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-vmmouse
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/ChangeLog,v 1.57 2013/10/08 05:05:33 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/ChangeLog,v 1.58 2014/11/06 19:28:42 remi Exp $
+
+*xf86-input-vmmouse-13.0.0-r1 (06 Nov 2014)
+
+  06 Nov 2014; Rémi Cardona <remi@gentoo.org>
+  +xf86-input-vmmouse-13.0.0-r1.ebuild,
+  +files/xf86-input-vmmouse-13.0.0-add-missing-include.patch:
+  Add patch to fix header inclusion on newer glibc (see bug #527190)
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   xf86-input-vmmouse-13.0.0.ebuild:
diff --git a/x11-drivers/xf86-input-vmmouse/files/xf86-input-vmmouse-13.0.0-add-missing-include.patch b/x11-drivers/xf86-input-vmmouse/files/xf86-input-vmmouse-13.0.0-add-missing-include.patch
new file mode 100644
index 000000000000..e8d57d8b8150
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/files/xf86-input-vmmouse-13.0.0-add-missing-include.patch
@@ -0,0 +1,44 @@
+From 1cbbc03c4b37d57760c57bd2e0b0f89d744a5795 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Tue, 7 Oct 2014 11:32:01 +0200
+Subject: vmmouse_client.h: Include xorg-server.h before xf86_OSproc.h
+
+xf86_OSproc.h cannot be included without first including xorg-server.h.
+
+Without this the build fails on systems with the latest glibc,
+throwing this error:
+
+In file included from /usr/include/string.h:634:0,
+                 from /usr/include/xorg/os.h:53,
+                 from /usr/include/xorg/misc.h:115,
+                 from /usr/include/xorg/window.h:50,
+                 from /usr/include/xorg/globals.h:7,
+                 from /usr/include/xorg/opaque.h:34,
+                 from /usr/include/xorg/xf86_OSproc.h:127,
+                 from vmmouse_client.h:42,
+                 from vmmouse_client.c:38:
+/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
+strndup(const char *str, size_t n);
+
+This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
+causing os.h to redefine it.
+
+Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
+Reviewed-by: Daniel Stone <daniels@collabora.com>
+Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+diff --git a/shared/vmmouse_client.h b/shared/vmmouse_client.h
+index b01bf08..1de51e5 100644
+--- a/shared/vmmouse_client.h
++++ b/shared/vmmouse_client.h
+@@ -39,6 +39,7 @@
+ #ifndef _VMMOUSE_CLIENT_H_
+ #define _VMMOUSE_CLIENT_H_
+ 
++#include "xorg-server.h"
+ #include "xf86_OSproc.h"
+ 
+ /*
+-- 
+cgit v0.10.2
+
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild
new file mode 100644
index 000000000000..a8158c21aca2
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild,v 1.1 2014/11/06 19:28:42 remi Exp $
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="VMWare mouse input driver"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-add-missing-include.patch
+)
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-hal-bin-dir=/punt
+		--with-hal-callouts-dir=/punt
+		--with-hal-fdi-dir=/punt
+	)
+
+	xorg-2_pkg_setup
+}
+
+src_install() {
+	xorg-2_src_install
+	rm -rf "${ED}"/punt
+}