From c80ed3e32c2a2b067cfd1e5abe1422643cc1459ddf23eaa970a8205ac1fd18fb Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 3 Dec 2018 09:06:57 +0000 Subject: [PATCH 1/4] Update to 6.1-20181201 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=400 --- ncurses-6.1-patches.tar.bz2 | 4 +-- ncurses-6.1.dif | 60 ++++++++++++++++++------------------- ncurses.changes | 28 +++++++++++++++++ ncurses.spec | 2 +- 4 files changed, 61 insertions(+), 33 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 40731d7..9978e01 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:f28d957eeb99889d178ca11bc4c1e404670f2ae98d718928222a39c1487cfbf2 -size 1018304 +oid sha256:87650eefa08ece3611862e2ac55bc4da7320f6c434a07c35c2a0fe31ae853d2e +size 1058448 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index bdd1c3b..9e58ba4 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -22,7 +22,7 @@ 20 files changed, 248 insertions(+), 81 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2018-10-29 10:24:12.315041405 +0000 ++++ aclocal.m4 2018-11-26 12:43:51.841335839 +0000 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -151,7 +151,7 @@ esac done --- configure -+++ configure 2018-10-29 10:24:12.319041330 +0000 ++++ configure 2018-11-26 12:43:51.845335764 +0000 @@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; @@ -161,7 +161,7 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -13562,12 +13562,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 -@@ -13692,9 +13695,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2018-10-29 10:24:12.323041255 +0000 -@@ -2184,6 +2184,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2018-11-26 12:43:51.853335617 +0000 +@@ -2187,6 +2187,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); @@ -817,7 +817,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 2018-10-29 10:24:12.323041255 +0000 ++++ ncurses/run_cmd.sh 2018-11-26 12:43:51.853335617 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -831,7 +831,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2018-10-29 10:24:12.323041255 +0000 ++++ ncurses/tinfo/MKfallback.sh 2018-11-26 12:43:51.853335617 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -864,7 +864,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2018-10-29 10:24:12.323041255 +0000 ++++ ncurses/tinfo/access.c 2018-11-26 12:43:51.853335617 +0000 @@ -35,6 +35,9 @@ #include @@ -907,7 +907,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2018-10-29 10:24:12.323041255 +0000 ++++ ncurses/tinfo/lib_setup.c 2018-11-26 12:43:51.853335617 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -919,7 +919,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2018-10-29 10:24:12.323041255 +0000 ++++ ncurses/tinfo/read_entry.c 2018-11-26 12:43:51.853335617 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -937,7 +937,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2018-10-29 10:24:12.323041255 +0000 ++++ ncurses/tinfo/read_termcap.c 2018-11-26 12:43:51.853335617 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -984,7 +984,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2018-10-29 10:24:12.323041255 +0000 ++++ progs/Makefile.in 2018-11-26 12:43:51.853335617 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -1004,7 +1004,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2018-10-29 10:24:12.323041255 +0000 ++++ test/test.priv.h 2018-11-26 12:43:51.853335617 +0000 @@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index c39cf8f..22e3f81 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Dec 3 06:49:35 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 20181201 + + add midnightbsd to CF_XOPEN_SOURCE macro (patch by Urs Jansen). + + add "@" command to test/ncurses F-test, to allow rapid jump to + different character pages. + + update config.guess, config.sub from + http://git.savannah.gnu.org/cgit/config.git + +------------------------------------------------------------------- +Mon Nov 26 12:42:11 UTC 2018 - Dr. Werner Fink + + +- Add ncurses patch 20181125 + + build-fix (reports by Chih-Hsuan Yen, Sven Joachim). +- Add ncurses patch 20181124 + + check --with-fallbacks option to ensure there is a value, and add + the fallback information to top-level Makefile summary. + + add some traces in initialization to show whether a fallback entry is + used. + + build-fix for test/movewindow with ncurses-examples on Solaris. + + add "-l" option to test/background, to dump screen contents in a form + that lets different curses implementations be compared. + + modify the initialization checks for mouse so that the xterm+sm+1006 + block will work with terminal descriptions not mentioning xterm + (report by Tomas Janousek). + ------------------------------------------------------------------- Wed Nov 21 11:37:09 UTC 2018 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 0085190..362d2e0 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # From 9ce6d48267aa63f90fdd766dae7da735da2dd01408730691776c7650cd5320c1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 10 Dec 2018 08:56:47 +0000 Subject: [PATCH 2/4] Add ncurses patch 6.1-20181208 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=401 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 9978e01..71fa31a 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:87650eefa08ece3611862e2ac55bc4da7320f6c434a07c35c2a0fe31ae853d2e -size 1058448 +oid sha256:4fa05fefd0309b4e996493563bbfebf13063e2182a41e301a3d5f4bd001e1185 +size 1064696 diff --git a/ncurses.changes b/ncurses.changes index 22e3f81..95732e1 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 10 08:54:31 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 20181208 + + modify wbkgd() and wbkgrnd() to improve compatibility with SVr4 + curses, changing the way the window rendition is updated when the + background character is modified (report by Valery Ushakov). + ------------------------------------------------------------------- Mon Dec 3 06:49:35 UTC 2018 - Dr. Werner Fink From 2321e077db9021ce3190a0a5522e4f87b9b2f9f4b9fb2e20762603e77d72123d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 17 Dec 2018 07:47:42 +0000 Subject: [PATCH 3/4] Add ncurses patch 6.1-20181215 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=402 --- ncurses-6.1-patches.tar.bz2 | 4 +- ncurses-6.1.dif | 76 ++++++++++++++++++------------------- ncurses.changes | 17 +++++++++ 3 files changed, 57 insertions(+), 40 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 71fa31a..eb13518 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:4fa05fefd0309b4e996493563bbfebf13063e2182a41e301a3d5f4bd001e1185 -size 1064696 +oid sha256:f4ca9e817953574991b8b5edc62cc2533cc6b170e451330899367ee9a459b147 +size 1132267 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 9e58ba4..71f839d 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -22,7 +22,7 @@ 20 files changed, 248 insertions(+), 81 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2018-11-26 12:43:51.841335839 +0000 ++++ aclocal.m4 2018-12-17 07:11:25.212263133 +0000 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -32,7 +32,7 @@ #include #if defined(__cplusplus) -@@ -4945,12 +4945,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 -@@ -5075,9 +5078,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 -@@ -13707,9 +13710,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2018-11-26 12:43:51.853335617 +0000 -@@ -2187,6 +2187,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2018-12-17 07:11:25.240262609 +0000 +@@ -2191,6 +2191,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); @@ -817,7 +817,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 2018-11-26 12:43:51.853335617 +0000 ++++ ncurses/run_cmd.sh 2018-12-17 07:11:25.240262609 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -831,7 +831,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2018-11-26 12:43:51.853335617 +0000 ++++ ncurses/tinfo/MKfallback.sh 2018-12-17 07:11:25.240262609 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -864,7 +864,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2018-11-26 12:43:51.853335617 +0000 ++++ ncurses/tinfo/access.c 2018-12-17 07:11:25.240262609 +0000 @@ -35,6 +35,9 @@ #include @@ -907,7 +907,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2018-11-26 12:43:51.853335617 +0000 ++++ ncurses/tinfo/lib_setup.c 2018-12-17 07:11:25.240262609 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -919,7 +919,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2018-11-26 12:43:51.853335617 +0000 ++++ ncurses/tinfo/read_entry.c 2018-12-17 07:11:25.240262609 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -937,7 +937,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2018-11-26 12:43:51.853335617 +0000 ++++ ncurses/tinfo/read_termcap.c 2018-12-17 07:11:25.240262609 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -984,7 +984,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2018-11-26 12:43:51.853335617 +0000 ++++ progs/Makefile.in 2018-12-17 07:11:25.240262609 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -1004,7 +1004,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2018-11-26 12:43:51.853335617 +0000 ++++ test/test.priv.h 2018-12-17 07:11:25.240262609 +0000 @@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 95732e1..fa837d9 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Dec 17 07:10:49 UTC 2018 - Dr. Werner Fink + +- Add ncurses patch 20181215 + + several fixes for gcc8 strict compiler warnings. + + fix a typo in comments (Aaron Gyes). + + add nsterm-build309 to replace nsterm-256color, assigning the latter + as an alias of nsterm, to make mouse work with nsterm-256color -TD + + base gnome-256color entry on "gnome", not "vte", for consistency -TD + + updates for configure macros from work on tin and xterm: + + CF_GNU_SOURCE, allow for Cygwin's newlib when checking for the + _DEFAULT_SOURCE symbol. + + CF_VA_COPY, add fallback check if neither va_copy/__va_copy is + supported, to try copying the pointers for va_list, or as an array. + Also add another fallback check, for __builtin_va_copy(), which + could be used with AIX xlc in c89 mode. + ------------------------------------------------------------------- Mon Dec 10 08:54:31 UTC 2018 - Dr. Werner Fink From 1fc197b294e3268bd7020bca68daee960943fd7fe282d57658ca4b9e37fdb9e6 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 2 Jan 2019 09:45:49 +0000 Subject: [PATCH 4/4] Add ncurses patch 6.1-20181229 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=403 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses-6.1.dif | 4 ++-- ncurses.changes | 15 +++++++++++++++ ncurses.spec | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index eb13518..5ca6dcd 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:f4ca9e817953574991b8b5edc62cc2533cc6b170e451330899367ee9a459b147 -size 1132267 +oid sha256:725e5aeafbdc4b46c4263bac7e3c283bea9860553d9d12b917a085f12fae6fc5 +size 1146732 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 71f839d..74d625d 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -807,7 +807,7 @@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h +++ ncurses/curses.priv.h 2018-12-17 07:11:25.240262609 +0000 -@@ -2191,6 +2191,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec +@@ -2196,6 +2196,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); @@ -1005,7 +1005,7 @@ --- test/test.priv.h +++ test/test.priv.h 2018-12-17 07:11:25.240262609 +0000 -@@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s +@@ -929,12 +929,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index fa837d9..a02c5c9 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jan 2 09:43:41 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20181229 + + improve man/curs_mouse.3x with regard to xterm + + modify tracemunch to accept filename parameters in addition to use + as a pipe/filter. + + minor optimization to reduce calls to _nc_reserve_pairs (prompted by + discussion with Bryan Christ). + + add test/pair_content.c and test/color_content.c + + modify infocmp to omit filtering of "OTxx" names which are used for + obsolete capabilities, when the output is sorted by long-names. + Doing this helps when making a table of the short/long capability + names. + ------------------------------------------------------------------- Mon Dec 17 07:10:49 UTC 2018 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 362d2e0..c477a70 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed