From 225127ed5b5a12be90f45a9dd3c46a48e8860a030e61ca111760b3d0dc393567 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 25 Feb 2019 08:46:44 +0000 Subject: [PATCH 1/5] Update to ncurses 6.1-20190223 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=414 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses-6.1.dif | 4 ++-- ncurses.changes | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 00958be..5fc6827 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:eef95a9bedd2beadf0adb4b9a5260600b21f9c5c078ea699b1cffb51163730fa -size 1303656 +oid sha256:f11b88636676d5e3401aeca2a0b5dfa1a517acca6b8cef754e2e0d60e14ce619 +size 1307017 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index e527ab4..1bfe475 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 -@@ -2205,6 +2205,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec +@@ -2207,6 +2207,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); @@ -994,7 +994,7 @@ --- test/test.priv.h +++ test/test.priv.h 2019-02-06 07:51:48.457355102 +0000 -@@ -940,12 +940,12 @@ extern char *strnames[], *strcodes[], *s +@@ -944,12 +944,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index 6e2615c..a84b079 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Feb 25 08:18:08 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190223 + + fix typo in adds200 -TD + + add tic check for consistent alternate character set capabilities. + + improve check in mvcur() to decide whether to use hard-tabs, using + xt, tbc and hts as clues. + + replace check in reset command for obsolete "pt" capability using + tbc and hts capabilities as clues (report by Nicolas Marriott). + ------------------------------------------------------------------- Mon Feb 18 08:56:21 UTC 2019 - Dr. Werner Fink From c1dd11b1f6855d994175115bf6735ca55746ac6b0be4f9b6e5c24d51a0bc540b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 11 Mar 2019 08:23:10 +0000 Subject: [PATCH 2/5] Update to ncurses 6.1-20190309 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=415 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses-6.1.dif | 6 +++--- ncurses.changes | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 5fc6827..e33421f 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:f11b88636676d5e3401aeca2a0b5dfa1a517acca6b8cef754e2e0d60e14ce619 -size 1307017 +oid sha256:a4842cbc6f0d95152d9f4f6e7ddc6ba7e906ddc5232236e2c091f4591de8ea57 +size 1318509 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 1bfe475..fbd70b2 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -311,7 +311,7 @@ #undef NCURSES_OSPEED --- include/tic.h +++ include/tic.h 2019-02-06 07:51:48.445355328 +0000 -@@ -221,12 +221,12 @@ struct alias +@@ -236,12 +236,12 @@ struct alias */ /* out-of-band values for representing absent capabilities */ @@ -784,7 +784,7 @@ ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in +++ ncurses/Makefile.in 2019-02-06 07:51:48.453355178 +0000 -@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : +@@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ ./fallback.c : $(tinfo)/MKfallback.sh @@ -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 -@@ -2207,6 +2207,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec +@@ -2217,6 +2217,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); diff --git a/ncurses.changes b/ncurses.changes index a84b079..d463f0f 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 11 08:19:08 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190309 + + in-progress changes to add parameter-checking for common user-defined + capabilities in tic. + + update MKcodes.awk and MKnames.awk to ignore the new "userdef" + data in Caps-ncurses (cf: 20190302). + ------------------------------------------------------------------- Mon Feb 25 08:18:08 UTC 2019 - Dr. Werner Fink From 458a7f236bb279ab8dce040e86e689973f1a65023de48d8402a066eeb17b8923 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 19 Mar 2019 09:19:21 +0000 Subject: [PATCH 3/5] Update to ncurses 6.1-20190317 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=416 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses.changes | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index e33421f..e2eabce 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:a4842cbc6f0d95152d9f4f6e7ddc6ba7e906ddc5232236e2c091f4591de8ea57 -size 1318509 +oid sha256:716122a206b4369157a877644780037c7c402accf39493087c6a35bc7a532efa +size 1413939 diff --git a/ncurses.changes b/ncurses.changes index d463f0f..a428f4e 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 19 09:16:38 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190317 + + regenerate llib-* files. + + modify tic to also use new function for user-defined capability info. + + modify _nc_parse_entry() to check if a user-defined capability has + an unexpected type; ignore it in that case. + + fix a special case of link-anchors in generated Ada html files. + + use newer rel=author tag in generated html rather than rev=made, + which did not become accepted. + ------------------------------------------------------------------- Mon Mar 11 08:19:08 UTC 2019 - Dr. Werner Fink From 641b01344c5e8a5e66d5826e826adbbf4f3db8b6f65b2d5cfdb2de895bfd8464 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 22 Mar 2019 09:01:09 +0000 Subject: [PATCH 4/5] Reintroduce patch ncurses-6.1-fallback.dif to fix boo#1130091 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=417 --- ncurses-6.1-fallback.dif | 19 +++++++++++++++++++ ncurses.changes | 5 +++++ ncurses.spec | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 ncurses-6.1-fallback.dif diff --git a/ncurses-6.1-fallback.dif b/ncurses-6.1-fallback.dif new file mode 100644 index 0000000..17f7620 --- /dev/null +++ b/ncurses-6.1-fallback.dif @@ -0,0 +1,19 @@ +--- + 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.changes b/ncurses.changes index a428f4e..b751755 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 22 08:59:22 UTC 2019 - Dr. Werner Fink + +- Reintroduce patch ncurses-6.1-fallback.dif to fix boo#1130091 + ------------------------------------------------------------------- Tue Mar 19 09:16:38 UTC 2019 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 82f9051..bc60a3b 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -74,6 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc @@ -310,6 +311,7 @@ rm -fr tack tar -xzf %{S:5} mv tack-* tack %patch1 -p0 -b .327x +%patch2 -p0 -b .fb %patch4 -p0 -b .hs %patch0 -p0 -b .p0 From 31d0a25c6cc935dfcfc15eab68d88f0d16eb3d2a8dee3dd33608dbdad8187fcb Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 25 Mar 2019 11:21:41 +0000 Subject: [PATCH 5/5] Update to ncurses 6.1-20190323 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=418 --- ncurses-6.1-fallback.dif | 19 ------------------- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses-6.1.dif | 4 ++-- ncurses.changes | 12 ++++++++++++ ncurses.spec | 6 ++---- 5 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 ncurses-6.1-fallback.dif 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