diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/tcsh-6.24.14.local.patch (renamed from patches/tcsh-6.24.12.local.patch) | 118 |
1 files changed, 53 insertions, 65 deletions
diff --git a/patches/tcsh-6.24.12.local.patch b/patches/tcsh-6.24.14.local.patch index 2e9fbd26..bc8b1735 100644 --- a/patches/tcsh-6.24.12.local.patch +++ b/patches/tcsh-6.24.14.local.patch @@ -1,7 +1,19 @@ -diff -ru tcsh-6.24.07.orig/configure tcsh-6.24.07/configure ---- tcsh-6.24.07.orig/configure 2022-12-21 20:44:53.000000000 +0100 -+++ tcsh-6.24.07/configure 2022-12-27 12:27:29.897963800 +0100 -@@ -6171,6 +6171,10 @@ +diff -Nru tcsh-6.24.14.orig/config_f.h tcsh-6.24.14/config_f.h +--- tcsh-6.24.14.orig/config_f.h 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/config_f.h 2024-12-22 19:13:25.290832110 +0100 +@@ -147,7 +147,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || !defined(HAVE_WORKING_SBRK) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || defined(__midipix__) || !defined(HAVE_WORKING_SBRK) + # define SYSMALLOC + #else + # undef SYSMALLOC +diff -Nru tcsh-6.24.14.orig/configure tcsh-6.24.14/configure +--- tcsh-6.24.14.orig/configure 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/configure 2024-12-22 19:13:25.290832110 +0100 +@@ -6089,6 +6089,10 @@ *-qnx6*) : tcsh_config_file=qnx6 ;; #( @@ -12,31 +24,31 @@ diff -ru tcsh-6.24.07.orig/configure tcsh-6.24.07/configure *) : as_fn_error $? "Tcsh can't guess the configuration file name for \`${host}' systems. ---- tcsh-6.24.10/Makefile.in.orig 2023-04-14 13:52:38.000000000 +0200 -+++ tcsh-6.24.10/Makefile.in 2024-01-13 10:48:11.122576967 +0100 -@@ -431,6 +431,7 @@ - #CC= cc -h0,ansi,novector,float0 +diff -Nru tcsh-6.24.14.orig/ed.inputl.c tcsh-6.24.14/ed.inputl.c +--- tcsh-6.24.14.orig/ed.inputl.c 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/ed.inputl.c 2024-12-22 19:13:25.290832110 +0100 +@@ -34,6 +34,8 @@ + #include "ed.defns.h" /* for the function names */ + #include "tw.h" /* for twenex stuff */ + ++#include <wchar.h> ++ + #define OKCMD INT_MAX + + /* ed.inputl -- routines to get a single line from the input. */ +diff -Nru tcsh-6.24.14.orig/Makefile.in tcsh-6.24.14/Makefile.in +--- tcsh-6.24.14.orig/Makefile.in 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/Makefile.in 2024-12-22 19:16:54.096716085 +0100 +@@ -432,7 +432,7 @@ #CC= lcc -wa CC_FOR_GETHOST = @CC_FOR_GETHOST@ -+CPPFLAGS_FOR_GETHOST=-I. -I$(srcdir) + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +-CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ ++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -I. -I$(srcdir) + LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ ED= ed AS= as - RM= rm -@@ -506,11 +507,11 @@ - # emxbind tcsh - - gethost.${SUF}: gethost.c sh.err.h tc.const.h sh.h -- ${CC_FOR_GETHOST} ${CF} ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c -+ ${CC_FOR_GETHOST} ${CF} ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} $(srcdir)/gethost.c - - gethost: gethost.${SUF} - rm -f gethost -- ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} gethost.${SUF} -+ ${CC_FOR_GETHOST} -o gethost ${CPPFLAGS_FOR_GETHOST} ${CFLAGS_FOR_GETHOST} ${LDFLAGS_FOR_GETHOST} gethost.${SUF} - - tc.defs.c: gethost host.defs - @rm -f $@.tmp -@@ -595,7 +596,7 @@ +@@ -598,7 +598,7 @@ @echo '/* Do not edit this file, make creates it. */' > $@.tmp @echo '#ifndef _h_tc_const' >> $@.tmp @echo '#define _h_tc_const' >> $@.tmp @@ -44,22 +56,22 @@ diff -ru tcsh-6.24.07.orig/configure tcsh-6.24.07/configure + ${CPP} $(CFLAGS) $(CPPFLAGS) ${DFLAGS} ${EXTRAFLAGS} -D_h_tc_const\ $(srcdir)/tc.const.c | \ sed -n -e 's/^\(Char STR[a-zA-Z0-9_]*\) *\[ *\].*/extern \1[];/p' | \ - LC_COLLATE=C sort >> $@.tmp -diff -ru tcsh-6.23.02.orig/config_f.h tcsh-6.23.02/config_f.h ---- tcsh-6.23.02.orig/config_f.h 2022-01-03 09:03:03.000000000 +0100 -+++ tcsh-6.23.02/config_f.h 2022-02-01 11:36:23.327968800 +0100 -@@ -149,7 +149,7 @@ - * This can be much slower and no memory statistics will be - * provided. - */ --#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || !defined(HAVE_WORKING_SBRK) -+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__) || defined(__midipix__) || !defined(HAVE_WORKING_SBRK) - # define SYSMALLOC - #else - # undef SYSMALLOC -diff -Nru tcsh-6.22.00.orig/config/midipix tcsh-6.22.00/config/midipix ---- tcsh-6.22.00.orig/system/midipix 1970-01-01 01:00:00.000000000 +0100 -+++ tcsh-6.22.00/system/midipix 2020-08-21 19:12:56.066600827 +0200 + LC_ALL=C sort >> $@.tmp +diff -Nru tcsh-6.24.14.orig/sh.h tcsh-6.24.14/sh.h +--- tcsh-6.24.14.orig/sh.h 2024-11-26 19:31:51.000000000 +0100 ++++ tcsh-6.24.14/sh.h 2024-12-22 19:13:25.290832110 +0100 +@@ -341,7 +341,7 @@ + #endif /* POSIX && !WINNT_NATIVE */ + #include <limits.h> + +-#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) ++#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__) + # if !defined(pyr) && !defined(stellar) + # include <time.h> + # ifdef _MINIX +diff -Nru tcsh-6.24.14.orig/system/midipix tcsh-6.24.14/system/midipix +--- tcsh-6.24.14.orig/system/midipix 1970-01-01 01:00:00.000000000 +0100 ++++ tcsh-6.24.14/system/midipix 2024-12-22 19:13:25.290832110 +0100 @@ -0,0 +1,138 @@ +/* + * config.h -- configure various defines for tcsh @@ -199,27 +211,3 @@ diff -Nru tcsh-6.22.00.orig/config/midipix tcsh-6.22.00/config/midipix +#define HAVE_SLASHSLASH 1 + +#endif /* _h_config */ -diff -Nru tcsh-6.22.00.orig/ed.inputl.c tcsh-6.22.00/ed.inputl.c ---- tcsh-6.22.00.orig/ed.inputl.c 2019-11-28 17:00:05.000000000 +0100 -+++ tcsh-6.22.00/ed.inputl.c 2020-08-21 19:22:12.899460169 +0200 -@@ -34,6 +34,8 @@ - #include "ed.defns.h" /* for the function names */ - #include "tw.h" /* for twenex stuff */ - -+#include <wchar.h> -+ - #define OKCMD INT_MAX - - /* ed.inputl -- routines to get a single line from the input. */ -diff -Nru tcsh-6.22.00.orig/sh.h tcsh-6.22.00/sh.h ---- tcsh-6.22.00.orig/sh.h 2019-11-28 17:00:05.000000000 +0100 -+++ tcsh-6.22.00/sh.h 2020-08-21 19:10:44.030604961 +0200 -@@ -337,7 +337,7 @@ - #endif /* POSIX && !WINNT_NATIVE */ - #include <limits.h> - --#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) -+#if SYSVREL > 0 || defined(_IBMR2) || defined(_MINIX) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) || defined(__midipix__) - # if !defined(pyr) && !defined(stellar) - # include <time.h> - # ifdef _MINIX |