Module Name:src
Committed By: martin
Date: Wed Aug 5 14:16:41 UTC 2020
Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-8]: Makefile Makefile.libx11
Makefile.ximcp Makefile.xlibi18n
Added Files:
src/external/mit/xorg/lib/libX11/extensions [netbsd-8]: Makefile
Log Message:
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.libx11up 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.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.8.1 src/external/mit/xorg/lib/libX11/Makefile
cvs rdiff -u -r1.18 -r1.18.4.1 \
src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/lib/libX11/Makefile.ximcp
cvs rdiff -u -r1.2 -r1.2.8.1 \
src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
cvs rdiff -u -r0 -r1.2.6.2 \
src/external/mit/xorg/lib/libX11/extensions/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.13 src/external/mit/xorg/lib/libX11/Makefile:1.13.8.1
--- src/external/mit/xorg/lib/libX11/Makefile:1.13 Sun Jul 19 08:18:32 2015
+++ src/external/mit/xorg/lib/libX11/Makefile Wed Aug 5 14:16:41 2020
@@ -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
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 \
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18.4.1
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18 Thu Feb 16 01:02:28 2017
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Wed Aug 5 14:16:41 2020
@@ -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_SOCKLEN_T -DHAVE_STDLI
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+= \
Index: src/external/mit/xorg/lib/libX11/Makefile.ximcp
diff -u src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4 src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4.8.1
--- src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4 Mon Jun 13 20:03:07 2016
+++ src/external/mit/xorg/lib/libX11/Makefile.ximcp Wed Aug 5 14:16:41 2020
@@ -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 @@ CPPFLAGS+= \
-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}
Index: src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2.8.1
--- src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2 Thu Jun 2 22:41:26 2016
+++ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n Wed Aug 5 14:16:41 2020
@@ -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+= \
CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
+
+COPTS.lcGenConv.c+= ${GCC_NO_STRINGOP_OVERFLOW}
Added files:
Index: src/external/mit/xorg/lib/libX11/extensions/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libX11/extensions/Makefile:1.2.6.2
--- /dev/null Wed Aug 5 14:16:41 2020
+++
