[PATCH libX11 1/2] Fix warnings for recent bigreqsproto, xcmiscproto, and xf86bigfontproto

[Dan Nicholson]

On Wed, Feb 3, 2010 at 11:24 AM, Jeremy Huddleston
<jeremyhu at freedesktop.org> wrote:
>
> On Feb 3, 2010, at 09:31, Julien Cristau wrote:
>
>> On Wed, Feb  3, 2010 at 09:17:35 -0800, Jeremy Huddleston wrote:
>>>
>>> 2) We're reporting that they're deprecated, so if we expect 3rd party
>>> clients of the headers to migrate, we should be willing to do it for
>>> our own code.
>>
>> We can migrate while still staying compatible with the old stuff with a
>> couple configure checks.
>
> How about this then:
>
>
> From 5c271b18b45b8e138b793e0a882fd894a488610b Mon Sep 17 00:00:00 2001
> From: Jeremy Huddleston <jeremyhu at apple.com>
> Date: Tue, 2 Feb 2010 15:48:42 -0800
> Subject: [PATCH] Fix warnings for recent bigreqsproto, xcmiscproto, and
> xf86bigfontproto
>
> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> Acked-by: Dan Nicholson <dbn.lists at gmail.com>
> ---
>  configure.ac  |   10 +++++++---
>  src/Font.c    |    4 ++++
>  src/OpenDis.c |    4 ++++
>  src/XlibInt.c |    4 ++++
>  4 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 0eea575..93d9959 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -60,13 +60,13 @@ AM_CONDITIONAL(XCB, test x$ac_cv_use_xcb != xno)
>  # Checks for pkg-config packages
>
>  # Always required
> -X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans'
> +X11_REQUIRES='[xproto >= 7.0.13] xextproto xtrans'
>
>  PKG_PROG_PKG_CONFIG()
>
>  case "$ac_cv_use_xcb" in
>  no)
> -       X11_REQUIRES="${X11_REQUIRES} xau xcmiscproto bigreqsproto"
> +       X11_REQUIRES="${X11_REQUIRES} xau [xcmiscproto >= 1.2.0]
> [bigreqsproto >= 1.1.0]"
>        X11_EXTRA_DEPS="xau"
>        PKG_CHECK_MODULES(XDMCP, xdmcp,
>                AC_CHECK_LIB(Xdmcp, XdmcpWrap,
> @@ -186,6 +186,10 @@ AC_MSG_RESULT($XLIB_LOADABLE_XCURSOR)
>  AC_HEADER_STDC
>  AC_CHECK_HEADERS([sys/select.h])
>
> +# Backwards compatability with older proto packages.  This will be removed
> eventually.
> +# When removing, make sure to update Font.c OpenDis.c XlibInt.c
> +AC_CHECK_HEADERS([X11/extensions/xcmiscproto.h
> X11/extensions/bigreqsproto.h X11/extensions/xf86bigfproto.h], [], [],
> [#include <X11/Xproto.h>])

Of course, since you've enforced newer xcmiscproto and friends in the
pkg-config checks, you'll always have these headers.

Another thing to think about is that libX11 is currently in 1.3 RC
phase, so it's reasonable to enforce newer proto versions in addition
to the version of xproto needed for generic events. We can branch from
before the generic events patches (75fe48e7a) and cherry pick patches
for a 1.2.x for people on more stable systems. In fact, there aleady
is libX11-1.2-branch.

--
Dan