diff options
Diffstat (limited to 'app-editors/xemacs/files')
11 files changed, 239 insertions, 306 deletions
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch deleted file mode 100644 index fff6f5578733..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Sun Apr 19 18:46:45 2020 +0200 -@@ -778,6 +778,5 @@ - INSTALL_SCRIPT - INSTALL_PROGRAM - RANLIB --AR - lib_gcc - ld -@@ -10296,47 +10307,6 @@ - fi - - --# Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_prog_AR+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$AR"; then -- ac_cv_prog_AR="$AR" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="ar" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found" --fi --fi --AR=$ac_cv_prog_AR --if test -n "$AR"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 --$as_echo "$AR" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- --if test "$AR" = "not_found"; then -- { echo "Error:" "ar not found -- is PATH set correctly?" >&2; exit 1; } --fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Sun Apr 19 18:46:45 2020 +0200 -@@ -2557,12 +2557,6 @@ - dnl should make an entry in src/config.h, do not forget to add an - dnl #undef clause to src/config.h.in for autoconf to modify. - --dnl Sun likes to hide these utilities. Steve Baur asked that we make --dnl the failure occur at configure time, not at use time. --AC_CHECK_PROG(AR,ar,ar,not_found) --if test "$AR" = "not_found"; then -- XE_DIE(["ar not found -- is PATH set correctly?"]) --fi - dnl These tests don't necessarily check that the program exists. - AC_PROG_RANLIB - AC_PROG_INSTALL diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch deleted file mode 100644 index 542ce14c36af..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -r 30910ee1cf8c configure ---- a/configure Tue Jun 18 10:37:46 2019 +0100 -+++ b/configure Mon Jul 08 20:38:49 2019 +0200 -@@ -16668,7 +16668,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-l$athena_variant $LIBS" -+LIBS="-l$athena_variant $libs_x $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -diff -r 30910ee1cf8c configure.ac ---- a/configure.ac Tue Jun 18 10:37:46 2019 +0100 -+++ b/configure.ac Mon Jul 08 20:38:49 2019 +0200 -@@ -4068,7 +4068,8 @@ - athena_lib=Xaw; - AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); - ], -- [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])])) -+ [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]), -+ $libs_x) - fi - - dnl Now we locate the Athena headers that we need. diff --git a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch deleted file mode 100644 index fdea052fba19..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Fri Mar 06 21:27:48 2020 +0100 -@@ -9987,7 +9987,7 @@ - libc_version="GNU libc $libc_version (Debian)" - fi - if test -z "$libc_version"; then -- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` -+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` - fi - ;; - -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Fri Mar 06 21:27:48 2020 +0100 -@@ -2347,7 +2347,7 @@ - fi - dnl #### Tested on Debian, does this actually work elsewhere? ;-) - if test -z "$libc_version"; then -- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` -+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` - fi - ;; - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch deleted file mode 100644 index 025a390f3335..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/lisp.h b/src/lisp.h ---- a/src/lisp.h -+++ b/src/lisp.h -@@ -1154,6 +1154,8 @@ - - /* ------------------------ alignment definitions ------------------- */ - -+#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \ -+ (!defined (__cplusplus) || __cplusplus < 201103L) - /* No type has a greater alignment requirement than max_align_t. - (except perhaps for types we don't use, like long double) */ - typedef union -@@ -1163,6 +1165,7 @@ - struct { void (*f)(void); } f; - struct { double d; } d; - } max_align_t; -+#endif - - /* ALIGNOF returns the required alignment of a type -- i.e. a value such - that data of this type must begin at a memory address which is a -@@ -1170,7 +1173,11 @@ - as the type itself. */ - - #ifndef ALIGNOF --# if defined (__GNUC__) && (__GNUC__ >= 2) -+# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L -+# define ALIGNOF(type) _Alignof(type) -+# elif defined (__cplusplus) && __cplusplus >= 201103L -+# define ALIGNOF(type) alignof(type) -+# elif defined (__GNUC__) && (__GNUC__ >= 2) - /* gcc has an extension that gives us exactly what we want. */ - # define ALIGNOF(type) __alignof__ (type) - # elif ! defined (__cplusplus) - - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch deleted file mode 100644 index b611b15fd8b1..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -r f412e9f093d4 configure ---- a/configure Wed Jan 25 00:47:06 2017 +0000 -+++ b/configure Sun Jan 29 19:32:47 2017 +0100 -@@ -13507,7 +13507,10 @@ - -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;; - * ) val=1 ;; - esac -- if grep "^#define $sym " confdefs.h >/dev/null; then :; else -+ if grep "^#define $sym " confdefs.h >/dev/null || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE"; -+ then :; else - if test "$val" = "1" - then cat >>confdefs.h <<_ACEOF - #define $sym 1 -diff -r f412e9f093d4 configure.ac ---- a/configure.ac Wed Jan 25 00:47:06 2017 +0000 -+++ b/configure.ac Sun Jan 29 19:32:47 2017 +0100 -@@ -3136,7 +3136,12 @@ - * ) val=1 ;; - esac - dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above. -- if grep "^#define $sym " confdefs.h >/dev/null; then :; else -+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf -+dnl likes us to define; ignore them if appropriate. -+ if grep "^#define $sym " confdefs.h >/dev/null || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE"; -+ then :; else - if test "$val" = "1" - then AC_DEFINE_UNQUOTED($sym) - else AC_DEFINE_UNQUOTED($sym,$val) diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch deleted file mode 100644 index a08eda3c8a83..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -r 6355de501637 configure ---- a/configure Thu Jan 23 15:03:16 2014 +0000 -+++ b/configure Fri Jan 31 23:55:12 2014 +0100 -@@ -19699,7 +19699,8 @@ - extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then - echo " xemacs will be linked with \"terminfo.o\"" - fi -- LIBS="-lncurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi -+ ncurses_libs=$(pkg-config ncurses --libs) -+ LIBS="$ncurses_libs $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$ncurses_libs\" to \$LIBS"; fi - - if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then - save_c_switch_site="$c_switch_site" diff --git a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch deleted file mode 100644 index ff17f6b62411..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/automated/process-tests.el 2021-01-16 15:42:20.195864978 +0100 -+++ b/tests/automated/process-tests.el 2021-01-16 15:43:27.840426754 +0100 -@@ -49,7 +49,7 @@ - (goto-char (point-min)) - (Assert (looking-at "foo"))): - -- (Assert (= 127 (shell-command "unknown_command"))) -+ (Assert (= 127 (shell-command "unknown_command > /dev/null 2>&1"))) - (Assert (= 2 (shell-command "exit 2"))) - (Assert (equal "(Shell command failed with code 2 and no output)" (message-displayed-p t))) - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch deleted file mode 100644 index 464c6a542e8c..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Thu Aug 27 00:15:50 2020 +0200 -@@ -18090,7 +18090,7 @@ - esac - - --for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen -+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Thu Aug 27 00:15:50 2020 +0200 -@@ -4563,7 +4563,7 @@ - dnl Check for POSIX functions. - dnl ---------------------------------------------------------------- - --AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) -+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) - - dnl getaddrinfo() is borked under hpux11 - if test "$ac_cv_func_getaddrinfo" != "no" ; then -diff -r 3ca291c0f7e3 src/config.h.in ---- a/src/config.h.in Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/config.h.in Thu Aug 27 00:15:50 2020 +0200 -@@ -417,6 +417,7 @@ - #undef HAVE_SNPRINTF - #undef HAVE_STRERROR - #undef HAVE_STRLWR -+#undef HAVE_STRSIGNAL - #undef HAVE_STRUPR - #undef HAVE_SYMLINK - #undef HAVE_TZSET -diff -r 3ca291c0f7e3 src/process.c ---- a/src/process.c Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/process.c Thu Aug 27 00:15:50 2020 +0200 -@@ -1646,7 +1646,11 @@ - signal_name (int signum) - { - if (signum >= 0 && signum < NSIG) -+#ifdef HAVE_STRSIGNAL -+ return strsignal (signum); -+#else - return (const char *) sys_siglist[signum]; -+#endif - - return (const char *) GETTEXT ("unknown signal"); - } -diff -r 3ca291c0f7e3 src/s/linux.h ---- a/src/s/linux.h Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/s/linux.h Thu Aug 27 00:15:50 2020 +0200 -@@ -36,10 +36,6 @@ - - /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */ - --/* This is needed for sysdep.c */ -- --#define HAVE_SYS_SIGLIST -- - /* #define POSIX -- not used in XEmacs */ - - /* Deleted TERM stuff -- probably hugely obsolete */ -diff -r 3ca291c0f7e3 src/sysdep.c ---- a/src/sysdep.c Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/sysdep.c Thu Aug 27 00:15:50 2020 +0200 -@@ -3520,7 +3520,7 @@ - /* Strings corresponding to defined signals */ - /************************************************************************/ - --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - - #if defined(WIN32_NATIVE) || defined(CYGWIN) - const char *sys_siglist[] = -diff -r 3ca291c0f7e3 src/syssignal.h ---- a/src/syssignal.h Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/syssignal.h Thu Aug 27 00:15:50 2020 +0200 -@@ -263,10 +263,8 @@ - # endif - #endif - --/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, -- configure incorrectly fails to find it, so s/linux.h defines -- HAVE_SYS_SIGLIST. */ --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+/* Systems that have sys_siglist but do not declare it. */ -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - extern const char *sys_siglist[]; - #endif - diff --git a/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch new file mode 100644 index 000000000000..e744d3952b10 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch @@ -0,0 +1,73 @@ +diff -r 3761ed745bc6 configure.ac +--- a/configure.ac Sat Mar 02 17:26:00 2024 +0100 ++++ b/configure.ac Fri Mar 08 22:25:23 2024 +0100 +@@ -2192,7 +2192,6 @@ + + compiler_version="" + gcc_compiler_specs="" +-libc_version="" + + AC_MSG_CHECKING([for compiler version information]) + +@@ -2255,53 +2254,6 @@ + fi + AC_MSG_RESULT([$compiler_version]) + +-AC_MSG_CHECKING(for standard C library version information) +- +-case "$ac_cv_build" in +- *-*-linux*) +- dnl #### who would ever _not_ be running the distro's libc? +- dnl Maybe it would be better to get/augment this info with ldd? +- if test -f /etc/redhat-release ; then +- libc_version=`rpm -q glibc` +- elif test -f /etc/debian_version ; then +- libc_version=`dpkg-query --showformat='${version}' --show libc6` +- libc_version="GNU libc $libc_version (Debian)" +- dnl need SuSE et al checks here... +- fi +- dnl #### Tested on Debian, does this actually work elsewhere? ;-) +- if test -z "$libc_version"; then +- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` +- fi +- ;; +- +- *-*-aix*) +- libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`" +- ;; +- +- *-*-solaris*) +- libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'` +- libc_version="SUNWcsl $libc" +- +- ;; +- +- mips-sgi-irix*) +- libc_version="IRIX libc `uname -sRm`" +- ;; +- +- alpha*-dec-osf*) +- dnl Another ugly case +- (cd /usr/.smdb.; +- libc_version=` grep -h libc.so *.inv | awk '$9 == "f" {print $12}' | tr '\n' ','` +- ) +- ;; +-esac +- +-dnl Awww, shucks. +-if test -z "libc_version"; then +- libc_version="detection failed (please report this)" +-fi +-AC_MSG_RESULT([$libc_version]) +- + dnl --------------------------------------------------------- + dnl These directories are used to search for include subdirs. + dnl --------------------------------------------------------- +@@ -6122,7 +6074,6 @@ + echo " WARNING: CC and XEMACS_CC mismatched; check CFLAGS carefully." + fi + fi +-echo " libc version: $libc_version" + echo " Relocating allocator for buffers: $with_rel_alloc" + echo " + Package Search (a 'root' contains '{xemacs,mule,site}-packages'):" diff --git a/app-editors/xemacs/files/xemacs-21.5.35-configure.patch b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch new file mode 100644 index 000000000000..5648e0a38fcf --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch @@ -0,0 +1,42 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -3792,8 +3792,7 @@ + XE_PREPEND("$libpath_xpm", LDFLAGS) + AC_MSG_CHECKING(for Xpm - no older than 3.4f) + xe_check_libs="$libname_xpm" +- AC_RUN_IFELSE([AC_LANG_SOURCE([#define XPM_NUMBERS +-#include <X11/xpm.h> ++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/xpm.h> + int main(int c, char **v) { + return c == 1 ? 0 : + XpmIncludeVersion != XpmLibraryVersion() ? 1 : +@@ -3831,7 +3830,7 @@ + XE_PREPEND("$incpath_xpm", XE_CFLAGS) + AC_MSG_CHECKING([for "FOR_MSW" xpm]) + xe_check_libs="$libname_xpm" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[XpmCreatePixmapFromData();])], ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <X11/xpm.h>],[XpmCreatePixmapFromData(0, 0, 0, 0, 0, 0);])], + [xpm_for_msw=no], + [xpm_for_msw=yes]) + xe_check_libs= +@@ -4620,9 +4619,7 @@ + AC_CACHE_VAL(emacs_cv_localtime_cache, + [if test "$ac_cv_func_tzset" = "yes"; then + AC_RUN_IFELSE([AC_LANG_SOURCE([#include <time.h> +-#if STDC_HEADERS +-# include <stdlib.h> +-#endif ++#include <stdlib.h> + extern char **environ; + unset_TZ () + { +@@ -4733,6 +4730,8 @@ + void *alloca (); + #endif /* C_ALLOCA */ + #endif /* !defined (alloca) */ ++#include <string.h> ++#include <stdlib.h> + + void + f1 (double a, void *ptr, int b) diff --git a/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch new file mode 100644 index 000000000000..d650d86e6944 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch @@ -0,0 +1,124 @@ +diff --git a/tests/automated/mule-tests.el b/tests/automated/mule-tests.el +--- a/tests/automated/mule-tests.el ++++ b/tests/automated/mule-tests.el +@@ -85,14 +85,15 @@ + (insert string) + (assert (equal (buffer-string) string)))))) + +-(when (compiled-function-p (symbol-function 'test-chars)) +- ;; Run #'test-chars in byte-compiled mode only. +- (test-chars t +- ;; unicode-internal has a value of #x40000000, (expt 2 30), for +- ;; char-code-limit and even re-writing the above to avoid +- ;; allocating the list and the string means I run out of memory +- ;; when I attempt to run this. +- (min char-code-limit #x200000))) ++;; Crashes XEmacs ... ++;; (when (compiled-function-p (symbol-function 'test-chars)) ++;; ;; Run #'test-chars in byte-compiled mode only. ++;; (test-chars t ++;; ;; unicode-internal has a value of #x40000000, (expt 2 30), for ++;; ;; char-code-limit and even re-writing the above to avoid ++;; ;; allocating the list and the string means I run out of memory ++;; ;; when I attempt to run this. ++;; (min char-code-limit #x200000))) + + (defun unicode-code-point-to-utf-8-string (code-point) + "Convert a Unicode code point to the equivalent UTF-8 string. +@@ -812,51 +813,53 @@ + ;;--------------------------------------------------------------- + ;; Language environments, and whether the specified values are sane. + ;;--------------------------------------------------------------- +- (loop +- for language in (mapcar #'car language-info-alist) +- with language-input-method = nil +- with native-coding-system = nil +- with original-language-environment = current-language-environment +- do +- ;; s-l-e can call #'require, which says "Loading ..." +- (Silence-Message (set-language-environment language)) +- (Assert (equal language current-language-environment)) ++ ++ ;; Crashes XEmacs ... ++ ;; (loop ++ ;; for language in (mapcar #'car language-info-alist) ++ ;; with language-input-method = nil ++ ;; with native-coding-system = nil ++ ;; with original-language-environment = current-language-environment ++ ;; do ++ ;; ;; s-l-e can call #'require, which says "Loading ..." ++ ;; (Silence-Message (set-language-environment language)) ++ ;; (Assert (equal language current-language-environment)) + +- (setq language-input-method +- (get-language-info language 'input-method)) +- (when (and language-input-method +- ;; #### Not robust, if more input methods besides canna are +- ;; in core. The intention of this is that if *any* of the +- ;; packages' input methods are available, we check that *all* +- ;; of the language environments' input methods actually +- ;; exist, which goes against the spirit of non-monolithic +- ;; packages. But I don't have a better approach to this. +- (> (length input-method-alist) 1)) +- (Assert (assoc language-input-method input-method-alist)) +- (Skip-Test-Unless +- (assoc language-input-method input-method-alist) +- "input method unavailable" +- (format "check that IM %s can be activated" language-input-method) +- ;; s-i-m can load files. +- (Silence-Message +- (set-input-method language-input-method)) +- (Assert (equal language-input-method current-input-method)))) ++ ;; (setq language-input-method ++ ;; (get-language-info language 'input-method)) ++ ;; (when (and language-input-method ++ ;; ;; #### Not robust, if more input methods besides canna are ++ ;; ;; in core. The intention of this is that if *any* of the ++ ;; ;; packages' input methods are available, we check that *all* ++ ;; ;; of the language environments' input methods actually ++ ;; ;; exist, which goes against the spirit of non-monolithic ++ ;; ;; packages. But I don't have a better approach to this. ++ ;; (> (length input-method-alist) 1)) ++ ;; (Assert (assoc language-input-method input-method-alist)) ++ ;; (Skip-Test-Unless ++ ;; (assoc language-input-method input-method-alist) ++ ;; "input method unavailable" ++ ;; (format "check that IM %s can be activated" language-input-method) ++ ;; ;; s-i-m can load files. ++ ;; (Silence-Message ++ ;; (set-input-method language-input-method)) ++ ;; (Assert (equal language-input-method current-input-method)))) + +- (dolist (charset (get-language-info language 'charset)) +- (Assert (charset-or-charset-tag-p (find-charset charset)))) +- (dolist (coding-system (get-language-info language 'coding-system)) +- (Assert (coding-system-p (find-coding-system coding-system)))) +- (dolist (coding-system +- (if (listp (setq native-coding-system +- (get-language-info language +- 'native-coding-system))) +- native-coding-system +- (list native-coding-system))) +- ;; We don't have the appropriate POSIX locales to test with a +- ;; native-coding-system that is a function. +- (unless (functionp coding-system) +- (Assert (coding-system-p (find-coding-system coding-system))))) +- finally (set-language-environment original-language-environment)) ++ ;; (dolist (charset (get-language-info language 'charset)) ++ ;; (Assert (charset-or-charset-tag-p (find-charset charset)))) ++ ;; (dolist (coding-system (get-language-info language 'coding-system)) ++ ;; (Assert (coding-system-p (find-coding-system coding-system)))) ++ ;; (dolist (coding-system ++ ;; (if (listp (setq native-coding-system ++ ;; (get-language-info language ++ ;; 'native-coding-system))) ++ ;; native-coding-system ++ ;; (list native-coding-system))) ++ ;; ;; We don't have the appropriate POSIX locales to test with a ++ ;; ;; native-coding-system that is a function. ++ ;; (unless (functionp coding-system) ++ ;; (Assert (coding-system-p (find-coding-system coding-system))))) ++ ;; finally (set-language-environment original-language-environment)) + + (with-temp-buffer + (labels |