[PATCH modular] xcb-util: not required to build The X C Binding (XCB) library for X

[Jon TURNEY]

On 07/03/2011 22:25, Dan Nicholson wrote:
> On Mon, Mar 07, 2011 at 04:45:25PM -0500, Peter Harris wrote:
>> On 2011-03-07 15:29, Dan Nicholson wrote:
>>>
>>> There are other components that use xcb-util, though. For instance,
>>> xlsclients needs xcb-atom.pc from xcb-util. Probably it should be
>>> included in the katamari.
>>
>> xlsclients was just (today) patched to remove its dependency on the
>> deprecated xcb-atom exported atoms[1]. I believe that's all it depended
>> on from xcb-atom.
>>
>> Someone with more autofoo than I could modify the xlsclients build to
>> not depend on xcb-atom.pc.
> 
> Oh, right. See patch below for xlsclients.

I should have noticed that this was needed as well, so thanks for doing the
other half of the change :-)

> 
> --
> Dan
> 
> From 262e24324d1788026ae7f8715066825b0d6668d8 Mon Sep 17 00:00:00 2001
> From: Dan Nicholson <dbn.lists-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>
> Date: Mon, 7 Mar 2011 14:21:09 -0800
> Subject: [PATCH] Drop dependency on xcb-atom/xcb-util
> 
> With commit 223851b6, the atom names from xcb/xproto.h are being used
> and xcb-atom is no longer needed.
> 
> Signed-off-by: Dan Nicholson <dbn.lists-Re5JQEeQqe8AvxtiuMwx3w at public.gmane.org>

Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

> ---
>  configure.ac |    2 +-
>  xlsclients.c |    1 -
>  2 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 39204e8..987ca2b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -45,7 +45,7 @@ fi
>  XORG_DEFAULT_OPTIONS
>  
>  # Checks for pkg-config packages
> -PKG_CHECK_MODULES(XLSCLIENTS, xcb xcb-atom)
> +PKG_CHECK_MODULES(XLSCLIENTS, xcb)
>  
>  AC_CONFIG_FILES([
>  	Makefile
> diff --git a/xlsclients.c b/xlsclients.c
> index 15d3f1a..691f868 100644
> --- a/xlsclients.c
> +++ b/xlsclients.c
> @@ -37,7 +37,6 @@ in this Software without prior written authorization from The Open Group.
>  #include <inttypes.h>
>  #include <xcb/xcb.h>
>  #include <xcb/xproto.h>
> -#include <xcb/xcb_atom.h>
>  #ifndef HAVE_STRNLEN
>  #include "strnlen.h"
>  #endif