various updates for libX11. bump the shlib major, install new nls.
This commit is contained in:
parent
fd3b4ea72e
commit
69931024b9
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
# $NetBSD: shl.mi,v 1.93 2021/04/27 03:09:15 mrg Exp $
|
||||
# $NetBSD: shl.mi,v 1.94 2021/04/27 06:50:27 mrg Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
@ -49,7 +49,7 @@
|
||||
./usr/X11R7/lib/libX11-xcb.so.1.0 xbase-libX11-lib xorg,compatx11file
|
||||
./usr/X11R7/lib/libX11.so xbase-libX11-lib xorg,compatx11file
|
||||
./usr/X11R7/lib/libX11.so.7 xbase-libX11-lib xorg,compatx11file
|
||||
./usr/X11R7/lib/libX11.so.7.0 xbase-libX11-lib xorg,compatx11file
|
||||
./usr/X11R7/lib/libX11.so.7.1 xbase-libX11-lib xorg,compatx11file
|
||||
./usr/X11R7/lib/libXRes.so xbase-libXres-lib xorg,compatx11file
|
||||
./usr/X11R7/lib/libXRes.so.2 xbase-libXres-lib xorg,compatx11file
|
||||
./usr/X11R7/lib/libXRes.so.2.0 xbase-libXres-lib xorg,compatx11file
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: shl.mi,v 1.59 2021/04/27 03:09:16 mrg Exp $
|
||||
# $NetBSD: shl.mi,v 1.60 2021/04/27 06:50:27 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
|
||||
@ -21,7 +21,7 @@
|
||||
./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug xdebug-obsolete xorg,obsolete,compatx11file
|
||||
./usr/libdata/debug/usr/X11R7/lib/libSM.so.7.0.debug xdebug-libSM-debug xorg,debug,compatx11file
|
||||
./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug xdebug-libX11-debug xorg,debug,compatx11file
|
||||
./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug xdebug-libX11-debug xorg,debug,compatx11file
|
||||
./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.1.debug xdebug-libX11-debug xorg,debug,compatx11file
|
||||
./usr/libdata/debug/usr/X11R7/lib/libXRes.so.2.0.debug xdebug-libXres-debug xorg,debug,compatx11file
|
||||
./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug xdebug-obsolete xorg,obsolete
|
||||
./usr/libdata/debug/usr/X11R7/lib/libXau.so.7.0.debug xdebug-libXau-debug xorg,debug,compatx11file
|
||||
|
4
external/mit/xorg/lib/libX11/Makefile.libx11
vendored
4
external/mit/xorg/lib/libX11/Makefile.libx11
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.libx11,v 1.21 2020/09/16 10:02:22 nia Exp $
|
||||
# $NetBSD: Makefile.libx11,v 1.22 2021/04/27 06:50:26 mrg Exp $
|
||||
|
||||
LIB= X11
|
||||
.PATH: ${X11SRCDIR.${LIB}}/src
|
||||
@ -404,8 +404,8 @@ 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+= -DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE___BUILTIN_POPCOUNTL
|
||||
|
||||
CPPFLAGS+= -DUSE_XCB
|
||||
SRCS+= \
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
|
||||
# $NetBSD: shlib_version,v 1.3 2021/04/27 06:50:26 mrg Exp $
|
||||
#
|
||||
major=7
|
||||
minor=0
|
||||
minor=1
|
||||
|
6
external/mit/xorg/share/nls/Makefile
vendored
6
external/mit/xorg/share/nls/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2016/10/04 23:52:02 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2021/04/27 06:50:26 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -19,7 +19,7 @@ SUBDIR= \
|
||||
pt_BR.UTF-8 \
|
||||
pt_PT.UTF-8 \
|
||||
ru_RU.UTF-8 \
|
||||
sr_CS.UTF-8 \
|
||||
sr_RS.UTF-8 \
|
||||
tatar-cyr th_TH th_TH.UTF-8 tscii-0 \
|
||||
vi_VN.tcvn vi_VN.viscii \
|
||||
zh_CN zh_CN.UTF-8 zh_CN.gb18030 zh_CN.gbk zh_HK.UTF-8 \
|
||||
@ -62,6 +62,6 @@ realall: ${FILES}
|
||||
build_subdirs:
|
||||
.for _dir in ${SUBDIR}
|
||||
mkdir ${.CURDIR}/${_dir}
|
||||
printf '# $$NetBSD: Makefile,v 1.5 2016/10/04 23:52:02 mrg Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
|
||||
printf '# $$NetBSD: Makefile,v 1.6 2021/04/27 06:50:26 mrg Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
|
||||
|
||||
.endfor
|
||||
|
@ -1,5 +0,0 @@
|
||||
# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
|
||||
|
||||
NLS_SUBDIR= sr_CS.UTF-8
|
||||
|
||||
.include "../Makefile.nls"
|
5
external/mit/xorg/share/nls/sr_RS.UTF-8/Makefile
vendored
Normal file
5
external/mit/xorg/share/nls/sr_RS.UTF-8/Makefile
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
# $NetBSD: Makefile,v 1.1 2021/04/27 06:50:26 mrg Exp $
|
||||
|
||||
NLS_SUBDIR= sr_RS.UTF-8
|
||||
|
||||
.include "../Makefile.nls"
|
Loading…
Reference in New Issue
Block a user