libX11: update to 1.8.3.

This bug fix release corrects some regressions introduced in 1.8.2
along with other bugs.

Highlights include:

 * Improved handling of reentering libX11 via X*IfEvent() calls (!171, !173)
 * Fix loading of en_US.UTF-8/XLC_LOCALE (#167, !174)
 * Add XFreeThreads() and automatic call from a destructor function when
   thread-safety-constructor is enabled (!167).
 * Address issues found by UBSan and AddressSanitizer
 * Fix build with older gcc versions (!169)

The full list of changes - see https://gitlab.freedesktop.org/xorg/lib/libx11/
for further details on any of these:

Alan Coopersmith (1):
      libX11 1.8.3

Jeremy Huddleston Sequoia (1):
      ximcp: Address warning found by UBSan when growing an empty tree

Keith Packard (1):
      Update XPutBackEvent() to support clients that put back unpadded events

Matthieu Herrb (1):
      Fix 797755 Allow X*IfEvent() to reenter libX11

Nia Alarie (1):
      Don't use pragma inside a function, it breaks compiling with older GCCs.

Oliver (1):
      Add XFreeThreads function.

Takao Fujiwara (1):
      nls: consecutive cs number in en_US.UTF-8/XLC_LOCALE

Ulrich Sibiller (2):
      Indentation fixes around recent dpy->in_ifevent changes
      ChkIfEv.c: fix wrong handling of dpy->in_ifevent

3 files changed, 7 insertions, 59 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 5c40f43c05c..9584f02f113 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2022/11/10 21:29:16 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2022/12/16 01:10:01 wiz Exp $
 
-DISTNAME=		libX11-1.8.2
+DISTNAME=		libX11-1.8.3
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.xz
@@ -32,7 +32,7 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}
 
 # XXX This needs to match the version of xcb-proto we get for the
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 1d3bdbd4f75..52d7a2b8085 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.49 2022/11/10 21:33:05 wiz Exp $
+$NetBSD: distinfo,v 1.50 2022/12/16 01:10:01 wiz Exp $
 
-BLAKE2s (libX11-1.8.2.tar.xz) = e4af15ac627d666ace52ff861da139401207cd63ac06f8e5ca8f6bbd526bd9f8
-SHA512 (libX11-1.8.2.tar.xz) = 662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d
-Size (libX11-1.8.2.tar.xz) = 1823712 bytes
-SHA1 (patch-src_xkb_XKBBind.c) = 88904e6916e56c8460e2d079c4653095a28f85e0
+BLAKE2s (libX11-1.8.3.tar.xz) = 82645fb43fe83dc0c5cf599d53ac6036879f53de12bdb380be4dbf0d2323a82d
+SHA512 (libX11-1.8.3.tar.xz) = bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325
+Size (libX11-1.8.3.tar.xz) = 1811712 bytes
diff --git a/x11/libX11/patches/patch-src_xkb_XKBBind.c b/x11/libX11/patches/patch-src_xkb_XKBBind.c
deleted file mode 100644
index f3ac3a2ec49..00000000000
--- a/x11/libX11/patches/patch-src_xkb_XKBBind.c
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-src_xkb_XKBBind.c,v 1.2 2022/11/10 21:33:05 wiz Exp $
-
-Don't use pragma inside a function, it breaks compiling with older
-GCCs.
-
-XKBBind.c:230: error: #pragma GCC diagnostic not allowed inside functions
-
-https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/169
-
---- src/xkb/XKBBind.c.orig	2020-11-20 19:08:11.000000000 +0000
-+++ src/xkb/XKBBind.c
-@@ -214,6 +214,14 @@ XkbKeysymToModifiers(Display *dpy, KeySy
-     return mods;
- }
- 
-+#ifdef __clang__
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-+#elif defined(__GNUC__)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-+#endif
-+
- KeySym
- XLookupKeysym(register XKeyEvent * event, int col)
- {
-@@ -223,22 +231,15 @@ XLookupKeysym(register XKeyEvent * event
-         return _XLookupKeysym(event, col);
-     _XkbCheckPendingRefresh(dpy, dpy->xkb_info);
- 
--#ifdef __clang__
--#pragma clang diagnostic push
--#pragma clang diagnostic ignored "-Wdeprecated-declarations"
--#elif defined(__GNUC__)
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--#endif
-     return XKeycodeToKeysym(dpy, event->keycode, col);
-+}
-+
- #ifdef __clang__
- #pragma clang diagnostic pop
- #elif defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
--}
--
-    /*
-     * Not a public entry point -- XkbTranslateKey is an obsolete name
-     * that is preserved here so that functions linked against the old