Module Name: xsrc
Committed By: mrg
Date: Sun Nov 17 21:16:11 UTC 2024
Modified Files:
xsrc/external/mit/libXt/dist/m4: libtool.m4
xsrc/external/mit/libXt/dist/src: NextEvent.c ResConfig.c TMparse.c
Removed Files:
xsrc/external/mit/libXt/dist/src: sharedlib.c
Log Message:
merge libXt 1.3.1.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXt/dist/m4/libtool.m4
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libXt/dist/src/NextEvent.c \
xsrc/external/mit/libXt/dist/src/TMparse.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libXt/dist/src/ResConfig.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libXt/dist/src/sharedlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXt/dist/m4/libtool.m4
diff -u xsrc/external/mit/libXt/dist/m4/libtool.m4:1.5 xsrc/external/mit/libXt/dist/m4/libtool.m4:1.6
--- xsrc/external/mit/libXt/dist/m4/libtool.m4:1.5 Mon Jun 19 06:44:23 2023
+++ xsrc/external/mit/libXt/dist/m4/libtool.m4 Sun Nov 17 21:16:11 2024
@@ -1415,10 +1415,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*linux*)
+ powerpcle-*linux*|powerpc64le-*linux*)
LD="${LD-ld} -m elf64lppc"
;;
- powerpc-*linux*)
+ powerpc-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -2656,11 +2656,11 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext'
soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
@@ -2686,7 +2686,14 @@ freebsd* | dragonfly* | midnightbsd*)
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
@@ -2698,6 +2705,12 @@ freebsd* | dragonfly* | midnightbsd*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
Index: xsrc/external/mit/libXt/dist/src/NextEvent.c
diff -u xsrc/external/mit/libXt/dist/src/NextEvent.c:1.9 xsrc/external/mit/libXt/dist/src/NextEvent.c:1.10
--- xsrc/external/mit/libXt/dist/src/NextEvent.c:1.9 Mon Jun 19 06:44:24 2023
+++ xsrc/external/mit/libXt/dist/src/NextEvent.c Sun Nov 17 21:16:11 2024
@@ -88,7 +88,7 @@ static SignalEventRec *freeSignalRecs;
*/
#ifndef NEEDS_NTPD_FIXUP
-#if defined(sun) || defined(MOTOROLA) || (defined(__osf__) && defined(__alpha))
+#ifdef sun
#define NEEDS_NTPD_FIXUP 1
#else
#define NEEDS_NTPD_FIXUP 0
Index: xsrc/external/mit/libXt/dist/src/TMparse.c
diff -u xsrc/external/mit/libXt/dist/src/TMparse.c:1.9 xsrc/external/mit/libXt/dist/src/TMparse.c:1.10
--- xsrc/external/mit/libXt/dist/src/TMparse.c:1.9 Mon Jun 19 06:44:24 2023
+++ xsrc/external/mit/libXt/dist/src/TMparse.c Sun Nov 17 21:16:11 2024
@@ -1076,7 +1076,7 @@ ParseTable(register String str, Opaque c
}
static String
-ParseButton(String str, Opaque closure, EventPtr event, Boolean *error)
+ParseButton(String str, Opaque closure _X_UNUSED, EventPtr event, Boolean *error)
{
String start = str;
char buttonStr[7];
Index: xsrc/external/mit/libXt/dist/src/ResConfig.c
diff -u xsrc/external/mit/libXt/dist/src/ResConfig.c:1.7 xsrc/external/mit/libXt/dist/src/ResConfig.c:1.8
--- xsrc/external/mit/libXt/dist/src/ResConfig.c:1.7 Mon Jun 19 06:44:24 2023
+++ xsrc/external/mit/libXt/dist/src/ResConfig.c Sun Nov 17 21:16:11 2024
@@ -881,7 +881,8 @@ dump_widget_tree(Widget w, int indent)
void
_XtResourceConfigurationEH(Widget w,
XtPointer client_data _X_UNUSED,
- XEvent *event)
+ XEvent *event,
+ Boolean *continue_to_dispatch _X_UNUSED)
{
Atom actual_type;
int actual_format;
