From 8d6744bd70250be6960076686d7508d5b012c8c65ee29b6aa9fc926d6df70618 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 7 Jun 2021 10:02:33 +0000 Subject: [PATCH 1/2] Update to ncurses-6.2 patch 20210605 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=551 --- ncurses-6.2-patches.tar.bz2 | 4 +-- ncurses-6.2.dif | 60 ++++++++++++++++++------------------- ncurses.changes | 18 +++++++++++ 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 3e1f361..f153627 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:e4c003f2d9c0a7601e105ce12ae75a7c44f2bf01cf1ca5beb348679b45206f0b -size 2351699 +oid sha256:d2237538ce1854cffca78a8ec4cea2f1d4c67de391a02fac4232a3c2fa9f4fee +size 2439352 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 3cc3358..70c54af 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -22,7 +22,7 @@ 20 files changed, 233 insertions(+), 70 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2021-05-03 07:10:26.872868212 +0000 ++++ aclocal.m4 2021-06-07 07:18:38.416598899 +0000 @@ -639,7 +639,7 @@ AC_CHECK_SIZEOF(bool,,[ AC_CACHE_CHECK(for type of bool, cf_cv_type_of_bool,[ rm -f cf_test.out @@ -151,7 +151,7 @@ esac done --- configure -+++ configure 2021-05-03 07:10:26.872868212 +0000 ++++ configure 2021-06-07 07:18:38.420598827 +0000 @@ -5849,7 +5849,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; @@ -170,7 +170,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -14502,12 +14502,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 -@@ -14632,9 +14635,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < #undef GCC_NORETURN #define GCC_NORETURN _Noreturn -@@ -198,6 +198,9 @@ typedef @cf_cv_typeof_chtype@ chtype; +@@ -226,6 +226,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -310,7 +310,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2021-05-03 07:10:26.872868212 +0000 ++++ include/termcap.h.in 2021-06-07 07:18:38.420598827 +0000 @@ -47,6 +47,8 @@ extern "C" { #endif /* __cplusplus */ @@ -321,7 +321,7 @@ #undef NCURSES_OSPEED --- include/tic.h -+++ include/tic.h 2021-05-03 07:10:26.872868212 +0000 ++++ include/tic.h 2021-06-07 07:18:38.420598827 +0000 @@ -237,12 +237,12 @@ struct user_table_entry */ @@ -338,7 +338,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2021-05-03 07:10:26.872868212 +0000 ++++ man/man_db.renames 2021-06-07 07:18:38.420598827 +0000 @@ -164,6 +164,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -356,7 +356,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2021-05-03 07:10:26.872868212 +0000 ++++ man/ncurses.3x 2021-06-07 07:18:38.420598827 +0000 @@ -139,6 +139,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -369,7 +369,7 @@ called \fIwindows\fR, which can be thought of as two-dimensional arrays of characters representing all or part of a CRT screen. --- misc/gen-pkgconfig.in -+++ misc/gen-pkgconfig.in 2021-05-03 07:10:26.876868138 +0000 ++++ misc/gen-pkgconfig.in 2021-06-07 07:18:38.420598827 +0000 @@ -92,6 +92,9 @@ do -specs*) # ignore linker specs-files which were used to build library continue @@ -410,7 +410,7 @@ if [ $name = $MAIN_LIBRARY ] --- misc/terminfo.src -+++ misc/terminfo.src 2021-05-03 07:10:26.876868138 +0000 ++++ misc/terminfo.src 2021-06-07 07:18:38.424598755 +0000 @@ -305,7 +305,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -659,7 +659,7 @@ s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in -+++ ncurses/Makefile.in 2021-05-03 07:10:26.876868138 +0000 ++++ ncurses/Makefile.in 2021-06-07 07:18:38.424598755 +0000 @@ -230,7 +230,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -670,7 +670,7 @@ ./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 2021-05-03 07:10:26.876868138 +0000 ++++ ncurses/curses.priv.h 2021-06-07 07:18:38.424598755 +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); @@ -681,7 +681,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 2021-05-03 07:10:26.876868138 +0000 ++++ ncurses/run_cmd.sh 2021-06-07 07:18:38.424598755 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -695,7 +695,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2021-05-03 07:10:26.876868138 +0000 ++++ ncurses/tinfo/MKfallback.sh 2021-06-07 07:18:38.424598755 +0000 @@ -74,6 +74,12 @@ else tmp_info= fi @@ -728,7 +728,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2021-05-03 07:10:26.876868138 +0000 ++++ ncurses/tinfo/access.c 2021-06-07 07:18:38.424598755 +0000 @@ -31,6 +31,10 @@ * Author: Thomas E. Dickey * ****************************************************************************/ @@ -772,7 +772,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2021-05-03 07:10:26.876868138 +0000 ++++ ncurses/tinfo/lib_setup.c 2021-06-07 07:18:38.424598755 +0000 @@ -613,6 +613,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -784,7 +784,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2021-05-03 07:10:26.876868138 +0000 ++++ ncurses/tinfo/read_entry.c 2021-06-07 07:18:38.424598755 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -802,7 +802,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2021-05-03 07:10:26.880868063 +0000 ++++ ncurses/tinfo/read_termcap.c 2021-06-07 07:18:38.424598755 +0000 @@ -323,14 +323,18 @@ _nc_getent( */ if (fd >= 0) { @@ -849,7 +849,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2021-05-03 07:10:26.880868063 +0000 ++++ progs/Makefile.in 2021-06-07 07:18:38.424598755 +0000 @@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE @@ -869,7 +869,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2021-05-03 07:10:26.880868063 +0000 ++++ test/test.priv.h 2021-06-07 07:18:38.424598755 +0000 @@ -1037,12 +1037,12 @@ extern char *_nc_strstr(const char *, co #endif @@ -886,7 +886,7 @@ #define CANCELLED_STRING (char *)(-1) --- test/tracemunch -+++ test/tracemunch 2021-05-03 07:10:26.880868063 +0000 ++++ test/tracemunch 2021-06-07 07:18:38.428598683 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl diff --git a/ncurses.changes b/ncurses.changes index 6841059..28978e7 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Jun 7 07:17:02 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210605 + + add a summary of ncurses-specific preprocessor symbols to curses.h + (prompted by discussion with Peter Farley, Bill Gray). +- Add ncurses patch 20210522 + + regenerate configure scripts with autoconf 2.52.20210509 to eliminate + an unnecessary warning in config.log (report by Miroslav Lichvar). + + add a note in manual page to explain ungetch vs unget_wch (prompted + by discussion with Peter Farley). + + add sp-funcs for erasewchar, killwchar. + + modify wgetnstr, wgetn_wstr to improve compatibility with SVr4 curses + in its treatment of interrupt and quit characters (prompted by + report/testcase by Bill Gray) + + update config.guess, config.sub +- Correct offset in patch ncurses-6.2.dif + ------------------------------------------------------------------- Mon May 17 06:29:16 UTC 2021 - Dr. Werner Fink From 24b0dae46388db5086277f7dc6dbc8708faa97ca6cfe62de1fdc87c7d41fd6b8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Jun 2021 06:33:11 +0000 Subject: [PATCH 2/2] Update to ncurses-6.2 patch 20210612 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=552 --- ncurses-6.2-patches.tar.bz2 | 4 ++-- ncurses.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index f153627..180cb6a 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:d2237538ce1854cffca78a8ec4cea2f1d4c67de391a02fac4232a3c2fa9f4fee -size 2439352 +oid sha256:1af6ab98b3a7ea07920eda3ac27cc5b8baa00f59b6e68e1ed7490d137dcc5516 +size 2443163 diff --git a/ncurses.changes b/ncurses.changes index 28978e7..980727b 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 14 06:31:35 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210612 + + fixes for scan-build, valgrind build/testing. + + update config.guess + ------------------------------------------------------------------- Mon Jun 7 07:17:02 UTC 2021 - Dr. Werner Fink