xextproto and libXext cleanup

[Peter Hutterer]

On Thu, Jul 16, 2009 at 11:28:57AM +0100, Julien Cristau wrote:
> On Thu, Jul 16, 2009 at 13:56:05 +1000, Peter Hutterer wrote:
> 
> > If there are any build errors, please let me know. I'll be monitoring
> > tinderbox for the next few hours.
> > 
> Jerome noticed that xfixesproto.h now gets Xlib.h.  This should be fixed
> by the attached patches.  I'm not quite sure why xfixesproto.h included
> shape.h in the first place, but I fear removing that could break
> clients, so I leave it there.

> From c1a4daa0c72057c140a0941861403d7a9faad8c7 Mon Sep 17 00:00:00 2001
> From: Julien Cristau <jcristau at debian.org>
> Date: Thu, 16 Jul 2009 11:13:02 +0100
> Subject: [PATCH] Prevent shape.h being included in the server
> 
> fixesproto includes shape.h, but doesn't want client side headers.  This
> needs to be fixed there, but work around this in shape.h anyway so we
> don't break older xfixesproto.h.
> ---
>  include/X11/extensions/shape.h |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/include/X11/extensions/shape.h b/include/X11/extensions/shape.h
> index 6fa83d9..7992f7a 100644
> --- a/include/X11/extensions/shape.h
> +++ b/include/X11/extensions/shape.h
> @@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
>  #include <X11/Xfuncproto.h>
>  #include <X11/extensions/shapeconst.h>
>  
> +#ifndef _SHAPE_SERVER_
>  #include <X11/Xutil.h>
>  
>  typedef struct {
> @@ -149,4 +150,6 @@ extern XRectangle *XShapeGetRectangles (
>  
>  _XFUNCPROTOEND
>  
> +#endif /* !_SHAPE_SERVER_ */
> +
>  #endif /* _SHAPE_H_ */
> -- 
> 1.6.3.3

thanks, applied.

> From 5a80459ef60a221c6116a8475f830c45164d178b Mon Sep 17 00:00:00 2001
> From: Julien Cristau <jcristau at debian.org>
> Date: Thu, 16 Jul 2009 11:20:09 +0100
> Subject: [PATCH] fixesproto: adjust to split xext headers
> 
> Protocol constants for shape were moved to shapeconst.h.
> ---
>  fixesproto.pc.in |    1 +
>  xfixesproto.h    |    4 +---
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/fixesproto.pc.in b/fixesproto.pc.in
> index 454ed8d..fabce86 100644
> --- a/fixesproto.pc.in
> +++ b/fixesproto.pc.in
> @@ -7,3 +7,4 @@ Name: FixesProto
>  Description: X Fixes extension headers
>  Version: @PACKAGE_VERSION@
>  Cflags: -I${includedir}
> +Requires: xextproto >= 7.0.99.1
> diff --git a/xfixesproto.h b/xfixesproto.h
> index 571706e..545e325 100644
> --- a/xfixesproto.h
> +++ b/xfixesproto.h
> @@ -47,9 +47,7 @@
>  
>  #include <X11/Xmd.h>
>  #include <X11/extensions/xfixeswire.h>
> -#define _SHAPE_SERVER_
> -#include <X11/extensions/shape.h>
> -#undef _SHAPE_SERVER_
> +#include <X11/extensions/shapeconst.h>
>  
>  #define Window CARD32
>  #define Drawable CARD32
-- 

already pushed, thanks.

Cheers,
  Peter