Update to 1.6.3:

This release of libX11 looks bigger than it is, due to a lot of spec/doc
cleanup work that doesn't affect the code itself.  There is still a good
deal of bug fixes, code cleanup, locale improvements, and compose key table
additions, including new UTF-8 compose sequences for:

<Multi_key> <R> <equal>      : "<U+20B9>" U20b9 # INDIAN RUPEE SIGN
<Multi_key> <S> <semicolon>  : "Ș"   U0218  # LATIN CAPITAL LETTER S WITH COMMA BELOW
<Multi_key> <s> <semicolon>  : "ș"   U0219  # LATIN SMALL LETTER S WITH COMMA BELOW
<Multi_key> <T> <semicolon>  : "Ț"   U021A  # LATIN CAPITAL LETTER T WITH COMMA BELOW
<Multi_key> <t> <semicolon>  : "ț"   U021B  # LATIN SMALL LETTER T WITH COMMA BELOW
<Multi_key> <F> <U>          : "<U+1F595>"  U1F595 # REVERSED HAND WITH MIDDLE FINGER EXTENDED
<Multi_key> <L> <L> <A> <P>  : "<U+1F596>"  U1F596 # RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS

Alan Coopersmith (77):
      Xcms file parsing should not require the impossible to succeed
      Drop X_LOCALE fallback for OS'es without setlocale()
      unifdef -UISC
      XkbSelectEventDetails: remove unnecessary assignments
      _XkbReadGeomOverlay: check for NULL first, then use pointer
      Remove unused ETEST & ESZTEST macros from XlibInt.c
      Add RANDR 1.4 requests & events to XErrorDB
      Fix typos in Xrm.c comments
      Fix "follwing" typo in en_US.UTF-8/Compose comment
      XCreateGC.man: simplify table to work with Solaris tbl
      Add missing .TE tags to end tables in Xkb man pages
      Start adding Unicode 7.0 support to compose table
      specs/libX11: Fix x & y in parameter lists to be two separate parameters
      specs/libX11: Fix height & width in parameter lists to be two separate entries
      specs/libX11: Add missing spaces to 'unsignedint' & 'unsignedlong' types
      Fix map->num_types check in XkbAddKeyType()
      Fix validation of ctrls parameter to XkbGetPerClientControls()
      Use C99 named initializers to fill in events passed to XSendEvent
      specs/libX11: Correct value of IconicState to match Xutil.h
      specs/libX11: disengender a user reference
      specs/XKB: Convert header filenames to filename tags
      specs/XKB: Fix various markup issues in functiondecl tables
      specs/XKB: Add index
      specs/XKB: Convert to funcsynopsis+variablelist instead of informaltable
      specs/XKB: normalize <emphasis> layout in xml files
      specs/XKB: Markup function names as <function> instead of <emphasis>
      specs/XKB: Apply <emphasis> to semantic tag transformations from Xlib spec
      specs/XKB: Turn Chapter references into xref links
      specs/XKB: Turn section references into xref links
      specs/XKB: Turn Table references into links
      specs/XKB: Add <figure> tags and make Figure references link to them
      specs/XKB: make olinks to xkbproto for references in section 10.13
      specs/XKB: Remove remaining xref comments
      specs/XKB: re-normalize <emphasis> layout in xml files
      specs/XKB: manually fixup some more emphasis tagging mismatches
      specs/XKB: Convert remaining error names to errorname tags
      specs/XKB: Markup function args as <parameter> instead of <emphasis>
      specs/XKB: Markup NULL as <symbol> instead of <emphasis>
      specs/XKB: Markup keysyms as <keysym> instead of <emphasis>
      specs/XKB: Use ° instead of o for degrees.
      specs/XKB: Markup XKB macros as <symbol> instead of <emphasis>
      specs/XKB: Markup *Rec as <structname> instead of <emphasis>
      specs/XKB: Markup *Ptr as <type> instead of <emphasis>
      specs/XKB: Markup symbol names in table entries too
      specs/XKB: Markup structs as <struct{name,field}> instead of <emphasis>
      specs/XKB: Markup characters & strings as <literal> instead of <emphasis>
      specs/XKB: Markup keyboard keys as <keycap> instead of <emphasis>
      specs/XKB: Markup protocol requests as <systemitem> instead of <emphasis>
      specs/XKB: Manual fixup of function name markup
      specs/XKB: Manual fixup of symbol name markup
      specs/XKB: Manual fixup of struct name/field markup
      specs/XKB: Manual fixup of parameter markup
      specs/XKB: Manual fixup of type markup
      specs/XKB: Markup key terms as <firstterm> instead of <emphasis>
      specs/XKB: fixup newlines between tags and parens
      specs/XKB: fixup newlines between tags and punctuation
      specs/XKB: Markup quoted terms as <quote> instead of with ""
      specs/XKB: make sure all files have DOCTYPEs so standard entities work
      specs/XKB: Markup some subtractions with &minus; instead of -
      specs/XKB: Markup some ranges with &ndash; instead of -
      specs/XKB: replace =&gt; with &rArr; for double arrows
      specs/XKB: replace -&gt; with &rarr; when used as arrow, not in C structs
      specs/XKB: remove unwanted white space around C -&gt; struct references
      specs/XKB: Table 4.1: remove page numbers & unnecessary para tags
      specs/XKB: add links to more tables listing section references
      specs/XKB: add links for terms in definition list under figure 1.1
      specs/XKB: add some more links by hand
      specs/XKB: fixup various formatting issues in <literallayout>s
      specs/XKB: fixup various formatting issues in <programlisting>s
      specs/XKB: add some more indexterms by hand
      specs/XKB: Fix miscelleanous typos & spelling errors
      specs/XKB: Add olinks to libX11 for "X Library Functions Affected by Xkb"
      specs/XKB: Trim leading spaces off text lines
      specs/XKB: acknowledge my contributions
      specs/XKB: Markup fractions as <{super,sub}script> instead of <emphasis>
      Fix source paths for out-of-tree lintlib builds
      libX11 1.6.3

