libX11: Changes to 'master'

[Alan Coopersmith]

 configure.ac                   |   19 ++++++++-----------
 modules/om/generic/omGeneric.c |    4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 4d4676c0d6324d2ff9d00d15ab485fa5d848a369
Author: Osamu Sayama <osamu.sayama at sun.com>
Date:   Tue Jan 5 17:26:40 2010 -0800

    set_fontset_extents crash after get_rotate_fontname fix in 2bef065b70f7
    
    - In set_fontset_extents, check font_data is not NULL before running
      loop that may increment it to a non-NULL invalid pointer.
    - Make sure get_rotate_fontname counts the final field
    
    Fixes OpenSolaris bug 6913809: X application dumps core in ja_JP.UTF-8 locale
    <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6913809>
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

commit 87529c039050ce3336ff9ce00f1b5a21d15690da
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Jan 5 18:02:37 2010 -0800

    Merge X11, XKBPROTO, & XPROTO pkg-config lists
    
    Since the XPROTO_CFLAGS & XKBPROTO_CFLAGS are just merged into X11_CFLAGS
    in configure.ac anyway, might as well combine the lists passed to
    PKG_CHECK_MODULES to reduce duplication in the flags.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
    Reviewed-by: Rémi Cardona <remi at gentoo.org>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>