Update to 1.10:

once again, there is a new libxcb release out. This time with even
less bugs, api and abi breakage.

Changes (hand-edited to remove things that were released from
branches):

Alan Coopersmith (3):
      Fix "indention" typos in xcb-examples.3 man page
      Enable warnings for pre-C89 style definitions for gcc & Solaris Studio
      Define _xcb_map_new with explicit void arg list instead of empty one

Christian König (1):
      fix deadlock with xcb_take_socket/return_socket v3

Daniel Martin (10):
      c_client.py: Always initialize xcb_align_to
      c_client.py: Do not create pointers in unions
      Make xsltproc optional
      Remove second AC_PREREQ, require version 2.60
      Set AC_CONFIG_AUX_DIR to build-aux
      Use build-aux as autom4te cache directory
      Use m4 directory
      Sort gitignore, adjust pattern for config.h
      tests: Add files to .gitignore
      c_client.py: Fix _sizeof() functions

Daphne Pfister (2):
      Fix poll() if POLLIN == ROLLRDNORM|POLLRDBAND
      Use /usr/spool/sockets/X11/ on HP-UX for UNIX sockets (#69118).

Julien Cristau (2):
      Bump xcb-proto requirement to 1.10
      Add NEWS for 1.10

Marc Deslauriers (1):
      Update Makefile.am for newer automake

Mark Kettenis (1):
      Fix alignment issues in FD passing code

Michael Stapelberg (1):
      Build xcb-xkb by default

PHO (1):
      Test the value of msg_controllen for platforms whose CMSG_FIRSTHDR() does not test it for us

Uli Schlachter (6):
      Fix documentation of xcb_poll_for_event()
      Revert "fix deadlock with xcb_take_socket/return_socket v3"
      Revert "Remove xcb_ge_event_t from xcb.h"
      Increment the "current" version info for sync, xinput and xkb
      Add NEWS entries for releases 1.9.1 to 1.9.3
      Release libxcb 1.10

4 files changed, 16 insertions, 32 deletions

diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 5bf6270d748..65792fc53b8 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2013/11/08 13:11:44 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/01/02 19:52:16 wiz Exp $
 
-DISTNAME=	libxcb-1.9.3
+DISTNAME=	libxcb-1.10
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -50,6 +50,7 @@ PKGCONFIG_OVERRIDE+=	xcb-xevie.pc.in
 PKGCONFIG_OVERRIDE+=	xcb-xf86dri.pc.in
 PKGCONFIG_OVERRIDE+=	xcb-xfixes.pc.in
 PKGCONFIG_OVERRIDE+=	xcb-xinerama.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-xkb.pc.in
 PKGCONFIG_OVERRIDE+=	xcb-xprint.pc.in
 PKGCONFIG_OVERRIDE+=	xcb-xtest.pc.in
 PKGCONFIG_OVERRIDE+=	xcb-xv.pc.in
diff --git a/x11/libxcb/PLIST b/x11/libxcb/PLIST
index 10e191e4bc4..6e84f64911f 100644
--- a/x11/libxcb/PLIST
+++ b/x11/libxcb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/11/08 13:11:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/01/02 19:52:16 wiz Exp $
 include/xcb/bigreq.h
 include/xcb/composite.h
 include/xcb/damage.h
@@ -49,6 +49,7 @@ lib/libxcb-xevie.la
 lib/libxcb-xf86dri.la
 lib/libxcb-xfixes.la
 lib/libxcb-xinerama.la
+lib/libxcb-xkb.la
 lib/libxcb-xprint.la
 lib/libxcb-xtest.la
 lib/libxcb-xv.la
@@ -73,6 +74,7 @@ lib/pkgconfig/xcb-xevie.pc
 lib/pkgconfig/xcb-xf86dri.pc
 lib/pkgconfig/xcb-xfixes.pc
 lib/pkgconfig/xcb-xinerama.pc
+lib/pkgconfig/xcb-xkb.pc
 lib/pkgconfig/xcb-xprint.pc
 lib/pkgconfig/xcb-xtest.pc
 lib/pkgconfig/xcb-xv.pc
@@ -314,7 +316,7 @@ man/man3/xcb_free_gc.3
 man/man3/xcb_free_gc_checked.3
 man/man3/xcb_free_pixmap.3
 man/man3/xcb_free_pixmap_checked.3
-man/man3/xcb_ge_event_t.3
+man/man3/xcb_ge_generic_event_t.3
 man/man3/xcb_get_atom_name.3
 man/man3/xcb_get_atom_name_name.3
 man/man3/xcb_get_atom_name_name_end.3
@@ -2144,23 +2146,6 @@ man/man3/xcb_xkb_get_device_info_name_end.3
 man/man3/xcb_xkb_get_device_info_name_length.3
 man/man3/xcb_xkb_get_device_info_reply.3
 man/man3/xcb_xkb_get_device_info_unchecked.3
-man/man3/xcb_xkb_get_geometry.3
-man/man3/xcb_xkb_get_geometry_colors_iterator.3
-man/man3/xcb_xkb_get_geometry_colors_length.3
-man/man3/xcb_xkb_get_geometry_doodads_iterator.3
-man/man3/xcb_xkb_get_geometry_doodads_length.3
-man/man3/xcb_xkb_get_geometry_key_aliases.3
-man/man3/xcb_xkb_get_geometry_key_aliases_iterator.3
-man/man3/xcb_xkb_get_geometry_key_aliases_length.3
-man/man3/xcb_xkb_get_geometry_label_font.3
-man/man3/xcb_xkb_get_geometry_properties_iterator.3
-man/man3/xcb_xkb_get_geometry_properties_length.3
-man/man3/xcb_xkb_get_geometry_reply.3
-man/man3/xcb_xkb_get_geometry_sections_iterator.3
-man/man3/xcb_xkb_get_geometry_sections_length.3
-man/man3/xcb_xkb_get_geometry_shapes_iterator.3
-man/man3/xcb_xkb_get_geometry_shapes_length.3
-man/man3/xcb_xkb_get_geometry_unchecked.3
 man/man3/xcb_xkb_get_indicator_map.3
 man/man3/xcb_xkb_get_indicator_map_maps.3
 man/man3/xcb_xkb_get_indicator_map_maps_iterator.3
@@ -2224,8 +2209,6 @@ man/man3/xcb_xkb_set_debugging_flags_reply.3
 man/man3/xcb_xkb_set_debugging_flags_unchecked.3
 man/man3/xcb_xkb_set_device_info.3
 man/man3/xcb_xkb_set_device_info_checked.3
-man/man3/xcb_xkb_set_geometry.3
-man/man3/xcb_xkb_set_geometry_checked.3
 man/man3/xcb_xkb_set_indicator_map.3
 man/man3/xcb_xkb_set_indicator_map_checked.3
 man/man3/xcb_xkb_set_map.3
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index caeec7ede5e..739f2f3a43b 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2013/11/08 13:11:44 wiz Exp $
+$NetBSD: distinfo,v 1.13 2014/01/02 19:52:16 wiz Exp $
 
-SHA1 (libxcb-1.9.3.tar.bz2) = 28076500e2ca05e5887c7ed231ba305a85e8bd0b
-RMD160 (libxcb-1.9.3.tar.bz2) = d2335c20a66cd987f0d3d21253d16d05ba840486
-Size (libxcb-1.9.3.tar.bz2) = 400283 bytes
-SHA1 (patch-aa) = 0fde6ba0ceba1125e75368f77a804a2710e01857
+SHA1 (libxcb-1.10.tar.bz2) = bb1a3113eca5146e2a1cf6379c2e52c212a757e0
+RMD160 (libxcb-1.10.tar.bz2) = 39e06176a6b174503c8cede776d85d92ee1b3259
+Size (libxcb-1.10.tar.bz2) = 475211 bytes
+SHA1 (patch-aa) = 813338a15543787f489b23274c526185008bbce3
 SHA1 (patch-ai) = 637affb3aa2f7d40e0aada4dadab8c695ea74b6f
diff --git a/x11/libxcb/patches/patch-aa b/x11/libxcb/patches/patch-aa
index 82c25449227..446eb4eae06 100644
--- a/x11/libxcb/patches/patch-aa
+++ b/x11/libxcb/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2013/11/08 13:11:44 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2014/01/02 19:52:17 wiz Exp $
 
---- configure.orig	2013-11-08 04:28:01.000000000 +0000
+--- configure.orig	2013-12-22 15:01:06.000000000 +0000
 +++ configure
-@@ -13418,7 +13418,7 @@ else
+@@ -13466,7 +13466,7 @@ else
  $as_echo "yes" >&6; }
- 	:
+ 
  fi
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"