Unbreak package when built against inputproto-2.1, bug #395555.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 67 insertions, 3 deletions

diff --git a/x11-apps/xinput/ChangeLog b/x11-apps/xinput/ChangeLog
index 2555ecc9bed0..02eec9b8f535 100644
--- a/x11-apps/xinput/ChangeLog
+++ b/x11-apps/xinput/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinput
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/ChangeLog,v 1.38 2011/02/14 23:41:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/ChangeLog,v 1.39 2011/12/21 19:41:42 chithanh Exp $
+
+*xinput-1.5.3-r1 (21 Dec 2011)
+
+  21 Dec 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xinput-1.5.3.ebuild, +xinput-1.5.3-r1.ebuild,
+  +files/xinput-1.5.3-inputproto-2.1.patch:
+  Unbreak package when built against inputproto-2.1, bug #395555.
 
   14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> xinput-1.5.3.ebuild:
   ppc stable wrt #344827, #354237
diff --git a/x11-apps/xinput/files/xinput-1.5.3-inputproto-2.1.patch b/x11-apps/xinput/files/xinput-1.5.3-inputproto-2.1.patch
new file mode 100644
index 000000000000..632a1104883d
--- /dev/null
+++ b/x11-apps/xinput/files/xinput-1.5.3-inputproto-2.1.patch
@@ -0,0 +1,36 @@
+From 4be60c90008ac48e72e819e078ce957fd003a509 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 12 Aug 2011 04:20:21 +0000
+Subject: list: don't use defines for checking server version.
+
+Otherwise we run into the old problem again: recompiling xinput against
+newer inputproto headers will appear to change the version support,
+potentially causing errors or other misbehaviours.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/list.c b/src/list.c
+index b4649eb..b791e81 100644
+--- a/src/list.c
++++ b/src/list.c
+@@ -248,14 +248,14 @@ static int
+ list_xi2(Display *display,
+          enum print_format format)
+ {
+-    int major = XI_2_Major,
+-        minor = XI_2_Minor;
++    int major = 2,
++        minor = 0;
+     int ndevices;
+     int i, j;
+     XIDeviceInfo *info, *dev;
+ 
+     if (XIQueryVersion(display, &major, &minor) != Success ||
+-        (major * 1000 + minor) < (XI_2_Major * 1000 + XI_2_Minor))
++        (major * 1000 + minor) < 2000)
+     {
+         fprintf(stderr, "XI2 not supported.\n");
+         return EXIT_FAILURE;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/xinput/xinput-1.5.3-r1.ebuild b/x11-apps/xinput/xinput-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..856b30accd22
--- /dev/null
+++ b/x11-apps/xinput/xinput-1.5.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.3-r1.ebuild,v 1.1 2011/12/21 19:41:42 chithanh Exp $
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="Utility to set XInput device parameters"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.3
+	x11-libs/libXext
+	>=x11-libs/libXi-1.4.5"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-2.0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-inputproto-2.1.patch"
+)
diff --git a/x11-apps/xinput/xinput-1.5.3.ebuild b/x11-apps/xinput/xinput-1.5.3.ebuild
index 8808e91a33f5..b3bae0ac087f 100644
--- a/x11-apps/xinput/xinput-1.5.3.ebuild
+++ b/x11-apps/xinput/xinput-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.3.ebuild,v 1.8 2011/02/14 23:41:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.3.ebuild,v 1.9 2011/12/21 19:41:42 chithanh Exp $
 
 EAPI=3
 
@@ -14,4 +14,4 @@ RDEPEND=">=x11-libs/libX11-1.3
 	x11-libs/libXext
 	>=x11-libs/libXi-1.3"
 DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.0"
+	<x11-proto/inputproto-2.0.99"