CVS commit: pkgsrc/x11/libX11

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Jul 15 23:23:35 UTC 2022

Modified Files:
        pkgsrc/x11/libX11: distinfo
        pkgsrc/x11/libX11/patches: patch-aa patch-ac

Log Message:
libX11: report the thread safety constructor build state (NFC)

1.8 added a feature (--enable-thread-safety-constructor) which is
enabled by default and can cause issues like hangs with X11 clients
that aren't coded properly. (This affects more than one DE in pkgsrc.)
When the feature was added, it didn't include any output from configure
itself that reports what the state of the option is set to.

No change to package defaults or resulting binaries, this is just for
informational purposes for anyone else dealing with this, should they
want to disable the setting, or just recognize what state the build
used.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/libX11/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libX11/patches/patch-aa
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libX11/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libX11/distinfo
diff -u pkgsrc/x11/libX11/distinfo:1.45 pkgsrc/x11/libX11/distinfo:1.46
--- pkgsrc/x11/libX11/distinfo:1.45     Sun Jul  3 09:44:13 2022
+++ pkgsrc/x11/libX11/distinfo  Fri Jul 15 23:23:35 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.45 2022/07/03 09:44:13 wiz Exp $
+$NetBSD: distinfo,v 1.46 2022/07/15 23:23:35 gutteridge 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) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
-SHA1 (patch-ac) = 84bad85defd7cdac82fe4448d723c80469507f73
+SHA1 (patch-aa) = ef0a21e981fae2a00385f484ba9cd3bee744d526
+SHA1 (patch-ac) = 0e2ba47dd7dc27d67bd00337ff40e2da089fd1ee
 SHA1 (patch-src_xkb_XKBBind.c) = 3ad94bd3265c3c4a85bcf3e2da0782c16fd461d1

Index: pkgsrc/x11/libX11/patches/patch-aa
diff -u pkgsrc/x11/libX11/patches/patch-aa:1.12 pkgsrc/x11/libX11/patches/patch-aa:1.13
--- pkgsrc/x11/libX11/patches/patch-aa:1.12     Tue Mar 10 07:16:26 2015
+++ pkgsrc/x11/libX11/patches/patch-aa  Fri Jul 15 23:23:35 2022
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.12 2015/03/10 07:16:26 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2022/07/15 23:23:35 gutteridge Exp $
 
 Include pthread.h as thread stubs might be macros like on NetBSD.
 
 Define conditional for cross-compiling support.
 
---- configure.ac.orig  2013-09-09 01:37:20.000000000 +0000
+Indicate whether the thread safety constructor is enabled. (This can cause
+issues with X clients that aren't coded correctly.)
+
+--- configure.ac.orig  2022-06-09 01:06:45.000000000 +0000
 +++ configure.ac
-@@ -276,7 +276,7 @@ xyes)
+@@ -222,7 +222,7 @@ xyes)
        ;;
  esac
  
@@ -15,7 +18,7 @@ Define conditional for cross-compiling s
  AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
  
  # XXX incomplete, please fill this in
-@@ -285,12 +285,12 @@ if test x$xthreads = xyes ; then
+@@ -231,12 +231,12 @@ if test x$xthreads = xyes ; then
      linux*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
@@ -31,3 +34,11 @@ Define conditional for cross-compiling s
          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

Index: pkgsrc/x11/libX11/patches/patch-ac
diff -u pkgsrc/x11/libX11/patches/patch-ac:1.14 pkgsrc/x11/libX11/patches/patch-ac:1.15
--- pkgsrc/x11/libX11/patches/patch-ac:1.14     Sun Jun  6 21:05:08 2021
+++ pkgsrc/x11/libX11/patches/patch-ac  Fri Jul 15 23:23:35 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.14 2021/06/06 21:05:08 wiz Exp $
+$NetBSD: patch-ac,v 1.15 2022/07/15 23:23:35 gutteridge Exp $
 
 See patch-aa.
 
---- configure.orig     2021-06-06 16:49:01.000000000 +0000
+--- configure.orig     2022-06-09 01:06:54.000000000 +0000
 +++ configure
-@@ -22009,42 +22009,16 @@ printf "%s\n" "#define XUSE_MTSAFE_API 1
+@@ -22170,42 +22170,16 @@ printf "%s\n" "#define XUSE_MTSAFE_API 1
        ;;
  esac
  
@@ -54,7 +54,7 @@ See patch-aa.
  then :
    thrstubs="no"
  else $as_nop
-@@ -22066,12 +22040,12 @@ if test x$xthreads = xyes ; then
+@@ -22227,12 +22201,12 @@ if test x$xthreads = xyes ; then
      linux*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
@@ -70,3 +70,11 @@ See patch-aa.
          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