diff --git a/ncurses-5.7-20101009-patch.tar.bz2 b/ncurses-5.7-20101009-patch.tar.bz2 deleted file mode 100644 index ef4a93d..0000000 --- a/ncurses-5.7-20101009-patch.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65b95e9b76903f87b26a7469356084bdb9ef776e743a98c68acf209d05992bf7 -size 1922346 diff --git a/ncurses-5.7-pthread.dif b/ncurses-5.7-pthread.dif deleted file mode 100644 index d17722b..0000000 --- a/ncurses-5.7-pthread.dif +++ /dev/null @@ -1,25 +0,0 @@ ---- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2010-10-12 11:56:43.640426282 +0200 -@@ -490,6 +490,7 @@ extern NCURSES_EXPORT(int) _nc_mutex_unl - #ifdef USE_PTHREADS - # if USE_WEAK_SYMBOLS - weak_symbol(pthread_sigmask); -+weak_symbol(pthread_kill); - weak_symbol(pthread_self); - weak_symbol(pthread_equal); - weak_symbol(pthread_mutex_init); ---- ncurses/tty/lib_tstp.c -+++ ncurses/tty/lib_tstp.c 2010-10-12 12:02:27.856426710 +0200 -@@ -288,7 +288,11 @@ sigwinch(int sig GCC_UNUSED) - _nc_globals.have_sigwinch = 1; - # if USE_PTHREADS_EINTR - if (_nc_globals.read_thread) { -- if (!pthread_equal(pthread_self(), _nc_globals.read_thread)) -+ if ( -+# if USE_WEAK_SYMBOLS -+ (pthread_self) && (pthread_kill) && (pthread_equal) && -+# endif -+ !pthread_equal(pthread_self(), _nc_globals.read_thread)) - pthread_kill(_nc_globals.read_thread, SIGWINCH); - _nc_globals.read_thread = 0; - } diff --git a/ncurses-5.7.tar.bz2 b/ncurses-5.7.tar.bz2 deleted file mode 100644 index b94e94e..0000000 --- a/ncurses-5.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94fa65f2e2eda239e87325fc56511892810166f4a262fc67576d82eb92f70047 -size 1822833 diff --git a/ncurses-5.7-overwrite.dif b/ncurses-5.8-overwrite.dif similarity index 81% rename from ncurses-5.7-overwrite.dif rename to ncurses-5.8-overwrite.dif index 06f5496..8ebc206 100644 --- a/ncurses-5.7-overwrite.dif +++ b/ncurses-5.8-overwrite.dif @@ -1,12 +1,12 @@ --- configure +++ configure 2010-10-11 14:04:42.000000000 +0000 -@@ -6083,6 +6083,7 @@ else +@@ -6159,6 +6159,7 @@ else fi; - echo "$as_me:6084: result: $with_overwrite" >&5 + echo "$as_me:6160: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6087: checking if external terminfo-database is used" >&5 + echo "$as_me:6163: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 --- configure.in +++ configure.in 2010-10-12 08:14:30.779926168 +0000 diff --git a/ncurses-5.8-patches.tar.bz2 b/ncurses-5.8-patches.tar.bz2 new file mode 100644 index 0000000..add54e3 --- /dev/null +++ b/ncurses-5.8-patches.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eedffa433a0cdfee3183eff64179e33684d9a7b1ab1da5597df14378724827c9 +size 6970 diff --git a/ncurses-5.7.dif b/ncurses-5.8.dif similarity index 86% rename from ncurses-5.7.dif rename to ncurses-5.8.dif index cc2501e..988a6bc 100644 --- a/ncurses-5.7.dif +++ b/ncurses-5.8.dif @@ -9,7 +9,7 @@ #include #if defined(__cplusplus) -@@ -3768,12 +3768,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 -@@ -3891,9 +3894,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 -@@ -9934,9 +9937,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>confdefs.h <<\EOF - #define USE_REENTRANT 1 - EOF -@@ -17467,7 +17473,7 @@ else - #line 17466 "configure" +@@ -17551,7 +17555,7 @@ else + #line 17550 "configure" #include "confdefs.h" -#include @@ -297,7 +275,7 @@ #include #if defined(__cplusplus) -@@ -18588,6 +18594,7 @@ if test "$with_termlib" != no ; then +@@ -18705,6 +18709,7 @@ if test "$with_termlib" != no ; then TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi @@ -381,7 +359,7 @@ fi sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO --- misc/terminfo.src -+++ misc/terminfo.src 2010-12-21 17:29:43.388425876 +0000 ++++ misc/terminfo.src 2011-02-28 13:37:36.107926455 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -410,7 +388,7 @@ # Subject: linux 2.6.26 vt back_color_erase # Changes to the Linux console driver broke bce model as reported in -@@ -2374,6 +2382,7 @@ vt132|DEC vt132, +@@ -2376,6 +2384,7 @@ vt132|DEC vt132, # at the top of the keyboard. The "DO" key is used as F10 to avoid conflict # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping. # PF1--PF4 are used as F1--F4. @@ -418,7 +396,7 @@ # vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, OTbs, OTpt, am, mir, xenl, xon, -@@ -2383,7 +2392,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -2385,7 +2394,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, @@ -427,7 +405,7 @@ dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, -@@ -2531,6 +2540,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -2533,6 +2542,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -435,7 +413,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, eslok, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -2540,7 +2550,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -2542,7 +2552,7 @@ vt320|vt300|dec vt320 7 bit terminal, 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, @@ -444,7 +422,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$}, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, -@@ -2974,13 +2984,14 @@ putty-vt100|VT100+ keyboard layout, +@@ -2976,13 +2986,14 @@ putty-vt100|VT100+ keyboard layout, # retrieving the window title, and for setting the window size (i.e., using # "resize -s"), though it does not pass SIGWINCH to the application if the # user resizes the window with the mouse. @@ -460,7 +438,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -3180,6 +3191,7 @@ xterm-r6|xterm-old|xterm X11R6 version, +@@ -3182,6 +3193,7 @@ xterm-r6|xterm-old|xterm X11R6 version, use=vt100+enq, # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # The name has been changed and some aliases have been removed. @@ -468,7 +446,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, cols#80, it#8, lines#24, ncv@, -@@ -3189,7 +3201,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -3191,7 +3203,7 @@ xterm-xf86-v32|xterm terminal emulator ( 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, @@ -477,7 +455,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -3629,8 +3641,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -3631,8 +3643,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -487,24 +465,24 @@ +# into application mode and with numlock enabled. +# To test this, use `tput smkx' and `Ctrl-V + key stroke' +xterm-suse|xterm terminal emulator (X11R6.8.2 Window System with SuSE LINUX), -+ kbs=\177, kdch1=\E[3~, -+ kDIV=\EOo, kMUL=\EOj, kMIN=\EOm, kPLS=\EOk, -+ kfnd=\E[1~, kslt=\E[4~, -+ use=xterm-new, ++ kbs=\177, kdch1=\E[3~, ++ kDIV=\EOo, kMUL=\EOj, kMIN=\EOm, kPLS=\EOk, ++ kfnd=\E[1~, kslt=\E[4~, ++ use=xterm-new, + # This is xterm for ncurses. xterm|xterm terminal emulator (X Window System), -+ use=xterm-suse, ++ use=xterm-suse, + +# xterm-debian is identical to xterm-new with the addition of a small +# VT220-ism regarding the backspace and delete keys; this is mandated by +# the keyboard configuration section of the Debian Policy Manual. +xterm-debian|Debian xterm (backspace and delete changed), -+ kbs=\177, kdch1=\E[3~, ++ kbs=\177, kdch1=\E[3~, use=xterm-new, - # These entries allow access to the X titlebar and icon name as a status line. -@@ -3723,7 +3753,7 @@ xterm-color|nxterm|generic color xterm, + # This entry assumes that xterm's handling of VT100 SI/SO is disabled by +@@ -3730,7 +3760,7 @@ xterm-color|nxterm|generic color xterm, op=\E[m, use=xterm-r6, use=klone+color, # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -513,7 +491,7 @@ bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -3859,10 +3889,14 @@ mgt|Multi GNOME Terminal, +@@ -3876,10 +3906,14 @@ mgt|Multi GNOME Terminal, # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -529,7 +507,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -3976,14 +4010,14 @@ konsole-256color|KDE console window with +@@ -3994,14 +4028,14 @@ konsole-256color|KDE console window with mlterm|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -547,7 +525,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>, -@@ -4037,6 +4071,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -4055,6 +4089,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". @@ -555,7 +533,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -4048,13 +4083,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4066,13 +4101,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, @@ -573,7 +551,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, -@@ -4063,7 +4099,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4081,7 +4117,7 @@ rxvt-basic|rxvt terminal base (X Window sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%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, @@ -582,7 +560,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -4146,8 +4182,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4164,8 +4200,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, @@ -593,7 +571,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~, -@@ -4185,6 +4221,39 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -4203,6 +4239,39 @@ rxvt-cygwin-native|rxvt terminal emulato acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -633,7 +611,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|xterm with 16 colors like aixterm, -@@ -4212,7 +4281,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -4230,7 +4299,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -642,7 +620,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 -@@ -4226,13 +4295,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -4244,13 +4313,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, @@ -658,7 +636,7 @@ 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=, -@@ -4604,7 +4673,7 @@ pty|4bsd pseudo teletype, +@@ -4622,7 +4691,7 @@ pty|4bsd pseudo teletype, smso=\Ea$, smul=\Ea!, use=cbunix, # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -667,7 +645,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -4617,6 +4686,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -4635,6 +4704,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, @@ -681,7 +659,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, -@@ -4665,7 +4741,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -4683,7 +4759,7 @@ screen|VT 100/ANSI X3.64 virtual termina cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, 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@, @@ -690,7 +668,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 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, -@@ -4842,7 +4918,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -4862,7 +4938,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, @@ -699,7 +677,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, -@@ -6561,7 +6637,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -6581,7 +6657,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, @@ -708,7 +686,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, -@@ -9692,6 +9768,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -9712,6 +9788,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) @@ -716,7 +694,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, -@@ -9701,7 +9778,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -9721,7 +9798,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, @@ -725,7 +703,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, -@@ -13976,7 +14053,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -13996,7 +14073,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, @@ -734,7 +712,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%{80}%|%;%c%?%p9%t\E>A%e\E>B%;, sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162, -@@ -14204,7 +14281,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -14224,7 +14301,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, @@ -744,19 +722,19 @@ 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 2010-10-11 13:57:42.000000000 +0000 -@@ -200,7 +200,7 @@ $(DESTDIR)$(libdir) : ++++ ncurses/Makefile.in 2011-02-28 13:39:30.571925904 +0000 +@@ -205,7 +205,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ ./fallback.c : $(tinfo)/MKfallback.sh -- sh -e $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ @TIC_PATH@ $(FALLBACK_LIST) >$@ -+ sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh @TERMINFO@ @TERMINFO_SRC@ @TIC_PATH@ $(FALLBACK_LIST) >$@ +- sh -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ ++ sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h +++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000 -@@ -1867,6 +1867,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ +@@ -1875,6 +1875,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(int) _nc_access (const char *, int); @@ -856,30 +834,30 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2006-05-18 15:52:22.000000000 +0000 -@@ -551,6 +551,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) - if ((env = getenv("NCURSES_NO_UTF8_ACS")) != 0) { - return atoi(env); ++++ ncurses/tinfo/lib_setup.c 2011-02-28 13:40:41.847925526 +0000 +@@ -556,6 +556,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) + } else if ((value = tigetnum("U8")) >= 0) { + result = value; /* use extension feature */ } else if ((env = getenv("TERM")) != 0) { + char *yast = getenv("YAST_DOES_ACS"); + if (yast != 0) + return 0; /* YaST uses always correct font mappings */ - if (strstr(env, "linux")) - return 1; /* always broken */ - if (strstr(env, "screen") != 0 + if (strstr(env, "linux")) { + result = 1; /* always broken */ + } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2006-05-18 14:07:15.000000000 +0000 -@@ -368,6 +368,7 @@ _nc_read_file_entry(const char *const fi ++++ ncurses/tinfo/read_entry.c 2011-02-28 13:41:44.063927030 +0000 +@@ -369,6 +369,7 @@ _nc_read_file_entry(const char *const fi int limit; char buffer[MAX_ENTRY_SIZE + 1]; + _nc_fsid(); if (_nc_access(filename, R_OK) < 0 - || (fd = open(filename, O_RDONLY | O_BINARY)) < 0) { + || (fp = fopen(filename, "rb")) == 0) { T(("cannot open terminfo %s (errno=%d)", filename, errno)); -@@ -384,6 +385,7 @@ _nc_read_file_entry(const char *const fi +@@ -386,6 +387,7 @@ _nc_read_file_entry(const char *const fi } - close(fd); + fclose(fp); } + _nc_fseid(); @@ -934,7 +912,7 @@ if (copied != 0) --- test/test.priv.h +++ test/test.priv.h 2006-05-18 14:07:19.000000000 +0000 -@@ -525,12 +525,12 @@ extern char *boolnames[], *boolcodes[], +@@ -622,12 +622,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses-5.8.tar.bz2 b/ncurses-5.8.tar.bz2 new file mode 100644 index 0000000..3106396 --- /dev/null +++ b/ncurses-5.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1be06220869b279a822d7d52f0ccc3d5ade6a88bc0fd46118c09e18cbdb7a155 +size 2043172 diff --git a/ncurses.changes b/ncurses.changes index e23af0f..d4e21ff 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Tue Mar 8 11:14:14 CET 2011 - werner@suse.de + +- Add ncurses patch 5.8.20110307 + * revert changes to limit-checks from 20110122 (Debian #616711). + * corrected a minor sign error in a field of Low_Level_Field_Type, to + conform to form.h. + * replaced C_Int by Curses_Bool as return type for some callbacks, see + fieldtype(3FORM). + +------------------------------------------------------------------- +Mon Mar 7 11:29:10 CET 2011 - werner@suse.de + +- Add ncurses patch 5.8.20110305 + * fix an off-by-one error in _nc_slk_initialize() from 20100605 fixes + for compiler warnings (report by Nicolas Boulenguez). + +------------------------------------------------------------------- +Thu Mar 3 09:48:39 CET 2011 - werner@suse.de + +- Update to ncurses 5.8 + * change open() in _nc_read_file_entry() to fopen() for consistency + with write_file(). + * modify misc/run_tic.in to create parent directory, in case this is + a new install of hashed database. + * add cons25-debian entry (patch by Brian M Carlson, Debian #607662). + * add xterm-utf8 entry as a demo of the U8 feature -TD + * add U8 feature to denote entries for terminal emulators which do not + support VT100 SI/SO when processing UTF-8 encoding -TD + * improve the NCURSES_NO_UTF8_ACS feature by adding a check for an + extended terminfo capability U8 (prompted by mailing list + discussion). + * correct limit-checks in derwin(). + * fix a missing "weak" declaration for pthread_kill (patch by Nicholas Alcock). + * improve documentation of KEY_ENTER in curs_getch.3x manpage (prompted + by discussion with Kevin Martin). + * document thick- and double-line symbols in curs_add_wch.3x manpage. + * document WACS_xxx constants in curs_add_wch.3x manpage. + * fix typo in man/default_colors.3x (patch by Tim van der Molen). + * fix remaining strict compiler warnings in ncurses library ABI=5, + except those dealing with function pointers, etc. + * modify nc_tparm.h, adding guards against repeated inclusion, and + allowing TPARM_ARG to be overridden. + * suppress ncv in screen entry, allowing underline (patch by Alejandro R Sedeno). + * also suppress ncv in konsole-base -TD + * fixes in wins_nwstr() and related functions to ensure that special + characters, i.e., control characters are handled properly with the + wide-character configuration. + * correct a comparison in wins_nwstr() (Redhat #661506). + * correct help-messages in some of the test-programs, which still + referred to quitting with 'q'. + * add special case to _nc_infotocap() to recognize the setaf/setab + strings from xterm+256color and xterm+88color, and provide a reduced + version which works with termcap. + * fix typo in rmso for tek4106 entry -Goran Weinholt + * repurpose "gnome" terminfo entries as "vte", retaining "gnome" items + for compatibility, but generally deprecating those since the VTE + library is what actually defines the behavior of "gnome", etc., + since 2003 -TD + * correct parsing of relative tab-stops in tabs program (report by + Philip Ganchev). + * adjust configure script so that "t" is not added to library suffix + when weak-symbols are used, allowing the pthread configuration to + more closely match the non-thread naming (report by Werner Fink). + * modify configure check for tic program, used for fallbacks, to a + warning if not found. This makes it simpler to use additonal + scripts to bootstrap the fallbacks code using tic from the build + tree (report by Werner Fink). + ------------------------------------------------------------------- Tue Dec 21 18:32:15 CET 2010 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index e7d7611..0cc1240 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -36,12 +36,12 @@ AutoReqProv: on Obsoletes: ncurses-64bit %endif # -Version: 5.7 -Release: 12 +Version: 5.8 +Release: 1 Summary: New curses Libraries Url: http://invisible-island.net/ncurses/ncurses.html Source0: ncurses-%{version}.tar.bz2 -Source1: ncurses-%{version}-20101009-patch.tar.bz2 +Source1: ncurses-%{version}-patches.tar.bz2 Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc @@ -50,11 +50,10 @@ Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-%{version}.dif Patch1: ncurses-5.7-printw.dif -Patch3: ncurses-5.7-overwrite.dif +Patch3: ncurses-5.8-overwrite.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.7-gpm.dif Patch6: ncurses-5.6-fallback.dif -Patch7: ncurses-5.7-pthread.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -277,7 +276,6 @@ mv tack-* tack %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .gpm %patch -P 6 -p0 -b .fb -%patch -P 7 -p0 -b .pthread %patch -P 0 -p0 -b .p0 rm -vf include/ncurses_dll.h rm -vf mkdirs.sh