testing/ncurses
SHA256
3
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Accepting request 703136 from Base:System

Browse Source 
- Make pkg-config files .pc consistent

- 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.

- 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.

- Add ncurses patch 20190427
  + corrected problem in terminfo load/realignment which prevented
    infocmp from comparing extended capabilities with the same name
    but different types.

- 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

OBS-URL: https://build.opensuse.org/request/show/703136
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=155
This commit is contained in:
Dominique Leuenberger 2019-05-21 08:19:27 +00:00 committed by Git OBS Bridge
commit a85e38dc84
5 changed files with 138 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ncurses-5.9-ibm327x.dif
View File

@ -4,7 +4,7 @@
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 +++ 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, ibm327x|line mode IBM 3270 style,

4
ncurses-6.1-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ebc5f17257e154cd75855ed3220643fe8435a4ce0d6aeed29958c62fe11e866a oid sha256:dbc0a08f023e71a98d10fec35cd0da19d63886f925d3aa7af9708a2397f076db
size 1420839 size 1463006

72
ncurses-6.1.dif
View File

@ -21,7 +21,7 @@
19 files changed, 248 insertions(+), 80 deletions(-) 19 files changed, 248 insertions(+), 80 deletions(-)
--- aclocal.m4 --- 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]) @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[ AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out rm -f cf_test.out
@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #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 echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -49,7 +49,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -4965,7 +4968,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5008,7 +5011,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -58,7 +58,7 @@
CF_EOF CF_EOF
fi 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 mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -67,7 +67,7 @@
CF_EOF CF_EOF
fi fi
@@ -5014,23 +5017,23 @@ case "$MANPAGE_FORMAT" in @@ -5057,23 +5060,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -97,7 +97,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then 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 "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -106,7 +106,7 @@
then then
continue continue
fi fi
@@ -5049,18 +5052,18 @@ CF_EOF @@ -5092,18 +5095,18 @@ CF_EOF
case "x$LN_S" in case "x$LN_S" in
(*-f) (*-f)
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -128,7 +128,7 @@
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then 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 elif test \$verb = removing ; then
@ -141,7 +141,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( 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" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -150,7 +150,7 @@
esac esac
done done
--- configure --- 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 @@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti
fi fi
;; ;;
@ -278,7 +278,7 @@
;; ;;
esac esac
done 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}" TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -287,7 +287,7 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- include/curses.h.in --- 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; @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t; typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif #endif
@ -299,7 +299,7 @@
* We need FILE, etc. Include this before checking any feature symbols. * We need FILE, etc. Include this before checking any feature symbols.
*/ */
--- include/termcap.h.in --- 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" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -310,8 +310,8 @@
#undef NCURSES_OSPEED #undef NCURSES_OSPEED
--- include/tic.h --- include/tic.h
+++ include/tic.h 2019-02-06 07:51:48.445355328 +0000 +++ include/tic.h 2019-04-01 07:18:56.549107037 +0000
@@ -236,12 +236,12 @@ struct alias @@ -236,12 +236,12 @@ struct user_table_entry
*/ */
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- 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 @@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5 terminfo.5 terminfo.5
@ -345,7 +345,7 @@
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- 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 @@ -139,6 +139,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes .SS Datatypes
@ -358,7 +358,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- 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" @@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -398,7 +398,7 @@
if test $name = $MAIN_LIBRARY if test $name = $MAIN_LIBRARY
--- misc/terminfo.src --- 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, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -738,7 +738,7 @@
kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, 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, 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/>, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@ -747,7 +747,7 @@
am, da, db, xhp, am, da, db, xhp,
cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, 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. # at support for the VT320 itself.
# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # 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) # (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, vt320-k3|MS-Kermit 3.00's vt320 emulation,
am, eslok, hs, km, mir, msgr, xenl, am, eslok, hs, km, mir, msgr, xenl,
cols#80, it#8, lines#49, pb#9600, vt#3, 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, 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, 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, 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, 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[ flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
?5l, ?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, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, 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, 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}%|%; sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t %?%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, tbc=\E[3g,
# "Megapel" refers to the display adapter, which was used with the IBM RT # "Megapel" refers to the display adapter, which was used with the IBM RT
# aka IBM 6150. # aka IBM 6150.
@ -783,7 +783,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- 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) : @@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -794,8 +794,8 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2019-02-06 07:51:48.453355178 +0000 +++ ncurses/curses.priv.h 2019-04-01 07:18:56.553106962 +0000
@@ -2224,6 +2224,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_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); 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_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh --- 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 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -819,7 +819,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- 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 @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -852,7 +852,7 @@
done done
--- ncurses/tinfo/access.c --- 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 @@ @@ -30,6 +30,10 @@
* Author: Thomas E. Dickey * * Author: Thomas E. Dickey *
****************************************************************************/ ****************************************************************************/
@ -896,7 +896,7 @@
_nc_access(const char *path, int mode) _nc_access(const char *path, int mode)
{ {
--- ncurses/tinfo/lib_setup.c --- 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) @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) { } else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */ result = value; /* use extension feature */
@ -908,7 +908,7 @@
result = 1; /* always broken */ result = 1; /* always broken */
} else if (strstr(env, "screen") != 0 } else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c --- 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 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -926,7 +926,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- 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( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -973,7 +973,7 @@
} }
if (copied != 0) if (copied != 0)
--- progs/Makefile.in --- 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) @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -993,8 +993,8 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2019-02-06 07:51:48.457355102 +0000 +++ test/test.priv.h 2019-04-01 07:18:56.557106886 +0000
@@ -944,12 +944,12 @@ extern char *strnames[], *strcodes[], *s @@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *,
#endif #endif
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */

