[src/netbsd-8]: src/external/mit/xorg/lib/libX11 Sync external/mit/xorg/lib/l...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0b2c0b3dc240
branches:  netbsd-8
changeset: 936813:0b2c0b3dc240
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Aug 05 14:16:41 2020 +0000

description:
Sync external/mit/xorg/lib/libX11 with current, requested by maya in
ticket #1582:

        external/mit/xorg/lib/libX11/extensions/Makefile up to 1.2
        external/mit/xorg/lib/libX11/Makefile           up to 1.14
        external/mit/xorg/lib/libX11/Makefile.libx11    up to 1.19
        external/mit/xorg/lib/libX11/Makefile.ximcp     up to 1.5
        external/mit/xorg/lib/libX11/Makefile.xlibi18n  up to 1.3

Update libX11 from 1.6.5 to 1.6.10.

diffstat:

 external/mit/xorg/lib/libX11/Makefile            |   5 +++--
 external/mit/xorg/lib/libX11/Makefile.libx11     |   6 +++++-
 external/mit/xorg/lib/libX11/Makefile.ximcp      |  14 ++++++++------
 external/mit/xorg/lib/libX11/Makefile.xlibi18n   |   4 +++-
 external/mit/xorg/lib/libX11/extensions/Makefile |  12 ++++++++++++
 5 files changed, 31 insertions(+), 10 deletions(-)

diffs (92 lines):

diff -r 458e3ffef208 -r 0b2c0b3dc240 external/mit/xorg/lib/libX11/Makefile
--- a/external/mit/xorg/lib/libX11/Makefile     Sun Aug 02 09:15:57 2020 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile     Wed Aug 05 14:16:41 2020 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile,v 1.13 2015/07/19 08:18:32 mrg Exp $
+#      $NetBSD: Makefile,v 1.13.8.1 2020/08/05 14:16:41 martin Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=                dynamic .WAIT libX11-xcb static \
-               ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric
+               ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric \
+               extensions
 
 INCS=          ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \
                Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \
diff -r 458e3ffef208 -r 0b2c0b3dc240 external/mit/xorg/lib/libX11/Makefile.libx11
--- a/external/mit/xorg/lib/libX11/Makefile.libx11      Sun Aug 02 09:15:57 2020 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.libx11      Wed Aug 05 14:16:41 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.libx11,v 1.18 2017/02/16 01:02:28 rin Exp $
+#      $NetBSD: Makefile.libx11,v 1.18.4.1 2020/08/05 14:16:41 martin Exp $
 
 LIB=   X11
 .PATH: ${X11SRCDIR.${LIB}}/src
@@ -402,6 +402,10 @@
 CPPFLAGS+=     -DHAVE_STRING_H -DHAVE_STRTOL -DHAVE_SYS_PARAM_H
 CPPFLAGS+=     -DHAVE_SYS_SELECT_H -DHAVE_SYS_STAT_H -DHAVE_SYS_TYPES_H
 CPPFLAGS+=     -DHAVE_UNISTD_H
+CPPFLAGS+=     -DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE_STRTOL
+CPPFLAGS+=     -DHAVE_SYS_FILIO_H -DHAVE_SYS_IOCTL_H -DHAVE_SYS_SOCKET_H
+
+CPPFLAGS+=     -DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
 
 CPPFLAGS+=     -DUSE_XCB
 SRCS+= \
diff -r 458e3ffef208 -r 0b2c0b3dc240 external/mit/xorg/lib/libX11/Makefile.ximcp
--- a/external/mit/xorg/lib/libX11/Makefile.ximcp       Sun Aug 02 09:15:57 2020 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.ximcp       Wed Aug 05 14:16:41 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.4 2016/06/13 20:03:07 ryoon Exp $
+# $NetBSD: Makefile.ximcp,v 1.4.8.1 2020/08/05 14:16:41 martin Exp $
 
 .PATH: ${X11SRCDIR.X11}/modules/im/ximcp
 SRCS.ximcp= \
@@ -39,8 +39,10 @@
        -DTRANS_CLIENT \
        -DHASXDMAUTH
 
-CPPFLAGS.imDefLkup.c=  -Wno-error
-CPPFLAGS.imRm.c=       -Wno-error
-CPPFLAGS.imTrans.c=    -Wno-error
-CPPFLAGS.imLcLkup.c=   -Wno-stack-protector
-CPPFLAGS.imInsClbk.c=  -Wno-unused-value
+COPTS.imDefLkup.c=     -Wno-error
+COPTS.imRm.c=  -Wno-error
+COPTS.imTrans.c=       -Wno-error
+COPTS.imLcLkup.c=      -Wno-stack-protector
+COPTS.imInsClbk.c=     -Wno-unused-value
+
+COPTS.imDefIm.c=       ${GCC_NO_STRINGOP_OVERFLOW}
diff -r 458e3ffef208 -r 0b2c0b3dc240 external/mit/xorg/lib/libX11/Makefile.xlibi18n
--- a/external/mit/xorg/lib/libX11/Makefile.xlibi18n    Sun Aug 02 09:15:57 2020 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.xlibi18n    Wed Aug 05 14:16:41 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.2 2016/06/02 22:41:26 mrg Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.2.8.1 2020/08/05 14:16:41 martin Exp $
 
 .PATH:         ${X11SRCDIR.X11}/modules/lc/gen
 SRCS.xlibi18n= lcGenConv.c
@@ -10,3 +10,5 @@
 CPPFLAGS+= \
        ${XLOCALE.DEFINES} \
        -DHASXDMAUTH
+
+COPTS.lcGenConv.c+=    ${GCC_NO_STRINGOP_OVERFLOW}
diff -r 458e3ffef208 -r 0b2c0b3dc240 external/mit/xorg/lib/libX11/extensions/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libX11/extensions/Makefile  Wed Aug 05 14:16:41 2020 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.2.6.2 2020/08/05 14:16:41 martin Exp $
+
+NOPROG=        yes
+
+INCS=  XKBgeom.h
+INCSDIR=${X11INCDIR}/X11/extensions
+
+.include <bsd.x11.mk>
+
+.PATH:         ${X11SRCDIR.X11}/include/X11/extensions
+
+.include <bsd.prog.mk>