diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 5da6071..fcac736 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 2016-10-17 08:39:16.245980044 +0000 -@@ -15792,8 +15792,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2017-01-30 08:58:00.238320491 +0000 +@@ -15941,8 +15941,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 55cf572..c4e53f8 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42dc865bc17177a245ff496b9e648927432fe4b076bd9c6b5e5eee2a621912b0 -size 1393149 +oid sha256:72dc24460e605ed1ce18410aed542b7e88a3fed63eb08827eb20199f5d718da3 +size 1640183 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 4e3e1f9..3041a78 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,7 +21,7 @@ 19 files changed, 240 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2016-12-12 12:26:15.352276409 +0000 ++++ aclocal.m4 2017-01-30 08:55:04.189218562 +0000 @@ -564,7 +564,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 #if defined(__cplusplus) -@@ -4719,12 +4719,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 -@@ -4849,9 +4852,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 -@@ -11772,9 +11775,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -4547,8 +4560,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4549,8 +4562,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -543,7 +543,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -4891,7 +4922,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -4893,7 +4924,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -552,7 +552,7 @@ bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5067,10 +5098,14 @@ mgt|Multi GNOME Terminal, +@@ -5069,10 +5100,14 @@ mgt|Multi GNOME Terminal, #### KDE # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -568,7 +568,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -5201,14 +5236,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5203,14 +5238,14 @@ mlterm3|multi lingual terminal emulator, mlterm2|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -586,7 +586,7 @@ home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, -@@ -5264,6 +5299,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5266,6 +5301,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. # Since rxvt is not really compatible with xterm, it should be configured as # "rxvt" or "rxvt-color". @@ -594,7 +594,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5275,13 +5311,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5277,13 +5313,14 @@ rxvt-basic|rxvt terminal base (X Window clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, @@ -612,7 +612,7 @@ rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, -@@ -5292,7 +5329,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5294,7 +5331,7 @@ rxvt-basic|rxvt terminal base (X Window %p9%t\016%e\017%;, sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, @@ -621,7 +621,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5375,8 +5412,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5377,8 +5414,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -632,7 +632,7 @@ kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, -@@ -5437,6 +5474,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5439,6 +5476,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -671,7 +671,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|rxvt with 16 colors like aixterm, -@@ -5483,7 +5552,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5485,7 +5554,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -680,7 +680,7 @@ # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # but does otherwise follow the rxvt+pcfkeys model -TD # remove nonworking flash -TD -@@ -5497,13 +5566,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5499,13 +5568,13 @@ Eterm|Eterm-color|Eterm with xterm-style csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -696,16 +696,16 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -6093,7 +6162,7 @@ pty|4bsd pseudo teletype, - #### Emacs - +@@ -6110,7 +6179,7 @@ pty|4bsd pseudo teletype, + # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el + # # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 -eterm|gnu emacs term.el terminal emulation, +eterm-19|gnu emacs term.el terminal emulation, am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -6106,6 +6175,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -6123,6 +6192,13 @@ eterm|gnu emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -719,7 +719,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -6208,7 +6284,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6245,7 +6321,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, @@ -728,7 +728,7 @@ kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, -@@ -6408,7 +6484,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6445,7 +6521,7 @@ screen2|old VT 100/ANSI X3.64 virtual te cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -737,7 +737,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=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -8195,7 +8271,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -8304,7 +8380,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, @@ -746,7 +746,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, -@@ -11416,6 +11492,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -11525,6 +11601,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) @@ -754,7 +754,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, -@@ -11425,7 +11502,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -11534,7 +11611,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=^J, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -763,7 +763,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, -@@ -15842,7 +15919,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15951,7 +16028,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=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH, @@ -772,7 +772,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 -@@ -16100,7 +16177,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16209,7 +16286,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. @@ -782,7 +782,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 2016-12-12 12:26:15.364276201 +0000 ++++ ncurses/Makefile.in 2017-01-30 08:55:04.197218430 +0000 @@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -793,8 +793,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 2016-12-12 12:26:15.364276201 +0000 -@@ -2024,6 +2024,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2017-01-30 08:55:04.197218430 +0000 +@@ -2030,6 +2030,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); @@ -804,7 +804,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 2016-12-12 12:26:15.364276201 +0000 ++++ ncurses/run_cmd.sh 2017-01-30 08:55:04.197218430 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -818,7 +818,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2016-12-12 12:26:15.364276201 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-01-30 08:55:04.197218430 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -830,9 +830,9 @@ +fi + cat < @@ -894,8 +894,8 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2016-12-12 12:26:15.364276201 +0000 -@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) ++++ ncurses/tinfo/lib_setup.c 2017-01-30 08:55:04.197218430 +0000 +@@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ } else if ((env = getenv("TERM")) != 0) { @@ -906,7 +906,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2016-12-12 12:26:15.368276132 +0000 ++++ ncurses/tinfo/read_entry.c 2017-01-30 08:55:04.197218430 +0000 @@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -924,7 +924,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2016-12-12 12:26:15.368276132 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-01-30 08:55:04.201218365 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -971,7 +971,7 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2016-12-12 12:26:15.368276132 +0000 ++++ test/test.priv.h 2017-01-30 08:55:04.201218365 +0000 @@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 099cee3..5c70915 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,103 @@ +------------------------------------------------------------------- +Fri Feb 3 08:00:06 UTC 2017 - werner@suse.de + +- Use gzip shell script as GZIP envornment variable becomes obsolescent +- Split of ncurses5-devel from ncurses-devel +- Now ncurses-devel also provides ncurses6-devel +- Also ncurses5-devel requires libncurses5 (boo#1023296) + packages which want to be build with ncurses5-devel may require + pkgconfig(ncurses5) or pkgconfig(ncursesw5) or + /usr/bin/ncurses5-config or /usr/bin/ncursesw5-config + +------------------------------------------------------------------- +Mon Jan 30 08:58:50 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170128 + + minor comment-fixes to help automate links to bug-urls -TD + + add dvtm, dvtm-256color -TD + + add settings corresponding to xterm-keys option to tmux entry to + reflect upcoming change to make that option "on" by default + (patch by Nicholas Marriott). + + uncancel Ms in tmux entry (Harry Gindi, Nicholas Marriott). + + add dumb-emacs-ansi -TD + +------------------------------------------------------------------- +Sun Jan 22 10:45:18 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170121 + + improve discussion of early history of tput program. + + incorporate A_COLOR mask into COLOR_PAIR(), in case user application + provides an out-of-range pair number (report by Elijah Stone). + + clarify description in tput manual page regarding support for + termcap names (prompted by FreeBSD #214709). + + remove a restriction in tput's support for termcap names which + omitted capabilities normally not shown in termcap translations + (cf: 990123). + + modify configure script for clang as used on FreeBSD, to work around + clang's differences in exit codes vs gcc. + +------------------------------------------------------------------- +Thu Jan 19 12:20:06 UTC 2017 - werner@suse.de + +- Remove -L option on screen call dues API change, now we depend + on environment variables only. + +------------------------------------------------------------------- +Mon Jan 16 09:01:31 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170114 + + improve discussion of early history of tset/reset programs. + + clarify in manual pages that the optional verbose option level is + available only when ncurses is configured for tracing. + + amend change from 20161231 to avoid writing traces to the standard + error after initializing the trace feature using the environment + variable. + +------------------------------------------------------------------- +Mon Jan 9 11:17:00 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170107 + + amend changes for tput to reset tty modes to "sane" if the program + is run as "reset", like tset. Likewise, ensure that tset sends + either reset- or init-strings. + + improve manual page descriptions of tput init/reset and tset/reset, + to make it easier to see how they are similar and different. + + move a static result from key_name() to _nc_globals + + modify _nc_get_screensize to allow for use_env() and use_tioctl() + state to be per-screen when sp-funcs are configured, better matching + the behavior when using the term-driver configuration. + + improve cross-references in manual pages for often used functions + + move SCREEN field for use_tioctl() data before the ncursesw fields, + and limit that to the sp-funcs configuration to improve termlib + compatibility (cf: 20120714). + + correct order of initialization for traces in use_env() and + use_tioctl() versus first trace calls. + - Add ncurses patch 20161231 + + fix errata for ncurses-howto (report by Damien Ruscoe). + + fix a few places in configure/build scripts where DESTDIR and rpath + were combined (report by Thomas Klausner). + + merge current st description (report by Harry Gindi) -TD + + modify flash capability for linux and wyse entries to put the delay + between the reverse/normal escapes rather than after -TD + + modify program tabs to pass the actual tty file descriptor to + setupterm rather than the standard output, making padding work + consistently. + + explain in clear's manual page that it writes to stdout. + + add special case for verbose debugging traces of command-line + utilities which write to stderr (cf: 20161126). + + remove a trace with literal escapes from skip_DECSCNM(), added in + 20161203. + + update config.guess, config.sub from + http://git.savannah.gnu.org/cgit/config.git +- Add ncurses patch 20161224 + + correct parmeters for copywin call in _nc_Synchronize_Attributes() + (patch by Leon Winter). + + improve color-handling section in terminfo manual page (prompted by + patch by Mihail Konev). + + modify programs clear, tput and tset to pass the actual tty file + descriptor to setupterm rather than the standard output, making + padding work. + ------------------------------------------------------------------- Mon Dec 19 12:57:51 UTC 2016 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index fa4e450..e7cbead 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -212,6 +212,7 @@ Authors: Summary: Include Files and Libraries mandatory for Development License: MIT Group: Development/Libraries/C and C++ +Provides: ncurses6-devel Provides: ncurses:%{_incdir}/ncurses.h Requires: %{_bindir}/tack Requires: libncurses6 = %{version}-%{release} @@ -228,6 +229,30 @@ to develop applications that require these. +Authors: +-------- + Thomas E. Dickey + Juergen Pfeifer + Eric S. Raymond + Zeyd M. Ben-Halim + Pavel Curtis + +%package -n ncurses5-devel +Summary: Include Files and Libraries mandatory for Development +License: MIT +Group: Development/Libraries/C and C++ +Provides: ncurses:%{_incdir}/ncurses5/ncurses.h +Requires: %{_bindir}/tack +Requires: libncurses5 = %{version}-%{release} +Requires: ncurses = %{version}-%{release} +Requires: ncurses-devel = %{version}-%{release} + +%description -n ncurses5-devel +This package contains all necessary include files and libraries needed +to develop applications that require these. + + + Authors: -------- Thomas E. Dickey @@ -294,7 +319,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # Remark: A better solution would be that in OBS a real pty/tty pair # would be used instead of redirecting stdout/stderr to a log file. # -%global _configure screen -L -D -m ./configure +%global _configure screen -D -m ./configure SCREENDIR=$(mktemp -d ${PWD}/screen.XXXXXX) || exit 1 SCREENRC=${SCREENDIR}/ncurses export SCREENRC SCREENDIR @@ -361,8 +386,14 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src cflags -Wl,--as-needed LDFLAGS CXXFLAGS=$CFLAGS test -n "$TERM" || TERM=linux - GZIP="-9" - export CC CFLAGS CXX CXXFLAGS GZIP TERM LDFLAGS + mkdir gzip + cat > gzip/gzip <<-'EOF' + #!/bin/sh + exec /usr/bin/gzip -9 ${1+"$@"} + EOF + chmod 0755 gzip/gzip + PATH=$PWD/gzip:$PATH + export CC CFLAGS CXX CXXFLAGS TERM LDFLAGS # # Detect 64bit architecures and be sure that we use an # unsigned long for chtype to be backward compatible with @@ -561,7 +592,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # # Now use --with-pthread for reentrant pthread support (abi == 5). # - eval screen -L -D -m ./${c#*./} --with-abi-version=5 \ + eval screen -D -m ./${c#*./} --with-abi-version=5 \ --without-pthread \ --disable-reentrant \ --disable-ext-mouse \ @@ -610,7 +641,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src make clean > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-pthread \ + eval screen -D -m ./${c#*./} --with-pthread \ --enable-reentrant \ --enable-ext-mouse \ --enable-widec \ @@ -643,7 +674,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src make clean > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! - eval screen -L -D -m ./${c#*./} --with-abi-version=5 \ + eval screen -D -m ./${c#*./} --with-abi-version=5 \ --without-pthread \ --disable-reentrant \ --disable-ext-mouse \ @@ -688,8 +719,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src done %install - GZIP="-9" - export GZIP + PATH=$PWD/gzip:$PATH (cd %{root}/; tar -cpSf - *)|tar -xpsSf - -C %{buildroot}/ rm -rf %{root} mkdir %{buildroot}/%{_lib} @@ -912,24 +942,18 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src %defattr(-,root,root) %dir %{_defaultdocdir}/ncurses/ %doc %{_defaultdocdir}/ncurses/* -%{_bindir}/ncurses*-config +%{_bindir}/ncurses*6-config %{_bindir}/captoinfo %{_bindir}/infotocap %{_bindir}/tic %dir %{_incdir}/ncurses/ %dir %{_incdir}/ncursesw/ -%dir %{_incdir}/ncurses5/ -%dir %{_incdir}/ncurses5/ncurses/ -%dir %{_incdir}/ncurses5/ncursesw/ %{_incdir}/*.h -%{_incdir}/ncurses*/*.h -%{_incdir}/ncurses*/*/*.h +%{_incdir}/ncurses/*.h +%{_incdir}/ncursesw/*.h %{_libdir}/lib*.a %{_libdir}/lib*.so -%dir %{_libdir}/ncurses5/ -%{_libdir}/ncurses5/lib*.a -%{_libdir}/ncurses5/lib*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/pkgconfig/*[clmosuw\+].pc %doc %{_mandir}/man1/*-config.1.gz %doc %{_mandir}/man1/captoinfo.1.gz %doc %{_mandir}/man1/infocmp.1.gz @@ -938,6 +962,20 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src %doc %{_mandir}/man3/*.gz %doc %{_mandir}/man7/*.gz +%files -n ncurses5-devel +%defattr(-,root,root) +%{_bindir}/ncurses*5-config +%dir %{_incdir}/ncurses5/ +%dir %{_incdir}/ncurses5/ncurses/ +%dir %{_incdir}/ncurses5/ncursesw/ +%{_incdir}/ncurses5/*.h +%{_incdir}/ncurses5/ncurses/*.h +%{_incdir}/ncurses5/ncursesw/*.h +%dir %{_libdir}/ncurses5/ +%{_libdir}/ncurses5/lib*.a +%{_libdir}/ncurses5/lib*.so +%{_libdir}/pkgconfig/*5.pc + %files -n tack %defattr(-,root,root) %{_bindir}/tack