Andreas Schwab (1):
      Restore lost tabs in sed commands

Benno Schulenberg (15):
      nls: Fix transposed locale identifier for Khmer.
      nls: Allowing Romanian Ă and ă to be composed also with lowercase <u>.
      nls: Adding compose sequences (with <parenleft> first) that GTK also has.
      nls: Ordering some compose sequences in a more customary way.
      nls: Adding accessible compose sequences for Ș and Ț (with comma below).
      nls: Adding the missing postfix sequences for composing vowels with ogoneks.
      nls: Adding the missing compose sequences with <comma> for O with ogonek.
      nls: Transform Brazilian compose file to an include plus three overrides.
      nls: Grouping the compose sequences for Dstroke/dstroke together.
      nls: Grouping a lone superscript minus together with its mates.
      nls: Adding the visual composing characters to two comment lines.
      nls: Add one lowercase compose variant for ®, to mirror those for ©.
      nls: Add a comment to the block of accented Hebrew letters.
      nls: Remove a duplicate locale name, and sort some others more strictly.
      nls: Sorting compose sequences rigorously in mirroring pairs, as is custom.

Gabriel Souza Franco (1):
      Add double-arrow compose sequence

Gaetan Nadon (1):
      makekeys: don't need to use target-specific CFLAGS

Gioele Barabucci (1):
      Add compose sequence for U+20B9 INDIAN RUPEE SIGN

Ingo Schwarze (1):
      Fix pasto in XkbGetKeyBehaviors(3) manual

James Cloos (4):
      nls/en_US.UTF-8/Compose.pre: Fix typo.
      Revert "nls: Adding compose sequences (with <parenleft> first) that GTK also has."
      Add nls for cs_CZ.UTF-8
      Add cs_CZ.UTF-8 locale to configure.ac

Jon TURNEY (1):
      Don't try so hard to find a matching font with the given encoding

Joonas Javanainen (1):
      Fix XErrorEvent struct field order in man page

Marko Myllynen (1):
      Annotate Finnish Compose map with Unicode code points

Owen W. Taylor (1):
      Fix XNextRequest() after direct usage of XCB

Peter Hutterer (1):
      man: fix man page for XkbGetMap

Ran Benita (5):
      nls: remove duplicate 'ohorn' and 'uhorn' compose sequences
      nls: always use XCOMM instead of # for comments in Compose.pre files
      Remove dead USE_OWN_COMPOSE-protected code
      xkb: fix misleading comment about consumed modifiers
      compose: fix the description of modifiers in compose sequences

Reuben Thomas (1):
      en_US.UTF-8/Compose: Fix apparent copy-paste-o, changing capital to small A.

Teemu Likonen (1):
      Fix "RING ABOVE" key in the Finnish compose file

walter harms (8):
      libX11/lcGenConv.c fix: dereferenced before check
      libX11/XKBNames.c fix: dereferenced before check
      libX11/lcUTF8.c fix: dereferenced before check
      Remove redundant null checks before free
      Remove more redundant null checks before Xfree()
      libX11: rm redundante NULL checks
      rm redundant null checks
      lcDefConv.c: fix use before check

6 files changed, 18 insertions, 45 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 2db8babf0d9..52375ea1758 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2014/10/09 14:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2015/03/10 07:16:26 wiz Exp $
 
-DISTNAME=		libX11-1.6.2
-PKGREVISION=		1
+DISTNAME=		libX11-1.6.3
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 3f8b5d46920..dbcab2ee207 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/09/09 09:45:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/03/10 07:16:26 wiz Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -846,6 +846,9 @@ share/X11/locale/armscii-8/Compose
 share/X11/locale/armscii-8/XI18N_OBJS
 share/X11/locale/armscii-8/XLC_LOCALE
 share/X11/locale/compose.dir
