Module Name: src
Committed By: mrg
Date: Tue Jul 13 05:53:13 UTC 2021
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libX11: Makefile Makefile.libx11
src/external/mit/xorg/lib/libX11/dynamic: Makefile
src/external/mit/xorg/lib/libX11/static: Makefile
Log Message:
move the i18n modules into libX11 directly.
fixes at least alacritty, and saves memory too.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libX11/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/dynamic/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/static/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.95 src/distrib/sets/lists/xbase/shl.mi:1.96
--- src/distrib/sets/lists/xbase/shl.mi:1.95 Sun Jul 11 00:08:06 2021
+++ src/distrib/sets/lists/xbase/shl.mi Tue Jul 13 05:53:12 2021
@@ -1,25 +1,25 @@
-# $NetBSD: shl.mi,v 1.95 2021/07/11 00:08:06 mrg Exp $
+# $NetBSD: shl.mi,v 1.96 2021/07/13 05:53:12 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
-./usr/X11R7/lib/X11/locale/lib/common/ximcp.so xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xlocale.so xbase-obsolete obsolete
-./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 xbase-obsolete obsolete
-./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 xbase-obsolete obsolete
-./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 xbase-libX11-lib xorg
-./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 xbase-libX11-lib xorg
+./usr/X11R7/lib/X11/locale/lib/common/ximcp.so obsolet obsolete
+./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlocale.so obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 obsolete obsolete
+./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 obsolete obsolete
./usr/X11R7/lib/libEGL.so xbase-libEGL-lib xorg,compatx11file,xorg_glamor
./usr/X11R7/lib/libEGL.so.0 xbase-libEGL-lib xorg,compatx11file,xorg_glamor
./usr/X11R7/lib/libEGL.so.0.0 xbase-libEGL-lib xorg,compatx11file,xorg_glamor
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.62 src/distrib/sets/lists/xdebug/shl.mi:1.63
--- src/distrib/sets/lists/xdebug/shl.mi:1.62 Sun Jul 11 20:48:48 2021
+++ src/distrib/sets/lists/xdebug/shl.mi Tue Jul 13 05:53:12 2021
@@ -1,17 +1,17 @@
-# $NetBSD: shl.mi,v 1.62 2021/07/11 20:48:48 mrg Exp $
+# $NetBSD: shl.mi,v 1.63 2021/07/13 05:53:12 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcUTF8Load.so.2.0.debug xorg,obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlibi18n.so.2.0.debug xorg,obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlocale.so.2.0.debug xorg,obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxomGeneric.so.2.0.debug xorg,obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0.debug xdebug-libX11-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0.debug xdebug-libX11-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0.debug xdebug-libX11-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug xdebug-libX11-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug xdebug-obsolete xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug xdebug-libX11-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcUTF8Load.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlibi18n.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlocale.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxomGeneric.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/ximcp.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/libEGL.so.0.0.debug xdebug-libEGL-debug xorg,debug,compatx11file,xorg_glamor
./usr/libdata/debug/usr/X11R7/lib/libFS.so.7.0.debug xdebug-libFS-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libGL.so.3.0.debug xdebug-libGL-debug xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.14 src/external/mit/xorg/lib/libX11/Makefile:1.15
--- src/external/mit/xorg/lib/libX11/Makefile:1.14 Sun Feb 23 09:10:50 2020
+++ src/external/mit/xorg/lib/libX11/Makefile Tue Jul 13 05:53:12 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/02/23 09:10:50 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2021/07/13 05:53:12 mrg Exp $
.include <bsd.own.mk>
SUBDIR= dynamic .WAIT libX11-xcb static \
- ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric \
extensions
INCS= ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.22 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.23
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.22 Tue Apr 27 06:50:26 2021
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Tue Jul 13 05:53:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.22 2021/04/27 06:50:26 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.23 2021/07/13 05:53:12 mrg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -416,7 +416,9 @@ CMS_DEFINES= -DXCMS -DXCMSDB=\"${X11LIB
CONN_DEFINES= ${X11FLAGS.CONNECTION}
EDB_DEFINES= -DERRORDB=\"${X11LIBDIR}/XErrorDB\"
KDB_DEFINES= -DKEYSYMDB=\"${X11LIBDIR}/XKeysymDB\"
-LC_DYNDEFINES= -DUSE_DYNAMIC_LC
+# Set this to use dynamic i18n support.
+#LC_DYNDEFINES= -DUSE_DYNAMIC_LC
+LC_DYNDEFINES=
OPEN_DEFINES= -I${DESTDIR}${X11INCDIR}/X11/extensions
POLL_DEFINES= -DUSE_POLL
SETID_DEFINES= -DHASSETUGID
Index: src/external/mit/xorg/lib/libX11/dynamic/Makefile
diff -u src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.3 src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.4
--- src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.3 Thu Aug 11 23:15:38 2011
+++ src/external/mit/xorg/lib/libX11/dynamic/Makefile Tue Jul 13 05:53:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/13 05:53:12 mrg Exp $
NOLINT= 1
NOPROFILE= 1
@@ -7,8 +7,20 @@ NOSTATICLIB= 1
.include <bsd.own.mk>
.include "../Makefile.libx11"
-
-SRCS+= XlcDL.c XlcSL.c XDefaultIMIF.c XDefaultOMIF.c
+.include "../Makefile.ximcp"
+.include "../Makefile.xlcDef"
+.include "../Makefile.xlcUTF8Load"
+.include "../Makefile.xlibi18n"
+.include "../Makefile.xomGeneric"
+
+# Set this to use dynamic i18n support.
+#SRCS+= XlcDL.c XlcSL.c
+
+SRCS+= ${SRCS.ximcp} \
+ ${SRCS.xlcDef} \
+ ${SRCS.xlcUTF8Load} \
+ ${SRCS.xlibi18n} \
+ ${SRCS.xomGeneric}
CPPFLAGS.lcInit.c= $(LC_DYNDEFINES)
CPPFLAGS.lcGeneric.c= $(LC_DYNDEFINES)
Index: src/external/mit/xorg/lib/libX11/static/Makefile
diff -u src/external/mit/xorg/lib/libX11/static/Makefile:1.3 src/external/mit/xorg/lib/libX11/static/Makefile:1.4
--- src/external/mit/xorg/lib/libX11/static/Makefile:1.3 Thu Jun 2 22:41:26 2016
+++ src/external/mit/xorg/lib/libX11/static/Makefile Tue Jul 13 05:53:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/02 22:41:26 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/13 05:53:13 mrg Exp $
NOPIC= 1
@@ -18,10 +18,6 @@ SRCS+= \
${SRCS.xlibi18n} \
${SRCS.xomGeneric}
-SRCS+= \
- XlcDL.c \
- XlcSL.c
-
CWARNFLAGS.clang+= -Wno-parentheses
.include <bsd.x11.mk>
