diff --git a/ncurses-6.1-fallback.dif b/ncurses-6.1-fallback.dif deleted file mode 100644 index 17f7620..0000000 --- a/ncurses-6.1-fallback.dif +++ /dev/null @@ -1,19 +0,0 @@ ---- - ncurses/tinfo/lib_setup.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2019-03-22 08:46:01.634603415 +0000 -@@ -761,7 +761,11 @@ TINFO_SETUP_TERM(TERMINAL **tp, - - if (fallback) { - T(("found fallback entry")); -- TerminalType(termp) = *fallback; -+#if NCURSES_EXT_NUMBERS -+ _nc_copy_termtype2(&(TerminalType(termp)),fallback); -+#else -+ _nc_copy_termtype(&(TerminalType(termp)),fallback); -+#endif - status = TGETENT_YES; - } - } diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index e2eabce..0a58ffa 100644 --- a/ncurses-6.1-patches.tar.bz2 +++ b/ncurses-6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:716122a206b4369157a877644780037c7c402accf39493087c6a35bc7a532efa -size 1413939 +oid sha256:ebc5f17257e154cd75855ed3220643fe8435a4ce0d6aeed29958c62fe11e866a +size 1420839 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index fbd70b2..40bd4ad 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -795,7 +795,7 @@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h +++ ncurses/curses.priv.h 2019-02-06 07:51:48.453355178 +0000 -@@ -2217,6 +2217,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec +@@ -2224,6 +2224,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); @@ -915,7 +915,7 @@ + _nc_fsid(); if (_nc_access(filename, R_OK) < 0 - || (fp = fopen(filename, "rb")) == 0) { + || (fp = fopen(filename, BIN_R)) == 0) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); @@ -571,6 +572,7 @@ _nc_read_file_entry(const char *const fi } diff --git a/ncurses.changes b/ncurses.changes index b751755..db0bfd0 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 25 11:15:44 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190323 + + move macro for is_linetouched() inside NCURSES_NOMACROS ifndef. + + corrected prototypes in several manpages using script to extract + those in compilable form. + + use _nc_copy_termtype2() rather than direct assignment in setupterm, + in case it is called repeatedly using fallback terminfo descriptions + (report/patch by Werner Fink). +- Drop patch ncurses-6.1-fallback.dif as now upstream + ------------------------------------------------------------------- Fri Mar 22 08:59:22 UTC 2019 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index bc60a3b..268fe3d 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -74,8 +74,7 @@ Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-6.1.dif Patch1: ncurses-5.9-ibm327x.dif -Patch2: ncurses-6.1-fallback.dif -Patch4: ncurses-5.7-tack.dif +Patch2: ncurses-5.7-tack.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} @@ -311,8 +310,7 @@ rm -fr tack tar -xzf %{S:5} mv tack-* tack %patch1 -p0 -b .327x -%patch2 -p0 -b .fb -%patch4 -p0 -b .hs +%patch2 -p0 -b .hs %patch0 -p0 -b .p0 %build