Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src move the i18n modules into libX11 directly.
details: https://anonhg.NetBSD.org/src/rev/392899770d26
branches: trunk
changeset: 984598:392899770d26
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Jul 13 05:53:12 2021 +0000
description:
move the i18n modules into libX11 directly.
fixes at least alacritty, and saves memory too.
diffstat:
distrib/sets/lists/xbase/shl.mi | 38 +++++++++++++-------------
distrib/sets/lists/xdebug/shl.mi | 26 +++++++++---------
external/mit/xorg/lib/libX11/Makefile | 3 +-
external/mit/xorg/lib/libX11/Makefile.libx11 | 6 ++-
external/mit/xorg/lib/libX11/dynamic/Makefile | 16 +++++++++-
external/mit/xorg/lib/libX11/static/Makefile | 6 +---
6 files changed, 52 insertions(+), 43 deletions(-)
diffs (167 lines):
diff -r 0c5300846978 -r 392899770d26 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Tue Jul 13 05:22:27 2021 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Tue Jul 13 05:53:12 2021 +0000
@@ -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
diff -r 0c5300846978 -r 392899770d26 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi Tue Jul 13 05:22:27 2021 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi Tue Jul 13 05:53:12 2021 +0000
@@ -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
diff -r 0c5300846978 -r 392899770d26 external/mit/xorg/lib/libX11/Makefile
--- a/external/mit/xorg/lib/libX11/Makefile Tue Jul 13 05:22:27 2021 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile Tue Jul 13 05:53:12 2021 +0000
@@ -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 \
diff -r 0c5300846978 -r 392899770d26 external/mit/xorg/lib/libX11/Makefile.libx11
--- a/external/mit/xorg/lib/libX11/Makefile.libx11 Tue Jul 13 05:22:27 2021 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile.libx11 Tue Jul 13 05:53:12 2021 +0000
@@ -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 @@
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
diff -r 0c5300846978 -r 392899770d26 external/mit/xorg/lib/libX11/dynamic/Makefile
--- a/external/mit/xorg/lib/libX11/dynamic/Makefile Tue Jul 13 05:22:27 2021 +0000
+++ b/external/mit/xorg/lib/libX11/dynamic/Makefile Tue Jul 13 05:53:12 2021 +0000
@@ -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 @@
.include <bsd.own.mk>
.include "../Makefile.libx11"
+.include "../Makefile.ximcp"
+.include "../Makefile.xlcDef"
+.include "../Makefile.xlcUTF8Load"
+.include "../Makefile.xlibi18n"
+.include "../Makefile.xomGeneric"
-SRCS+= XlcDL.c XlcSL.c XDefaultIMIF.c XDefaultOMIF.c
+# 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)
diff -r 0c5300846978 -r 392899770d26 external/mit/xorg/lib/libX11/static/Makefile
--- a/external/mit/xorg/lib/libX11/static/Makefile Tue Jul 13 05:22:27 2021 +0000
+++ b/external/mit/xorg/lib/libX11/static/Makefile Tue Jul 13 05:53:12 2021 +0000
@@ -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.xlibi18n} \
${SRCS.xomGeneric}
-SRCS+= \
- XlcDL.c \
- XlcSL.c
-
CWARNFLAGS.clang+= -Wno-parentheses
.include <bsd.x11.mk>
Home |
Main Index |
Thread Index |
Old Index