Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/libX11/dist Merge libX11 1.6.10
details: https://anonhg.NetBSD.org/xsrc/rev/c67a54a3d80d
branches: trunk
changeset: 10521:c67a54a3d80d
user: maya <maya%NetBSD.org@localhost>
date: Fri Jul 31 19:29:52 2020 +0000
description:
Merge libX11 1.6.10
diffstat:
external/mit/libX11/dist/m4/libtool.m4 | 33 ++++++++++++++-----
external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre | 33 ++++++++++++++++++++
external/mit/libX11/dist/src/Font.c | 6 +-
external/mit/libX11/dist/src/FontNames.c | 2 +-
external/mit/libX11/dist/src/XlibInt.c | 8 ++--
5 files changed, 65 insertions(+), 17 deletions(-)
diffs (231 lines):
diff -r 7f79005df2d7 -r c67a54a3d80d external/mit/libX11/dist/m4/libtool.m4
--- a/external/mit/libX11/dist/m4/libtool.m4 Fri Jul 31 19:19:33 2020 +0000
+++ b/external/mit/libX11/dist/m4/libtool.m4 Fri Jul 31 19:29:52 2020 +0000
@@ -728,7 +728,6 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -2867,9 +2866,6 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2878,7 +2874,7 @@
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[
]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2890,6 +2886,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3549,7 +3557,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4427,7 +4435,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4939,6 +4947,9 @@
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5001,6 +5012,9 @@
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5255,7 +5269,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5776,6 +5790,7 @@
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"`
$wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry
$output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry
$output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -5797,7 +5812,7 @@
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
diff -r 7f79005df2d7 -r c67a54a3d80d external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
--- a/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Fri Jul 31 19:19:33 2020 +0000
+++ b/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Fri Jul 31 19:29:52 2020 +0000
@@ -5851,6 +5851,39 @@
<dead_circumflex> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
+<dead_acute> <Cyrillic_yeru> : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_yeru> : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_yeru> : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
+
+<dead_acute> <Cyrillic_YERU> : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_YERU> : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_YERU> : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
+
+<dead_acute> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
+
+<dead_acute> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
+
+<dead_acute> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
+
+<dead_acute> <Cyrillic_YU> : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_YU> : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_YU> : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
+
+<dead_acute> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
+
+<dead_acute> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
+<Multi_key> <acute> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
+<Multi_key> <apostrophe> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
+
+
XCOMM APL support Geoff Streeter 2012-01-04
XCOMM APL was initially an overstruck language. The original APL terminal was an IBM golfball
diff -r 7f79005df2d7 -r c67a54a3d80d external/mit/libX11/dist/src/Font.c
--- a/external/mit/libX11/dist/src/Font.c Fri Jul 31 19:19:33 2020 +0000
+++ b/external/mit/libX11/dist/src/Font.c Fri Jul 31 19:29:52 2020 +0000
@@ -107,7 +107,7 @@
LockDisplay(dpy);
GetReq(OpenFont, req);
seq = dpy->request; /* Can't use extended sequence number here */
- nbytes = req->nbytes = name ? strlen(name) : 0;
+ nbytes = req->nbytes = (CARD16) (name ? strlen(name) : 0);
req->fid = fid = XAllocID(dpy);
req->length += (nbytes+3)>>2;
Data (dpy, name, nbytes);
@@ -662,7 +662,7 @@
if (!name)
return 0;
- l = strlen(name);
+ l = (int) strlen(name);
if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-')
return 0;
charset = NULL;
@@ -679,7 +679,7 @@
return 0;
if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
return 0;
- if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+ if (strlen(p + 1) + (size_t) l - 1 >= sizeof(buf) - 1)
return 0;
strcpy(buf, name);
strcpy(buf + l - 1, p + 1);
diff -r 7f79005df2d7 -r c67a54a3d80d external/mit/libX11/dist/src/FontNames.c
--- a/external/mit/libX11/dist/src/FontNames.c Fri Jul 31 19:19:33 2020 +0000
+++ b/external/mit/libX11/dist/src/FontNames.c Fri Jul 31 19:29:52 2020 +0000
@@ -54,7 +54,7 @@
LockDisplay(dpy);
GetReq(ListFonts, req);
req->maxNames = maxNames;
- nbytes = req->nbytes = pattern ? strlen (pattern) : 0;
+ nbytes = req->nbytes = pattern ? (CARD16) strlen (pattern) : 0;
req->length += (nbytes + 3) >> 2;
_XSend (dpy, pattern, nbytes);
/* use _XSend instead of Data, since following _XReply will flush buffer */
diff -r 7f79005df2d7 -r c67a54a3d80d external/mit/libX11/dist/src/XlibInt.c
--- a/external/mit/libX11/dist/src/XlibInt.c Fri Jul 31 19:19:33 2020 +0000
+++ b/external/mit/libX11/dist/src/XlibInt.c Fri Jul 31 19:29:52 2020 +0000
@@ -188,7 +188,7 @@
static int sync_hazard(Display *dpy)
{
/*
- * "span" and "hazard" need to be signed such that the ">=" comparision
+ * "span" and "hazard" need to be signed such that the ">=" comparison
* works correctly in the case that hazard is greater than 65525
*/
int64_t span = X_DPY_GET_REQUEST(dpy) - X_DPY_GET_LAST_REQUEST_READ(dpy);
@@ -1708,9 +1708,9 @@
return 0;
uname (&name);
- len = strlen (name.nodename);
+ len = (int) strlen (name.nodename);
if (len >= maxlen) len = maxlen - 1;
- strncpy (buf, name.nodename, len);
+ strncpy (buf, name.nodename, (size_t) len);
buf[len] = '\0';
#else
if (maxlen <= 0 || buf == NULL)
@@ -1719,7 +1719,7 @@
buf[0] = '\0';
(void) gethostname (buf, maxlen);
buf [maxlen - 1] = '\0';
- len = strlen(buf);
+ len = (int) strlen(buf);
#endif /* NEED_UTSNAME */
return len;
}
Home |
Main Index |
Thread Index |
Old Index