diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 7563a48..2aab452 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e123544d2bde8999bf7bb8a615ac59ce4b9cea2d4115c414c88263c69dae1d1 -size 537488 +oid sha256:1866067b87308b68071a41a697839af5d915251f6353f54327708b2c97ff79f7 +size 965192 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 920c33c..ec625d7 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -1,6 +1,6 @@ --- aclocal.m4 | 40 ++++++------ - configure | 41 +++++++----- + configure | 40 ++++++------ include/curses.h.in | 3 include/termcap.h.in | 2 include/tic.h | 4 - @@ -11,17 +11,17 @@ ncurses/Makefile.in | 2 ncurses/curses.priv.h | 2 ncurses/run_cmd.sh | 11 +++ - ncurses/tinfo/MKfallback.sh | 6 + + ncurses/tinfo/MKfallback.sh | 10 ++- ncurses/tinfo/access.c | 28 ++++++++ ncurses/tinfo/lib_setup.c | 3 ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_termcap.c | 21 ++++-- progs/Makefile.in | 4 - test/test.priv.h | 4 - - 19 files changed, 248 insertions(+), 77 deletions(-) + 19 files changed, 249 insertions(+), 79 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2020-03-09 09:17:28.745300221 +0000 ++++ aclocal.m4 2020-08-31 12:06:53.682411288 +0000 @@ -617,7 +617,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -5409,12 +5409,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -5539,9 +5542,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -14354,9 +14357,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@ -+ $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@ +- $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) "$(TIC_PATH)" "$(INFOCMP_PATH)" $(FALLBACK_LIST) >$@ ++ $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) "$(TIC_PATH)" "$(INFOCMP_PATH)" $(FALLBACK_LIST) >$@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2020-03-09 09:17:28.753300070 +0000 -@@ -2250,6 +2250,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2020-08-31 12:06:53.690411143 +0000 +@@ -2277,6 +2277,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(int) _nc_access (const char *, int); @@ -805,7 +797,7 @@ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); --- ncurses/run_cmd.sh -+++ ncurses/run_cmd.sh 2020-03-09 09:17:28.753300070 +0000 ++++ ncurses/run_cmd.sh 2020-08-31 12:06:53.690411143 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -819,22 +811,40 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2020-03-09 09:17:28.753300070 +0000 -@@ -72,6 +72,12 @@ else ++++ ncurses/tinfo/MKfallback.sh 2020-08-31 12:06:53.690411143 +0000 +@@ -74,6 +74,12 @@ else tmp_info= fi +if test -n "$TERMINFO" -a -d "$TERMINFO" ; then -+ infocmp_path="$infocmp_path -v1 -A $TERMINFO" ++ infocmp_args="-v1 -A $TERMINFO" +else -+ infocmp_path="$infocmp_path -v1" ++ infocmp_args="-v1" +fi + cat </NCURSES_INT2/g' ++ "$infocmp_path" $infocmp_args -E "$x" | sed -e 's/\/NCURSES_INT2/g' + done + + cat <= 0) { result = value; /* use extension feature */ } else if ((env = getenv("TERM")) != 0) { @@ -890,7 +900,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2020-03-09 09:17:28.753300070 +0000 ++++ ncurses/tinfo/read_entry.c 2020-08-31 12:06:53.690411143 +0000 @@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -908,7 +918,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2020-03-09 09:17:28.753300070 +0000 ++++ ncurses/tinfo/read_termcap.c 2020-08-31 12:06:53.690411143 +0000 @@ -323,14 +323,18 @@ _nc_getent( */ if (fd >= 0) { @@ -955,11 +965,11 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2020-07-07 09:13:53.548391492 +0000 -@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_ST ++++ progs/Makefile.in 2020-08-31 12:06:53.690411143 +0000 +@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC - CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE - CFLAGS_PROFILE = $(CCFLAGS) -pg + CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg -CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@ +CFLAGS_SHARED = $(CCFLAGS) -fPIE @@ -975,8 +985,8 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2020-03-09 09:17:28.753300070 +0000 -@@ -1001,12 +1001,12 @@ extern char *_nc_strstr(const char *, co ++++ test/test.priv.h 2020-08-31 12:06:53.690411143 +0000 +@@ -1024,12 +1024,12 @@ extern char *_nc_strstr(const char *, co #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index 37bf90a..59bd115 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,143 @@ +------------------------------------------------------------------- +Tue Sep 15 07:51:09 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200912 + + add configure-check for systre/tre with mingw configuration, to get + the library-dependencies as seen in msys2 configuration for mingw64. + + build-fixes for the win32-driver configuration. + + use more defensive binary mode setting for Win32 (Juergen Pfeifer). +- Add ncurses patch 20200907 + + fix regression in setupterm validating non-empty $TERM (report by + Soren Tempel). +- Add ncurses patch 20200906 + + merge/adapt in-progress work by Juergen Pfeifer for new version of + win32-driver. + + correct description of vt330/vt340 (Ross Combs). + +------------------------------------------------------------------- +Tue Sep 1 07:20:13 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200831 + + build-fix for awk-scripts modified for win32-driver (report by Werner + Fink). +- Drop workaround patch awk-scripts.patch as now upstream fixed + +------------------------------------------------------------------- +Mon Aug 31 13:56:18 UTC 2020 - Dr. Werner Fink + +- Add patch awk-scripts.patch as workaround for patch 20200829 + +------------------------------------------------------------------- +Mon Aug 31 08:47:56 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200829 + + remove a redundant NCURSES_EXPORT as a build-fix for "Maarten + Anonymous". + + merge/adapt in-progress work by Juergen Pfeifer for new version of + win32-driver. + + modify configure script, moving gcc -Werror options to EXTRA_CFLAGS + to avoid breaking configure-checks (adapted from ongoing work on + mawk and lynx). + > errate for terminfo.src (report by Florian Weimer): + + correct icl6404 csr + + correct ti916 cup + + improve ndr9500 +- Refresh patch ncurses-6.2.dif + +------------------------------------------------------------------- +Mon Aug 24 06:47:44 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200822 + + improve version-number extraction in MKlib_gen.sh + + make the test-package for manpages installable by adjusting the + man_db.renames file. + + correct an off-by-one loop-limit in convert_strings function + (report by Yue Tai). + + add CF_SHARED_OPTS cases for HPE NonStop systems (Randall S Becker). + + modify CF_SHARED_OPTS case for NetBSD to use the same "-shared" + option for the non-rpath case as for the rpath case, to allow gcc to + provide suitable runtime initialization (report by Rajeev V Pillai). + +------------------------------------------------------------------- +Wed Aug 19 06:43:29 UTC 2020 - Dr. Werner Fink + +- Disable wgetch-events as it is deprecated and breaks build of + other packages + +------------------------------------------------------------------- +Tue Aug 18 06:44:15 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200817 + + reduce build-warnings by excluding ncurses-internals from deprecation + warnings. + + mark wgetch-events feature as deprecated. + + add definition for $(LIBS) to ncurses/Makefile.in, to simplify builds + using the string-hacks option. + + prevent KEY_EVENT from appearing in curses.h unless the configure + option --enable-wgetch-events is used (report by Werner Fink). + +------------------------------------------------------------------- +Mon Aug 17 08:08:37 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200816 + + amend tic/infocmp check to allow for the respective tool's absence + (report by Steve Wills, cf: 20200808). + + improved some of the build-scripts with shellcheck + + filter out -MT/-MD/-MTd/-MDd options in script for Visual Studio C++ + (discussion with "Maarten Anonymous"). + +------------------------------------------------------------------- +Tue Aug 11 09:09:09 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200808 + + improve discussion of the system's tic utility when used as part + of cross-compiling (discussion with Keith Marshall). + + modify configuration checks for build-time tic/infocmp to use + AC_CHECK_TOOL. That can still be overridden by --with-tic-path and + --with-infocmp-path when fallbacks are used, but even if not using + fallbacks, the improved check may help with cross-compiling + (discussion with Keith Marshall). + + other build-fixes for Ada95 with MinGW. + + modify Ada95 source-generation utility to write to a file given as + parameter rather than to the standard output, allowing builds with + MinGW. + +------------------------------------------------------------------- +Mon Aug 3 08:36:51 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200801 + + remove remaining parts of checks for ISC Unix (cf: 20121006). + + add user32.lib to LDFLAGS for Visual Studio C++ configuration + (discussion with "Maarten Anonymous"). + + modify MKkey_defs.sh to hide ncurses' definition of KEY_EVENTS to + reduce Visual Studio C++ redefinition warnings. + + improve/update checks for external functions in test/configure + +------------------------------------------------------------------- +Mon Jul 27 09:42:00 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200725 + + set LINK_TESTS in CF_SHARED_OPTS for msvc (patch by + "Maarten Anonymous") + + improved workaround for redefinition-warnings for KEY_EVENT. + + improve man/term.5 section on legacy storage format (report by + Florian Weimer). + +------------------------------------------------------------------- +Mon Jul 20 10:51:35 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200718 + + reduce redefinition-warnings for KEY_EVENT when building with Visual + Studio C++. + + define NCURSES_STATIC when compiling programs to link with static + libraries, to work with MinGW vs Visual Studio C++. + > additional changes for building with Visual Studio C++ and msys2 + (reports/patches by "Maarten Anonymous") + + modify c++/Makefile.in to set the current directory while compiling + the main program, so the linker can find related objects. + + several changes to allow the c++/demo program to compile/link. + + change an ifdef in test-directory, to use VC++ wide-character funcs. + ------------------------------------------------------------------- Mon Jul 13 09:20:28 UTC 2020 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index ed9a240..f53e4eb 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -48,6 +48,7 @@ BuildRequires: gpm-devel %else BuildRequires: gpm %endif +BuildRequires: makedepend %define terminfo() %{_datadir}/%{0}/%{1} %define tabset() %{_datadir}/%{0}/%{1} # bug437293 @@ -317,6 +318,10 @@ mv tack-* tack %patch0 -p0 -b .p0 %build +# +# Do not run auto(re)conf here as this will fail later on ncurses +# is build with special autoconf based on autoconf-2.13 at upstream +# %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects # # Note that there is a test if the system call poll(2) really works @@ -503,7 +508,7 @@ mv tack-* tack %endif --enable-ext-colors \ --enable-weak-symbols \ - --enable-wgetch-events \ + --disable-wgetch-events \ --enable-pthreads-eintr \ --enable-string-hacks \ --prefix=%{_prefix} \ @@ -534,6 +539,7 @@ mv tack-* tack # It has been verified several times that this works. # c=$(grep '^ *$ *\./configure' config.log) + make depend make -C c++ etip.h make %{?_smp_mflags} # @@ -580,6 +586,7 @@ mv tack-* tack # find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c + make depend make -C c++ etip.h make %{?_smp_mflags} %else @@ -675,6 +682,7 @@ mv tack-* tack find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif + make depend make -C c++ etip.h make %{?_smp_mflags} sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@ @@ -736,6 +744,7 @@ includedir5=%{_incdir}/ncurses5' "$pc" find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif + make depend make -C c++ etip.h make %{?_smp_mflags} # must not use %jobs here (would lead to: ln: ncurses.h already exists) @@ -809,6 +818,7 @@ includedir5=%{_incdir}/ncurses5' "$pc" find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif + make depend make -C c++ etip.h make %{?_smp_mflags} sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@