[pkgsrc/trunk]: pkgsrc/x11/libX11 libX11: update to 1.8.2.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0efdf91eaa1d
branches:  trunk
changeset: 387937:0efdf91eaa1d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Nov 10 21:29:16 2022 +0000

description:
libX11: update to 1.8.2.

This is primarily a bug fix release, including further work on improving
the thread-safety-constructor and making it work with software which had
incorrectly called libX11 functions from inside X*IfEvent() calls.

Highlights:

 * Allow X*IfEvent() to reenter libX11 to avoid deadlock from unsafe
   calls when thread-safety-constructor is enabled (!150).
 * Remove Xlib's pthread function stubs - instead use system provided
   threads functions, including linking against any needed pthread
   libraries if thread-safety-constructor is enabled (!155, !156).
 * Fix off-by-one error in XKeycodeToKeysym for indexes > 3 (!78).
 * Allow XNSpotLocation with OnTheSpot (!127).
 * Fix Win32 build when -fno-common is in effect (!140).
 * Fix memory leak in XRegisterIMInstantiateCallback (!158).
 * Add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ (!144),
   Samogitian E with dot above and macron (!147), Unicode minus sign (!163).
 * Change <Compose> <^> <-> to mean superscript minus instead of macron (!162).
 * Delete compose sequences that mix top-row digits with numpad digits (!139)
   or mix upper & lower case letters (!144).
 * Delete some unuseful compose sequences meant for Bépo layout (!146).
 * Delete compose sequences using leftcaret & rightcaret keysyms (!163).
 * Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE (!148).
 * Map sr locales to sr_RS compose files (!161).

Complete changelog:

Adam Jackson (1):
      Allow X*IfEvent() to reenter libX11

Adam Sampson (1):
      xkb: Fix off-by-one error in XKeycodeToKeysym

Alan Coopersmith (11):
      xkb: set num_keys when filling in keys in _XkbReadGetNamesReply()
      doc: Document possible return values for XkbGetKeyboard()
      gitlab CI: stop requiring Signed-off-by in commits
      If thread-safety-constructor is enabled, link against pthreads not stubs
      Use same pthread-stubs as libxcb
      COPYING: remove notice for the removed UIThrStubs.c
      Copyright & license cleanup
      man pages: document XCloseIM frees its argument
      Remove NEWS file which only covered 2006 & 2007 releases
      README.md: Add 1.8.2 changes
      libX11 1.8.2

Benno Schulenberg (13):
      nls: delete compose sequences that mix top-row digits with numpad digits
      docs: hard-wrap some items so that Table 2 fits within 80 characters
      docs: remove the unsightly dashes from the overviews of arguments
      docs: replace three placeholders with something that makes sense
      nls: delete some pointless and wrong compose sequences meant for Bépo
      nls: add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ
      nls: delete eight sequences that pointlessly mix upper and lower case
      nls: add four sequences for the Samogitian E with dot above and macron
      nls: delete two compose sequences with an anomalous post-fixed breve
      nls: change <Compose> <^> <-> to mean superscript minus instead of macron
      nls: let `<Multi_key> <minus> <underscore>` compose U+2212 (MINUS SIGN)
      nls: remove two compose sequences that use deprecated symbols
      nls: reshuffle a few compose sequences, to have similar ones together

David H. Gutteridge (1):
      configure.ac: report thread safety constructor build status

Jan Tojnar (1):
      nls: Map sr locales to sr_RS compose files

Jon Turney (1):
      Fix Win32 build with -fno-common

Kirill Chibisov (1):
      ximcp/imRm.c: allow XNSpotLocation with OnTheSpot

Matthieu Herrb (1):
      Mention that the predicate function is called with the display lock

Mike FABIAN (1):
      Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE

Po Lu (1):
      specs: document change in XIMPreeditCallbacks

Thomas E. Dickey (4):
      reduce compiler warnings for macros BufAlloc, Data and Data32 using casts
      use casts to reduce compiler warnings (no object change)
      reduce compiler warnings with casts (no object change)
      fix a memory leak in XRegisterIMInstantiateCallback

diffstat:

 x11/libX11/Makefile         |   4 +-
 x11/libX11/distinfo         |  11 ++---
 x11/libX11/patches/patch-aa |  45 -------------------------
 x11/libX11/patches/patch-ac |  80 ---------------------------------------------
 4 files changed, 6 insertions(+), 134 deletions(-)

diffs (162 lines):

diff -r e2babf999427 -r 0efdf91eaa1d x11/libX11/Makefile
--- a/x11/libX11/Makefile       Thu Nov 10 21:12:54 2022 +0000
+++ b/x11/libX11/Makefile       Thu Nov 10 21:29:16 2022 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2022/11/09 13:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.68 2022/11/10 21:29:16 wiz Exp $
 
-DISTNAME=              libX11-1.8.1
+DISTNAME=              libX11-1.8.2
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.xz
diff -r e2babf999427 -r 0efdf91eaa1d x11/libX11/distinfo
--- a/x11/libX11/distinfo       Thu Nov 10 21:12:54 2022 +0000
+++ b/x11/libX11/distinfo       Thu Nov 10 21:29:16 2022 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.47 2022/07/26 02:19:03 gutteridge Exp $
+$NetBSD: distinfo,v 1.48 2022/11/10 21:29:16 wiz Exp $
 
