From 6856710f56827f2ad410b5f951077905cd304f34f0c39285c796a06da90cb585 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Mon, 1 Apr 2019 07:21:52 +0000 Subject: [PATCH 1/6] Update to ncurses 6.1-20190330 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=420 --- ncurses-5.9-ibm327x.dif | 2 +- ncurses-6.1-patches.tar.bz2 | 4 +-- ncurses-6.1.dif | 72 ++++++++++++++++++------------------- ncurses.changes | 14 ++++++++ 4 files changed, 53 insertions(+), 39 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 51a565a..469b3d2 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -16690,8 +16690,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -16714,8 +16714,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 0a58ffa..9de7804 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:ebc5f17257e154cd75855ed3220643fe8435a4ce0d6aeed29958c62fe11e866a -size 1420839 +oid sha256:e1c88fd300f05035e2c1c4ed64abeba4909c8d8ec08e5ef14e1d24ce8b870d56 +size 1436455 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 40bd4ad..49cc5e5 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -21,7 +21,7 @@ 19 files changed, 248 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2019-02-06 07:51:48.441355403 +0000 ++++ aclocal.m4 2019-04-01 07:18:56.549107037 +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 @@ -31,7 +31,7 @@ #include <stdio.h> #if defined(__cplusplus) -@@ -4950,12 +4950,15 @@ cat >>$cf_edit_man <<CF_EOF +@@ -4993,12 +4993,15 @@ cat >>$cf_edit_man <<CF_EOF echo '? missing rename for '\$cf_source cf_target="\$cf_source" fi @@ -49,7 +49,7 @@ sed -f $cf_man_alias \\ CF_EOF -@@ -4965,7 +4968,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -5008,7 +5011,7 @@ cat >>$cf_edit_man <<CF_EOF CF_EOF else cat >>$cf_edit_man <<CF_EOF @@ -58,7 +58,7 @@ CF_EOF fi -@@ -5005,7 +5008,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -5048,7 +5051,7 @@ cat >>$cf_edit_man <<CF_EOF mv \$TMP.$cf_so_strip \$TMP fi fi @@ -67,7 +67,7 @@ CF_EOF fi -@@ -5014,23 +5017,23 @@ case "$MANPAGE_FORMAT" in +@@ -5057,23 +5060,23 @@ case "$MANPAGE_FORMAT" in cat >>$cf_edit_man <<CF_EOF if test \$form = format ; then # BSDI installs only .0 suffixes in the cat directories @@ -97,7 +97,7 @@ for cf_alias in \$aliases do if test \$section = 1 ; then -@@ -5039,7 +5042,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -5082,7 +5085,7 @@ cat >>$cf_edit_man <<CF_EOF if test "$MANPAGE_SYMLINKS" = yes ; then if test -f \$cf_alias\${suffix} ; then @@ -106,7 +106,7 @@ then continue fi -@@ -5049,18 +5052,18 @@ CF_EOF +@@ -5092,18 +5095,18 @@ CF_EOF case "x$LN_S" in (*-f) cat >>$cf_edit_man <<CF_EOF @@ -128,7 +128,7 @@ echo ".so \$cf_source" >\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -5080,9 +5083,9 @@ cat >>$cf_edit_man <<CF_EOF +@@ -5123,9 +5126,9 @@ cat >>$cf_edit_man <<CF_EOF ) ) elif test \$verb = removing ; then @@ -141,7 +141,7 @@ ) test -d \$cf_subdir\${section} && test -n "\$aliases" && ( -@@ -5102,6 +5105,7 @@ cat >>$cf_edit_man <<CF_EOF +@@ -5145,6 +5148,7 @@ cat >>$cf_edit_man <<CF_EOF # echo ".hy 0" cat \$TMP fi @@ -150,7 +150,7 @@ esac done --- configure -+++ configure 2019-02-06 07:51:48.445355328 +0000 ++++ configure 2019-04-01 07:18:56.549107037 +0000 @@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; @@ -278,7 +278,7 @@ ;; esac done -@@ -24439,6 +24443,7 @@ if test "$with_termlib" != no ; then +@@ -24511,6 +24515,7 @@ if test "$with_termlib" != no ; then TINFO_LDFLAGS="-L${LIB_DIR}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi @@ -287,7 +287,7 @@ # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} --- include/curses.h.in -+++ include/curses.h.in 2019-02-06 07:51:48.445355328 +0000 ++++ include/curses.h.in 2019-04-01 07:18:56.549107037 +0000 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -299,7 +299,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2019-02-06 07:51:48.445355328 +0000 ++++ include/termcap.h.in 2019-04-01 07:18:56.549107037 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,8 +310,8 @@ #undef NCURSES_OSPEED --- include/tic.h -+++ include/tic.h 2019-02-06 07:51:48.445355328 +0000 -@@ -236,12 +236,12 @@ struct alias ++++ include/tic.h 2019-04-01 07:18:56.549107037 +0000 +@@ -236,12 +236,12 @@ struct user_table_entry */ /* out-of-band values for representing absent capabilities */ @@ -327,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2019-02-06 07:51:48.445355328 +0000 ++++ man/man_db.renames 2019-04-01 07:18:56.549107037 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -345,7 +345,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2019-02-06 07:51:48.445355328 +0000 ++++ man/ncurses.3x 2019-04-01 07:18:56.553106962 +0000 @@ -139,6 +139,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -358,7 +358,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 2019-02-06 07:51:48.445355328 +0000 ++++ misc/gen-pkgconfig.in 2019-04-01 07:18:56.553106962 +0000 @@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include" fi @@ -398,7 +398,7 @@ if test $name = $MAIN_LIBRARY --- misc/terminfo.src -+++ misc/terminfo.src 2019-02-06 07:51:48.453355178 +0000 ++++ misc/terminfo.src 2019-04-01 07:18:56.553106962 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -738,7 +738,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -9042,7 +9125,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9066,7 +9149,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -747,7 +747,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, -@@ -12273,6 +12356,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12297,6 +12380,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 <rmam>/<smam> based on the init string -- esr) @@ -755,7 +755,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, -@@ -12282,7 +12366,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12306,7 +12390,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, @@ -764,7 +764,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, -@@ -16700,7 +16784,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -16724,7 +16808,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, @@ -773,7 +773,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 -@@ -16958,7 +17042,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16982,7 +17066,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. @@ -783,7 +783,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 2019-02-06 07:51:48.453355178 +0000 ++++ ncurses/Makefile.in 2019-04-01 07:18:56.553106962 +0000 @@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -794,8 +794,8 @@ ./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 2019-02-06 07:51:48.453355178 +0000 -@@ -2224,6 +2224,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2019-04-01 07:18:56.553106962 +0000 +@@ -2229,6 +2229,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); @@ -805,7 +805,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 2019-02-06 07:51:48.453355178 +0000 ++++ ncurses/run_cmd.sh 2019-04-01 07:18:56.553106962 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -819,7 +819,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2019-02-06 07:51:48.453355178 +0000 ++++ ncurses/tinfo/MKfallback.sh 2019-04-01 07:18:56.553106962 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -852,7 +852,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2019-02-06 08:09:01.662042242 +0000 ++++ ncurses/tinfo/access.c 2019-04-01 07:18:56.553106962 +0000 @@ -30,6 +30,10 @@ * Author: Thomas E. Dickey * ****************************************************************************/ @@ -896,7 +896,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2019-02-06 07:51:48.457355102 +0000 ++++ ncurses/tinfo/lib_setup.c 2019-04-01 07:18:56.557106886 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -908,7 +908,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2019-02-06 07:51:48.457355102 +0000 ++++ ncurses/tinfo/read_entry.c 2019-04-01 07:18:56.557106886 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -926,7 +926,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2019-02-06 07:51:48.457355102 +0000 ++++ ncurses/tinfo/read_termcap.c 2019-04-01 07:18:56.557106886 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -973,7 +973,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2019-02-06 07:51:48.457355102 +0000 ++++ progs/Makefile.in 2019-04-01 07:18:56.557106886 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -993,8 +993,8 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2019-02-06 07:51:48.457355102 +0000 -@@ -944,12 +944,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2019-04-01 07:18:56.557106886 +0000 +@@ -960,12 +960,12 @@ extern char * _nc_strstr (const char *, #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index db0bfd0..2e8c086 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Apr 1 07:18:00 UTC 2019 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20190330 + + add "screen5", to mention italics (report by Stefan Assmann) + + modify description of xterm+x11hilite to eliminate unused p5 -TD + + add configure script checks to help with a port to Ultrix 3.1 + (report by Dennis Grevenstein). + + check if "b" binary feature of fopen works + + check for missing feature of locale.h + + add fallback for strstr() in test-programs + + add fallback for STDOUT_FILENO in test-programs + + update config.guess, config.sub + ------------------------------------------------------------------- Mon Mar 25 11:15:44 UTC 2019 - Dr. Werner Fink <werner@suse.de> From 21f3d8c67d9e7c0ce08d56d50d831cc360401be3555b196e5bce021f0db910e4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Mon, 8 Apr 2019 06:43:48 +0000 Subject: [PATCH 2/6] Update to ncurses 6.1-20190406 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=421 --- 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 9de7804..b201990 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:e1c88fd300f05035e2c1c4ed64abeba4909c8d8ec08e5ef14e1d24ce8b870d56 -size 1436455 +oid sha256:d7a559fa2574c0ea4d00a1d81bc964d89711ae911f1231e5f74b0cf87b4a3c1c +size 1439927 diff --git a/ncurses.changes b/ncurses.changes index 2e8c086..0041863 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 8 06:42:14 UTC 2019 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20190406 + + modify MKcaptab.sh, MKkey_defs.sh, and MKhashsize.sh to handle + split-up Caps-files. + + build-fixes if extended-functions are disabled. + ------------------------------------------------------------------- Mon Apr 1 07:18:00 UTC 2019 - Dr. Werner Fink <werner@suse.de> From dbf99fec7fbf1d9b02c17876f54e408e708e80cc7034dac0be593f97b2a40313 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Tue, 23 Apr 2019 12:25:59 +0000 Subject: [PATCH 3/6] Update to ncurses-6.1-20190420 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=422 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses-6.1.dif | 2 +- ncurses.changes | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index b201990..7ce0258 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:d7a559fa2574c0ea4d00a1d81bc964d89711ae911f1231e5f74b0cf87b4a3c1c -size 1439927 +oid sha256:7e566d8d902c5d0966d9dfb8b9fd37c55391a9cb6eda6f2f4e265dbbde9e4543 +size 1455549 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 49cc5e5..8a2ec4d 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -994,7 +994,7 @@ --- test/test.priv.h +++ test/test.priv.h 2019-04-01 07:18:56.557106886 +0000 -@@ -960,12 +960,12 @@ extern char * _nc_strstr (const char *, +@@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *, #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index 0041863..8faf8ef 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 23 11:32:35 UTC 2019 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20190420 + + improve ifdef's for TABSIZE variable, to help with AIX/HPUX ports. +- Add ncurses patch 20190413 + + check for TABSIZE variable in test/configure script. + + used test/test_arrays.c to improve Caps.aix1 and Caps.hpux11 + + corrected filtering of comments in MKparametrized.sh + + reduce duplication across Caps* files by moving some parts which do + not depend on order into Caps-ncurses. + ------------------------------------------------------------------- Mon Apr 8 06:42:14 UTC 2019 - Dr. Werner Fink <werner@suse.de> From 6cfc406a93fc6679d93e39723d3296ec8199af171abb0c1d86487b2721973767 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Mon, 29 Apr 2019 07:06:03 +0000 Subject: [PATCH 4/6] Update to 6.1-20190427 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=423 --- 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 7ce0258..b74a0a6 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:7e566d8d902c5d0966d9dfb8b9fd37c55391a9cb6eda6f2f4e265dbbde9e4543 -size 1455549 +oid sha256:058a81f0ef36f12eb4034e23123f3cfe9404c1c8efe534097f43229b23140c81 +size 1456650 diff --git a/ncurses.changes b/ncurses.changes index 8faf8ef..6dfde19 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 29 07:04:37 UTC 2019 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20190427 + + corrected problem in terminfo load/realignment which prevented + infocmp from comparing extended capabilities with the same name + but different types. + ------------------------------------------------------------------- Tue Apr 23 11:32:35 UTC 2019 - Dr. Werner Fink <werner@suse.de> From b263cbbb5646fcc2a3b5ca1e68d0001d9a4818e82e75287ba938aee023a47c5c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Mon, 13 May 2019 07:52:50 +0000 Subject: [PATCH 5/6] Update to 6.1-20190511 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=424 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses-6.1.dif | 2 +- ncurses.changes | 22 ++++++++++++++++++++++ ncurses.spec | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index b74a0a6..03481d0 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:058a81f0ef36f12eb4034e23123f3cfe9404c1c8efe534097f43229b23140c81 -size 1456650 +oid sha256:dbc0a08f023e71a98d10fec35cd0da19d63886f925d3aa7af9708a2397f076db +size 1463006 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 8a2ec4d..9854054 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-04-01 07:18:56.553106962 +0000 -@@ -2229,6 +2229,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec +@@ -2235,6 +2235,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 6dfde19..4e2b352 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon May 13 07:51:13 UTC 2019 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20190511 + + fix a spurious blank line seen with "infocmp -1fx xterm+x11mouse" + + add checks in repair_subwindows() to keep the current position and + scroll-margins inside the resized subwindow. + + add a limit check in newline_forces_scroll() for the case where the + row is inside scroll-margins, but not at the end (report by Toshio + Kuratomi, cf: 20170729). + + corrected a warning message in tic for extended capabilities versus + number of parameters. + +------------------------------------------------------------------- +Fri May 10 07:55:17 UTC 2019 - Dr. Werner Fink <werner@suse.de> + +- Add ncurses patch 20190504 + + improve workaround for Solaris wcwidth versus line-drawing characters + (report by Pavel Stehule). + + add special case in tic to validate RGB string-capability extension. + + corrected string/parameter-field for RGB in Caps-ncurses. + ------------------------------------------------------------------- Mon Apr 29 07:04:37 UTC 2019 - Dr. Werner Fink <werner@suse.de> diff --git a/ncurses.spec b/ncurses.spec index 268fe3d..3342f63 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 http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # From a155c6ba27ca2aa24649212a5a357a36561e05d02c43e03ef5fb04168a525f5b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Wed, 15 May 2019 11:49:05 +0000 Subject: [PATCH 6/6] Make pkg-config files .pc consistent OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=425 --- ncurses.changes | 5 +++++ ncurses.spec | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/ncurses.changes b/ncurses.changes index 4e2b352..4e2c202 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 15 11:43:33 UTC 2019 - Dr. Werner Fink <werner@suse.de> + +- Make pkg-config files .pc consistent + ------------------------------------------------------------------- Mon May 13 07:51:13 UTC 2019 - Dr. Werner Fink <werner@suse.de> diff --git a/ncurses.spec b/ncurses.spec index 3342f63..0efb4ce 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -598,7 +598,14 @@ mv tack-* tack mkdir pc PKG_CONFIG_PATH=$PWD/pc:$(pkg-config --variable pc_path pkg-config) export PKG_CONFIG_PATH - mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ + rm -vf %{root}%{_libdir}/pkgconfig/tic.pc + rm -vf %{root}%{_libdir}/pkgconfig/tinfo.pc + mv -vf %{root}%{_libdir}/pkgconfig/*.pc pc/ + sed -ri 's@^(Requires.private: ).*@\1panelw, menuw, formw, ncursesw, tinfo@' \ + pc/ncurses++w.pc + sed -ri 's@^(Requires.private: ).*@\1ncursesw, tinfo@' pc/{form,menu,panel}w.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncursesw -ltinfo -ldl@' pc/{form,menu,panel}w.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncursesw)" --libs "$(pkg-config --libs ncursesw)" \ %{root}%{_bindir}/ncursesw6-config # @@ -681,15 +688,17 @@ mv tack-* tack test -e "$pc" || break base=${pc%%.pc} base=${base##*/} - case "$base" in - tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; - *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" - esac sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncurses@' "$pc" sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc" - sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc" mv -f $pc pc/${base}5.pc done + sed -ri 's@^(Requires.private: ).*@\1panel5, menu5, form5, ncurses5, tinfo5@' \ + pc/ncurses++5.pc + sed -ri 's@^(Requires.private: ).*@\1ncurses5, tinfo5@' pc/{form,menu,panel}5.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncurses -ltinfo -ldl@' pc/{form,menu,panel}5.pc + sed -ri 's@^(Requires.private: ).*@\1tinfo5@' pc/tic5.pc + sed -ri 's@^(Libs.private: .*)@\1 -ltinfo@' pc/tic5.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncurses5)" --libs "$(pkg-config --libs ncurses5)" \ %{root}%{_bindir}/ncurses5-config @@ -739,6 +748,13 @@ mv tack-* tack sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ + sed -ri 's@^(Requires.private: ).*@\1panel, menu, form, ncurses, tinfo@' \ + pc/ncurses++.pc + sed -ri 's@^(Requires.private: ).*@\1ncurses, tinfo@' pc/{form,menu,panel}.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncurses -ltinfo -ldl@' pc/{form,menu,panel}.pc + sed -ri 's@^(Requires.private: ).*@\1tinfo@' pc/tic.pc + sed -ri 's@^(Libs.private: .*)@\1 -ltinfo@' pc/tic.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncurses)" --libs "$(pkg-config --libs ncurses)" \ %{root}%{_bindir}/ncurses6-config # @@ -810,20 +826,23 @@ mv tack-* tack pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 popd + rm -vf %{root}%{_libdir}/pkgconfig/tic.pc + rm -vf %{root}%{_libdir}/pkgconfig/tinfo.pc for pc in %{root}%{_libdir}/pkgconfig/*.pc do test -e "$pc" || break base=${pc%%.pc} base=${base##*/} - case "$base" in - tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; - *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" - esac sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncursesw@' "$pc" sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc" sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc" mv -f $pc pc/${base}5.pc done + sed -ri 's@^(Requires.private: ).*@\1panelw5, menuw5, formw5, ncursesw5, tinfo5@' \ + pc/ncurses++w5.pc + sed -ri 's@^(Requires.private: ).*@\1ncursesw5, tinfo5@' pc/{form,menu,panel}w5.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncursesw -ltinfo -ldl@' pc/{form,menu,panel}w5.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncursesw5)" --libs "$(pkg-config --libs ncursesw5)" \ %{root}%{_bindir}/ncursesw5-config