libX11: update to 1.7.0.

libX11 version 1.7.0 includes a new API, hence the change from the 1.6
series to 1.7:

 * XSetIOErrorExitHandler which provides a mechanism for applications
   to recover from I/O error conditions instead of being forced to
   exit. Thanks to Carlos Garnacho for this.

This release includes a bunch of bug fixes, some which have been pending for over three years:

 * A bunch of nls cleanups to remove obsolete entries and clean up
   formatting of the ist. Thanks to Benno Schulenberg for these.

 * Warning fixes and other cleanups across a huge swath of the
   library. Thanks to Alan Coopersmith for these.

 * Memory allocation bugs, including leaks and use after free in the
   locale code. Thanks to Krzesimir Nowak, Jacek Caban and Vittorio
   Zecca for these.

 * Thread safety fixes in the locale code. Thanks to Jacek Caban for
   these.

 * poll_for_response race condition fix. Thanks to Frediano Ziglio for
   the bulk of this effort, and to Peter Hutterer for careful review
   and improvements.

Version 1.7.0 includes a couple of new locales:

 * ia and ie locales. Thanks to Carmina16 for these.

There are also numerous compose entries added, including:

 * |^ or ^| for ↑, |v or v| for ↓, ~~ for ≈. Thanks to Antti
    Savolainen for this.

 * Allowing use of 'v' for caron, in addition to 'c', so things like
   vC for Č, vc for č. Thanks to Benno Schulenberg for this.

 * Compose sequences LT, lt for '<', and GT, gt for '>' for keyboards
   where those are difficult to access. Thanks to Jonathan Belsewir
   for this.

4 files changed, 18 insertions, 18 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index b6651469dcd..8d77b2511f5 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2020/08/26 10:28:03 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2020/11/20 20:42:53 wiz Exp $
 
-DISTNAME=		libX11-1.6.12
+DISTNAME=		libX11-1.7.0
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 04f79fec19b..819d9d302b5 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/11/13 21:59:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2020/11/20 20:42:53 wiz Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -977,9 +977,9 @@ share/X11/locale/pt_PT.UTF-8/XLC_LOCALE
 share/X11/locale/ru_RU.UTF-8/Compose
 share/X11/locale/ru_RU.UTF-8/XI18N_OBJS
 share/X11/locale/ru_RU.UTF-8/XLC_LOCALE
-share/X11/locale/sr_CS.UTF-8/Compose
-share/X11/locale/sr_CS.UTF-8/XI18N_OBJS
-share/X11/locale/sr_CS.UTF-8/XLC_LOCALE
+share/X11/locale/sr_RS.UTF-8/Compose
+share/X11/locale/sr_RS.UTF-8/XI18N_OBJS
+share/X11/locale/sr_RS.UTF-8/XLC_LOCALE
 share/X11/locale/tatar-cyr/Compose
 share/X11/locale/tatar-cyr/XI18N_OBJS
 share/X11/locale/tatar-cyr/XLC_LOCALE
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 13111e80c6e..a360454ddeb 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2020/08/26 10:28:03 wiz Exp $
+$NetBSD: distinfo,v 1.35 2020/11/20 20:42:53 wiz Exp $
 
-SHA1 (libX11-1.6.12.tar.bz2) = c8a553505588913196790cbe1ce0c6468db98911
-RMD160 (libX11-1.6.12.tar.bz2) = f4ced0aa5eb00c6e4a97e95881eff9022f52f9ce
-SHA512 (libX11-1.6.12.tar.bz2) = 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
-Size (libX11-1.6.12.tar.bz2) = 2376498 bytes
-SHA1 (patch-Makefile.in) = 93d3b8d9882babf70788e984884a9db46a5367ef
+SHA1 (libX11-1.7.0.tar.bz2) = 48fd27a11572a7d3c1014368e1dc9f40a7b23e7d
+RMD160 (libX11-1.7.0.tar.bz2) = a3df61054babc200de47e0d5dc416461f64f8981
+SHA512 (libX11-1.7.0.tar.bz2) = f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
+Size (libX11-1.7.0.tar.bz2) = 2409144 bytes
+SHA1 (patch-Makefile.in) = a38502ac45908a4a8d57de42e301894a2e9f8a15
 SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
 SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e
diff --git a/x11/libX11/patches/patch-Makefile.in b/x11/libX11/patches/patch-Makefile.in
index ee2a7a3da44..a626873371d 100644
--- a/x11/libX11/patches/patch-Makefile.in
+++ b/x11/libX11/patches/patch-Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.5 2017/02/27 09:09:50 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2020/11/20 20:42:53 wiz Exp $
 
 Avoid unnecessary auto* due to patch-aa modifying configure.ac.
 
---- Makefile.in.orig	2017-02-26 05:55:34.000000000 +0000
+--- Makefile.in.orig	2020-11-20 19:08:19.000000000 +0000
 +++ Makefile.in
-@@ -94,8 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+@@ -95,8 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ 	$(top_srcdir)/configure.ac
 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 -	$(ACLOCAL_M4)
 +am__configure_deps =