-BLAKE2s (libX11-1.8.1.tar.xz) = 8831709e8031c28605a474ec1c19a2addfde87e84ce191e7ab49100ef65c930e
-SHA512 (libX11-1.8.1.tar.xz) = 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
-Size (libX11-1.8.1.tar.xz) = 1818460 bytes
-SHA1 (patch-Makefile.in) = 54faa0431bdb8a1e4fed5459bff03a316eb174c8
-SHA1 (patch-aa) = e64c39612c9470d3ec057c9c3897d463d4e60768
-SHA1 (patch-ac) = 0e2ba47dd7dc27d67bd00337ff40e2da089fd1ee
+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) = 3ad94bd3265c3c4a85bcf3e2da0782c16fd461d1
diff -r e2babf999427 -r 0efdf91eaa1d x11/libX11/patches/patch-aa
--- a/x11/libX11/patches/patch-aa       Thu Nov 10 21:12:54 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2022/07/26 02:19:03 gutteridge Exp $
-
-Include pthread.h as thread stubs might be macros like on NetBSD.
-
-Define conditional for cross-compiling support.
-
-Indicate whether the thread safety constructor is enabled. (This can cause
-issues with X clients that aren't coded correctly.)
-https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/149
-
---- configure.ac.orig  2022-06-09 01:06:45.000000000 +0000
-+++ configure.ac
-@@ -222,7 +222,7 @@ xyes)
-       ;;
- esac
- 
--AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"])
-+AC_CHECK_DECLS([pthread_self], [thrstubs="no"], [thrstubs="yes"], [[#include <pthread.h>]])
- AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
- 
- # XXX incomplete, please fill this in
-@@ -231,12 +231,12 @@ if test x$xthreads = xyes ; then
-     linux*|gnu*|k*bsd*-gnu)
-         XTHREADLIB=-lpthread ;;
-     netbsd*)
--      XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
--      XTHREADLIB="-lpthread" ;;
-+      XTHREAD_CFLAGS="-D_REENTRANT"
-+      XTHREADLIB="-pthread" ;;
-     freebsd*)
-         XTHREAD_CFLAGS="-D_THREAD_SAFE"
-         XTHREADLIB="-pthread" ;;
--    dragonfly*|openbsd*)
-+    dragonfly*|openbsd*|mirbsd*)
-         XTHREADLIB="-pthread" ;;
-     solaris*)
-       XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
-@@ -437,6 +437,7 @@ echo " Loadable i18n module support:
- echo " Loadable xcursor library support:        "$XLIB_LOADABLE_XCURSOR
- echo " Threading support:                       "$xthreads
- echo " Use Threads safe API:                    "$mtsafeapi
-+echo " Use thread safety constructor:           "$USE_THREAD_SAFETY_CONSTRUCTOR
- echo " Threads stubs in libX11:                 "$thrstubs
- echo " XCMS:                                    "$XCMS
- echo " Internationalization support:            "$XLOCALE
diff -r e2babf999427 -r 0efdf91eaa1d x11/libX11/patches/patch-ac
--- a/x11/libX11/patches/patch-ac       Thu Nov 10 21:12:54 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-ac,v 1.15 2022/07/15 23:23:35 gutteridge Exp $
-
-See patch-aa.
-
---- configure.orig     2022-06-09 01:06:54.000000000 +0000
-+++ configure
-@@ -22170,42 +22170,16 @@ printf "%s\n" "#define XUSE_MTSAFE_API 1
-       ;;
- esac
- 
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5
--printf %s "checking for pthread_self in -lc... " >&6; }
--if test ${ac_cv_lib_c_pthread_self+y}
-+ac_fn_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include <pthread.h>
-+" "$ac_c_undeclared_builtin_options" "CFLAGS"
-+if test "x$ac_cv_have_decl_pthread_self" = xyes
- then :
--  printf %s "(cached) " >&6
-+  ac_have_decl=1
- else $as_nop
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lc  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--char pthread_self ();
--int
--main (void)
--{
--return pthread_self ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"
--then :
--  ac_cv_lib_c_pthread_self=yes
--else $as_nop
--  ac_cv_lib_c_pthread_self=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.beam \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+  ac_have_decl=0
- fi
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5
--printf "%s\n" "$ac_cv_lib_c_pthread_self" >&6; }
--if test "x$ac_cv_lib_c_pthread_self" = xyes
-+printf "%s\n" "#define HAVE_DECL_PTHREAD_SELF $ac_have_decl" >>confdefs.h
-+if test $ac_have_decl = 1
- then :
-   thrstubs="no"
- else $as_nop
-@@ -22227,12 +22201,12 @@ if test x$xthreads = xyes ; then
-     linux*|gnu*|k*bsd*-gnu)
-         XTHREADLIB=-lpthread ;;
-     netbsd*)
--      XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
--      XTHREADLIB="-lpthread" ;;
-+      XTHREAD_CFLAGS="-D_REENTRANT"
-+      XTHREADLIB="-pthread" ;;
-     freebsd*)
-         XTHREAD_CFLAGS="-D_THREAD_SAFE"
-         XTHREADLIB="-pthread" ;;
--    dragonfly*|openbsd*)
-+    dragonfly*|openbsd*|mirbsd*)
-         XTHREADLIB="-pthread" ;;
-     solaris*)
-       XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
-@@ -25521,6 +25497,7 @@ echo " Loadable i18n module support:
- echo " Loadable xcursor library support:        "$XLIB_LOADABLE_XCURSOR
- echo " Threading support:                       "$xthreads
- echo " Use Threads safe API:                    "$mtsafeapi
-+echo " Use thread safety constructor:           "$USE_THREAD_SAFETY_CONSTRUCTOR
- echo " Threads stubs in libX11:                 "$thrstubs
- echo " XCMS:                                    "$XCMS
- echo " Internationalization support:            "$XLOCALE