69
ncurses.changes
View File

@ -1,3 +1,72 @@
-------------------------------------------------------------------
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>
- 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>
- 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>
- 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>
- 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>
- 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> Mon Mar 25 11:15:44 UTC 2019 - Dr. Werner Fink <werner@suse.de>

41
ncurses.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
@ -598,7 +598,14 @@ mv tack-* tack
mkdir pc mkdir pc
PKG_CONFIG_PATH=$PWD/pc:$(pkg-config --variable pc_path pkg-config) PKG_CONFIG_PATH=$PWD/pc:$(pkg-config --variable pc_path pkg-config)
export PKG_CONFIG_PATH 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)" \ sh %{S:6} --cflags "$(pkg-config --cflags ncursesw)" --libs "$(pkg-config --libs ncursesw)" \
%{root}%{_bindir}/ncursesw6-config %{root}%{_bindir}/ncursesw6-config
# #
@ -681,15 +688,17 @@ mv tack-* tack
test -e "$pc" || break test -e "$pc" || break
base=${pc%%.pc} base=${pc%%.pc}
base=${base##*/} 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@^(includedir=).*@\1%{_incdir}/ncurses5/ncurses@' "$pc"
sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$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 mv -f $pc pc/${base}5.pc
done 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)" \ sh %{S:6} --cflags "$(pkg-config --cflags ncurses5)" --libs "$(pkg-config --libs ncurses5)" \
%{root}%{_bindir}/ncurses5-config %{root}%{_bindir}/ncurses5-config
@ -739,6 +748,13 @@ mv tack-* tack
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1
popd popd
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ 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)" \ sh %{S:6} --cflags "$(pkg-config --cflags ncurses)" --libs "$(pkg-config --libs ncurses)" \
%{root}%{_bindir}/ncurses6-config %{root}%{_bindir}/ncurses6-config
# #
@ -810,20 +826,23 @@ mv tack-* tack
pushd man pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1
popd popd
rm -vf %{root}%{_libdir}/pkgconfig/tic.pc
rm -vf %{root}%{_libdir}/pkgconfig/tinfo.pc
for pc in %{root}%{_libdir}/pkgconfig/*.pc for pc in %{root}%{_libdir}/pkgconfig/*.pc
do do
test -e "$pc" || break test -e "$pc" || break
base=${pc%%.pc} base=${pc%%.pc}
base=${base##*/} 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@^(includedir=).*@\1%{_incdir}/ncurses5/ncursesw@' "$pc"
sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc" sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc"
sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc" sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc"
mv -f $pc pc/${base}5.pc mv -f $pc pc/${base}5.pc
done 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)" \ sh %{S:6} --cflags "$(pkg-config --cflags ncursesw5)" --libs "$(pkg-config --libs ncursesw5)" \
%{root}%{_bindir}/ncursesw5-config %{root}%{_bindir}/ncursesw5-config