From 2e57815c196718ee06afed1d1ff42e53cd55016030c83d93efe60cc365027b3b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sun, 22 Jul 2018 09:04:36 +0000 Subject: [PATCH] Update to ncurses 6.1-2018072 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=384 --- ncurses-5.9-ibm327x.dif | 4 +-- ncurses-6.1-patches.tar.bz2 | 4 +-- ncurses-6.1.dif | 50 ++++++++++++++++++------------------- ncurses.changes | 9 +++++++ 4 files changed, 38 insertions(+), 29 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 7346318..2ae7a57 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -3,8 +3,8 @@ 1 file changed, 2 insertions(+), 2 deletions(-) --- misc/terminfo.src -+++ misc/terminfo.src 2018-05-28 15:02:40.243851782 +0000 -@@ -16484,8 +16484,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2018-07-22 09:00:18.872965895 +0000 +@@ -16490,8 +16490,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 86a4306..7565d36 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:13ceb7a45f0c078ac693fd0abd0edd5d406d0272134ef53f3eaf543725025758 -size 487474 +oid sha256:8037b9ddb8d51c5f6e8fc09c3da936a275f552ccbbf49cab27376a70bb105886 +size 491942 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index dbfc6b1..57864ce 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-07-20 10:44:09.337972969 +0000 ++++ aclocal.m4 2018-07-22 09:00:46.348467325 +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-07-20 10:44:09.337972969 +0000 ++++ configure 2018-07-22 09:00:46.352467252 +0000 @@ -5352,7 +5352,7 @@ case $cf_cv_system_name in fi ;; @@ -279,7 +279,7 @@ ;; esac done -@@ -23960,6 +23964,7 @@ if test "$with_termlib" != no ; then +@@ -23970,6 +23974,7 @@ if test "$with_termlib" != no ; then TINFO_LDFLAGS="-L${LIB_DIR}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi @@ -288,7 +288,7 @@ # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} --- include/curses.h.in -+++ include/curses.h.in 2018-07-20 10:44:09.337972969 +0000 ++++ include/curses.h.in 2018-07-22 09:00:46.352467252 +0000 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -300,7 +300,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2018-07-20 10:44:09.337972969 +0000 ++++ include/termcap.h.in 2018-07-22 09:00:46.352467252 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -311,7 +311,7 @@ #undef NCURSES_OSPEED --- include/tic.h -+++ include/tic.h 2018-07-20 10:44:09.337972969 +0000 ++++ include/tic.h 2018-07-22 09:00:46.352467252 +0000 @@ -221,12 +221,12 @@ struct alias */ @@ -328,7 +328,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2018-07-20 10:44:09.337972969 +0000 ++++ man/man_db.renames 2018-07-22 09:00:46.352467252 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -346,7 +346,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2018-07-20 10:44:09.341972897 +0000 ++++ man/ncurses.3x 2018-07-22 09:00:46.352467252 +0000 @@ -138,6 +138,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -359,7 +359,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 2018-07-20 10:44:09.341972897 +0000 ++++ misc/gen-pkgconfig.in 2018-07-22 09:00:46.352467252 +0000 @@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include" fi @@ -399,7 +399,7 @@ if test $name = $MAIN_LIBRARY --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2018-07-20 10:44:09.341972897 +0000 ++++ misc/ncurses-config.in 2018-07-22 09:00:46.352467252 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -410,7 +410,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2018-07-20 10:44:09.341972897 +0000 ++++ misc/terminfo.src 2018-07-22 09:00:46.360467107 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -759,7 +759,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -12071,6 +12154,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12077,6 +12160,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # (vt320-k3: I added / based on the init string -- esr) @@ -767,7 +767,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -12080,7 +12164,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12086,7 +12170,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -776,7 +776,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ ?5l, -@@ -16494,7 +16578,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -16500,7 +16584,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -785,7 +785,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -16752,7 +16836,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16758,7 +16842,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. @@ -795,7 +795,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 2018-07-20 10:44:09.345972825 +0000 ++++ ncurses/Makefile.in 2018-07-22 09:00:46.360467107 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -806,7 +806,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 2018-07-20 10:44:09.345972825 +0000 ++++ ncurses/curses.priv.h 2018-07-22 09:00:46.360467107 +0000 @@ -2173,6 +2173,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); @@ -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-07-20 10:44:09.345972825 +0000 ++++ ncurses/run_cmd.sh 2018-07-22 09:00:46.360467107 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -831,7 +831,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2018-07-20 10:44:09.345972825 +0000 ++++ ncurses/tinfo/MKfallback.sh 2018-07-22 09:00:46.360467107 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -864,7 +864,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2018-07-20 10:44:09.345972825 +0000 ++++ ncurses/tinfo/access.c 2018-07-22 09:00:46.360467107 +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-07-20 10:44:09.345972825 +0000 ++++ ncurses/tinfo/lib_setup.c 2018-07-22 09:00:46.360467107 +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-07-20 10:44:09.345972825 +0000 ++++ ncurses/tinfo/read_entry.c 2018-07-22 09:00:46.360467107 +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-07-20 10:44:09.345972825 +0000 ++++ ncurses/tinfo/read_termcap.c 2018-07-22 09:00:46.360467107 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -984,7 +984,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2018-07-20 10:44:09.345972825 +0000 ++++ progs/Makefile.in 2018-07-22 09:00:46.360467107 +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-07-20 10:44:09.345972825 +0000 ++++ test/test.priv.h 2018-07-22 09:00:46.360467107 +0000 @@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index a346974..7526fc1 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jul 22 08:58:39 UTC 2018 - werner@suse.de + +- Add ncurses patch 6.1-20180721 + + build-fixes for gcc8. + + corrected acsc for wy50 -TD + + add wy50 and wy60 shifted function-keys as kF1 to kF16 -TD + + remove ansi+rep mis-added to interix in 2018-02-23 -TD + ------------------------------------------------------------------- Fri Jul 20 10:42:17 UTC 2018 - werner@suse.de