+share/X11/locale/cs_CZ.UTF-8/Compose
+share/X11/locale/cs_CZ.UTF-8/XI18N_OBJS
+share/X11/locale/cs_CZ.UTF-8/XLC_LOCALE
 share/X11/locale/el_GR.UTF-8/Compose
 share/X11/locale/el_GR.UTF-8/XI18N_OBJS
 share/X11/locale/el_GR.UTF-8/XLC_LOCALE
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 5eba9ccbb36..b88a24e806e 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.23 2014/05/30 12:51:29 wiz Exp $
+$NetBSD: distinfo,v 1.24 2015/03/10 07:16:26 wiz Exp $
 
-SHA1 (libX11-1.6.2.tar.bz2) = 0dd74854e6f6bb8a322e88ba3e89f87c3dcf9e08
-RMD160 (libX11-1.6.2.tar.bz2) = ebfc49399f379b77c3fc2b540af41d4316c0fa67
-Size (libX11-1.6.2.tar.bz2) = 2339981 bytes
-SHA1 (patch-Makefile.in) = a81dbc7149775a0ba62a4d92560c5898173d4c9d
-SHA1 (patch-aa) = ef7c24a879604f4cc4cbb38befc9fa24314df3ef
+SHA1 (libX11-1.6.3.tar.bz2) = 6f2aadf8346ee00b7419bd338461c6986e274733
+RMD160 (libX11-1.6.3.tar.bz2) = 42545c57ba150fead4d861907644ce51421e4933
+Size (libX11-1.6.3.tar.bz2) = 2363858 bytes
+SHA1 (patch-Makefile.in) = d8db87e513c71208e32a727145df41bfb3106756
+SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
 SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e
-SHA1 (patch-nls_en__US.UTF-8_Compose.pre) = 4690e81d6e7bf03f7d6816ff6d0bdc442e75c0b3
diff --git a/x11/libX11/patches/patch-Makefile.in b/x11/libX11/patches/patch-Makefile.in
index 3ba2f556c0a..7d798a42bf2 100644
--- a/x11/libX11/patches/patch-Makefile.in
+++ b/x11/libX11/patches/patch-Makefile.in
@@ -1,16 +1,16 @@
-$NetBSD: patch-Makefile.in,v 1.2 2014/05/30 12:51:29 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2015/03/10 07:16:26 wiz Exp $
 
 Avoid unnecessary auto* due to patch-aa modifying configure.ac.
 
---- Makefile.in.orig	2013-09-09 01:37:36.000000000 +0000
+--- Makefile.in.orig	2015-03-09 22:29:00.000000000 +0000
 +++ Makefile.in
-@@ -88,8 +88,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
+@@ -92,8 +92,7 @@ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
  	$(top_srcdir)/configure.ac
 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 -	$(ACLOCAL_M4)
 +am__configure_deps = 
+ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ 	$(am__configure_deps) $(am__DIST_COMMON)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
diff --git a/x11/libX11/patches/patch-aa b/x11/libX11/patches/patch-aa
index c63428a3e69..fb9e2ec6e87 100644
--- a/x11/libX11/patches/patch-aa
+++ b/x11/libX11/patches/patch-aa
@@ -1,12 +1,9 @@
-$NetBSD: patch-aa,v 1.11 2014/05/30 12:51:29 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2015/03/10 07:16:26 wiz Exp $
 
 Include pthread.h as thread stubs might be macros like on NetBSD.
 
 Define conditional for cross-compiling support.
 
-Also, don't look for keysmydef.h, as this could break cross
-builds (from GIT).
-
 --- configure.ac.orig	2013-09-09 01:37:20.000000000 +0000
 +++ configure.ac
 @@ -276,7 +276,7 @@ xyes)
diff --git a/x11/libX11/patches/patch-nls_en__US.UTF-8_Compose.pre b/x11/libX11/patches/patch-nls_en__US.UTF-8_Compose.pre
deleted file mode 100644
index 4fc7fa70749..00000000000
--- a/x11/libX11/patches/patch-nls_en__US.UTF-8_Compose.pre
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-nls_en__US.UTF-8_Compose.pre,v 1.1 2014/05/30 12:51:29 wiz Exp $
-
-commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b
-Author: James Cloos <cloos@jhcloos.com>
-Date:   Tue Sep 17 12:50:42 2013 -0400
-
-    nls/en_US.UTF-8/Compose.pre: Fix typo.
-
-    Fix typo added in 215ce6a67863, s/actute/acute/.
-
-    Fixes bug #69476.  Reported by Jean Krohn.
-
-    Signed-off-by: James Cloos <cloos@jhcloos.com>
-
---- nls/en_US.UTF-8/Compose.pre.orig	2013-09-09 01:37:20.000000000 +0000
-+++ nls/en_US.UTF-8/Compose.pre
-@@ -743,7 +743,7 @@ XCOMM Part 3
- <Multi_key> <i> <quotedbl> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
- <Multi_key> <diaeresis> <i> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
- <Multi_key> <i> <diaeresis> 		: "ï"   idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
--<dead_actute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-+<dead_acute> <j>	 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
- <Multi_key> <apostrophe> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
- <Multi_key> <j> <apostrophe> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
- <Multi_key> <acute> <j> 		: "j́"    # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301