[PATCH] XQuartz: Build-fixes for XQuartz for recent input API changes

[Peter Hutterer]

On Fri, Nov 12, 2010 at 03:25:34PM +0000, Jon TURNEY wrote:
> On 12/11/2010 01:45, Peter Hutterer wrote:
> > On Thu, Nov 11, 2010 at 05:23:33PM -0800, Jeremy Huddleston wrote:
> >>
> >> Signed-off-by: Peter Hutterer <peter.hutterer-Pf4JEFdB4epeoWH0uzbU5w at public.gmane.org>
> >> Signed-off-by: Jeremy Huddleston <jeremyhu-2kanFRK1NckAvxtiuMwx3w at public.gmane.org>
> > 
> > 
> > Reviewed-by: Peter Hutterer <peter.hutterer-Pf4JEFdB4epeoWH0uzbU5w at public.gmane.org>
> > 
> > merged into my tree, I'll send keith a pull request in a minute. sorry about
> > the build breaks.
> 
> There's a similar build breakage for XWin (see [1]), trivial patch attached.
> 
> [1] http://tinderbox.freedesktop.org/builds/2010-11-11-0017/logs/xserver/#build

> From 4c2b28b4138da8fe673b81a7b9736da598ca6db0 Mon Sep 17 00:00:00 2001
> From: Jon TURNEY <jon.turney at dronecode.org.uk>
> Date: Thu, 11 Nov 2010 23:06:13 +0000
> Subject: [PATCH] Fix compilation after input API change
> 
> Fix compilation after commit 675f4a8525d29ebad783351e17be785b2f32b2e8
> converts winmouse.c to the new ValuatorMask input API, but doesn't
> include the required header inpututil.h
> 
> Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
> ---
>  hw/xwin/winmouse.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
> index da1d5a9..ee93d8f 100644
> --- a/hw/xwin/winmouse.c
> +++ b/hw/xwin/winmouse.c
> @@ -39,6 +39,7 @@
>  #include "inputstr.h"
>  #include "exevents.h" /* for button/axes labels */
>  #include "xserver-properties.h"
> +#include "inpututils.h"
>  
>  /* Peek the internal button mapping */
>  static CARD8 const *g_winMouseButtonMap = NULL;
> -- 
> 1.7.2.3

merged, thanks

Cheers,
  Peter