diff --git a/ncurses-5.7-tack.dif b/ncurses-5.7-tack.dif index 658f9c1..30aa196 100644 --- a/ncurses-5.7-tack.dif +++ b/ncurses-5.7-tack.dif @@ -1,9 +1,9 @@ --- - tack/Makefile.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + tack/Makefile.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) --- tack/Makefile.in -+++ tack/Makefile.in 2017-08-01 08:31:12.368616475 +0000 ++++ tack/Makefile.in 2018-01-22 11:17:39.717358930 +0000 @@ -84,7 +84,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -19,8 +19,8 @@ LD = @LD@ -LINK = @LINK_PROGS@ $(LIBTOOL_LINK) +LINK = @LINK_PROGS@ $(CC) - LDFLAGS = @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \ - @LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@ + LDFLAGS = @EXTRA_LDFLAGS@ @TINFO_LDFLAGS@ \ + @LDFLAGS@ @LD_MODEL@ @TINFO_LIBS@ @LIBS@ @@ -101,7 +101,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) @@ -31,12 +31,16 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) -@@ -165,7 +165,7 @@ DEPS_TACK = \ +@@ -165,10 +165,10 @@ DEPS_TACK = \ $(MODEL)/tack$o tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES) - @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@ + $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@ - # - # Utility productions start here + tackgen$x: $(MODEL)/tackgen$o @NCURSES_TREE@$(DEPS_CURSES) +- @ECHO_LINK@ $(LINK) $(MODEL)/tackgen$o $(LDFLAGS_DEFAULT) -o $@ ++ $(LINK) $(MODEL)/tackgen$o $(LDFLAGS_DEFAULT) -o $@ + + tackgen.h: tackgen$x + $(SHELL) -c "if test -f $(srcdir)/../misc/shlib; then\ diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index a509bea..55389e8 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 2017-11-20 08:13:00.482772488 +0000 -@@ -16146,8 +16146,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2018-01-29 10:42:50.284566362 +0000 +@@ -16451,8 +16451,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 deleted file mode 100644 index 1acf6e1..0000000 --- a/ncurses-6.0-patches.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9747688e38dce54aeb737f47b5d8c1a25c147b856f3394c57e047f0e1e491c51 -size 3342042 diff --git a/ncurses-6.0.tar.gz b/ncurses-6.0.tar.gz deleted file mode 100644 index 9658bea..0000000 --- a/ncurses-6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 -size 3131891 diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 new file mode 100644 index 0000000..2c05c0a --- /dev/null +++ b/ncurses-6.1-patches.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d19f107eb73a5dfda686a0039e461f02cf2e5f500138bc1da68b3d8ce6a72c9 +size 238 diff --git a/ncurses-6.0.dif b/ncurses-6.1.dif similarity index 86% rename from ncurses-6.0.dif rename to ncurses-6.1.dif index c72d1dd..89b8767 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.1.dif @@ -22,7 +22,7 @@ 20 files changed, 248 insertions(+), 81 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2018-01-09 11:12:28.315003178 +0000 ++++ aclocal.m4 2018-01-29 10:43:34.207735837 +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 @@ -32,7 +32,7 @@ #include #if defined(__cplusplus) -@@ -4752,12 +4752,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 -@@ -4882,9 +4885,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 -@@ -12151,9 +12154,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <. @@ -439,7 +439,7 @@ # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: # http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html -@@ -1863,6 +1871,7 @@ linux2.6|linux 2.6.x console, +@@ -1876,6 +1884,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx xyyzz{{||}c~~, enacs=\E)0, rmacs=^O, @@ -447,7 +447,7 @@ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=linux2.2, -@@ -3320,6 +3329,7 @@ vt132|DEC vt132, +@@ -3333,6 +3342,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. @@ -455,7 +455,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -3330,7 +3340,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -3343,7 +3353,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=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, @@ -464,7 +464,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, -@@ -3491,6 +3501,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -3504,6 +3514,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -472,7 +472,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -3500,7 +3511,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -3513,7 +3524,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=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -481,7 +481,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, -@@ -3971,6 +3982,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, +@@ -3987,6 +3998,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, # 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. @@ -489,7 +489,7 @@ teraterm2.3|Tera Term Pro, km, ncv#43, vt@, -@@ -3979,7 +3991,7 @@ teraterm2.3|Tera Term Pro, +@@ -3995,7 +4007,7 @@ teraterm2.3|Tera Term Pro, \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J, cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, @@ -498,7 +498,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -4185,6 +4197,7 @@ xterm-old|antique xterm version, +@@ -4229,6 +4241,7 @@ xterm-old|antique xterm version, use=xterm-r6, # 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. @@ -506,7 +506,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, XT, cols#80, it#8, lines#24, ncv@, -@@ -4194,7 +4207,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4238,7 +4251,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=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -515,7 +515,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, -@@ -4689,8 +4702,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4835,8 +4848,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -542,7 +542,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5033,7 +5064,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5180,7 +5211,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -551,7 +551,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5208,10 +5239,14 @@ mgt|Multi GNOME Terminal, +@@ -5422,10 +5453,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). @@ -562,12 +562,12 @@ +# This is kvt for SuSE because we do not support BrokenByDesign[tm]. +kvt|KDE terminal, -+ kdch1=^?, kdch1=\E[3~, use=kvt-rh, ++ kdch1=\E[3~, use=kvt-rh, + - # Konsole 1.0.1 + # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -5342,14 +5377,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5634,14 +5669,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, @@ -585,7 +585,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=\n, indn=\E[%p1%dS, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, -@@ -5405,6 +5440,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5697,6 +5732,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". @@ -593,7 +593,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5416,13 +5452,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5708,13 +5744,14 @@ rxvt-basic|rxvt terminal base (X Window clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r, 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, @@ -611,7 +611,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, -@@ -5433,7 +5470,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5725,7 +5762,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, @@ -620,7 +620,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5516,8 +5553,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5808,8 +5845,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, @@ -631,7 +631,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~, -@@ -5578,6 +5615,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5870,6 +5907,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -670,7 +670,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, -@@ -5624,7 +5693,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5916,7 +5985,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -679,7 +679,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 -@@ -5638,13 +5707,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5930,13 +5999,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, @@ -695,7 +695,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=, -@@ -6301,7 +6370,7 @@ pty|4bsd pseudo teletype, +@@ -6593,7 +6662,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 @@ -704,7 +704,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -6314,6 +6383,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -6606,6 +6675,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, @@ -718,17 +718,17 @@ # 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, -@@ -6436,7 +6512,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6728,7 +6804,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=\n, is2=\E)0, -- kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, -+ kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, - kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, + enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, + ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, +- ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z, ++ ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^?, kcbt=\E[Z, + 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, - kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, -@@ -6555,6 +6631,13 @@ screen.xterm-xfree86|screen.xterm-new|sc - E3@, use=screen+italics, use=screen+fkeys, use=xterm-new, +@@ -6849,6 +6925,13 @@ screen.xterm-xfree86|screen.xterm-new|sc + use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, +screen.xterm|screen customized for modern xterm, @@ -736,12 +736,12 @@ + invis@, kIC@, kNXT@, kPRV@, meml@, memu@, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%| + %t;7%;%?%p4%t;5%;%?%p5%t;2%;m, -+ E3@, use=screen+italics, use=screen+fkeys, use=xterm-suse, -+ ++ E3@, use=screen+italics, use=screen+fkeys, ++ use=xterm+x11mouse, use=xterm-suse, # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, -@@ -6637,7 +6720,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6936,7 +7019,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, @@ -750,7 +750,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, -@@ -8512,7 +8595,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -8817,7 +8900,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, @@ -759,7 +759,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -11733,6 +11816,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12038,6 +12121,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # (vt320-k3: I added / based on the init string -- esr) @@ -767,7 +767,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -11742,7 +11826,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12047,7 +12131,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -776,7 +776,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ ?5l, -@@ -16156,7 +16240,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -16461,7 +16545,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -785,7 +785,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -16414,7 +16498,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16719,7 +16803,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. @@ -795,7 +795,7 @@ s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in -+++ ncurses/Makefile.in 2018-01-09 11:12:28.327002947 +0000 ++++ ncurses/Makefile.in 2018-01-29 10:43:34.219735610 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -806,8 +806,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 2018-01-09 11:12:28.327002947 +0000 -@@ -2146,6 +2146,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2018-01-29 10:43:34.219735610 +0000 +@@ -2150,6 +2150,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); @@ -817,7 +817,7 @@ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); --- ncurses/run_cmd.sh -+++ ncurses/run_cmd.sh 2018-01-09 11:12:28.327002947 +0000 ++++ ncurses/run_cmd.sh 2018-01-29 10:43:34.219735610 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -831,7 +831,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2018-01-09 11:12:28.327002947 +0000 ++++ ncurses/tinfo/MKfallback.sh 2018-01-29 10:43:34.219735610 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -864,7 +864,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2018-01-09 11:12:28.327002947 +0000 ++++ ncurses/tinfo/access.c 2018-01-29 10:43:34.219735610 +0000 @@ -35,6 +35,9 @@ #include @@ -907,7 +907,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2018-01-09 11:12:28.327002947 +0000 ++++ ncurses/tinfo/lib_setup.c 2018-01-29 10:43:34.219735610 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -919,8 +919,8 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2018-01-09 11:12:28.327002947 +0000 -@@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi ++++ ncurses/tinfo/read_entry.c 2018-01-29 10:43:34.219735610 +0000 +@@ -532,6 +532,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -928,7 +928,7 @@ if (_nc_access(filename, R_OK) < 0 || (fp = fopen(filename, "rb")) == 0) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); -@@ -451,6 +452,7 @@ _nc_read_file_entry(const char *const fi +@@ -552,6 +553,7 @@ _nc_read_file_entry(const char *const fi } fclose(fp); } @@ -937,7 +937,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2018-01-09 11:12:28.327002947 +0000 ++++ ncurses/tinfo/read_termcap.c 2018-01-29 10:43:34.219735610 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -984,7 +984,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2018-01-09 11:12:28.327002947 +0000 ++++ progs/Makefile.in 2018-01-29 10:43:34.219735610 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -1004,8 +1004,8 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2018-01-09 11:12:28.327002947 +0000 -@@ -899,12 +899,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2018-01-29 10:43:34.219735610 +0000 +@@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses-6.1.tar.gz b/ncurses-6.1.tar.gz new file mode 100644 index 0000000..8acbf8a --- /dev/null +++ b/ncurses-6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 +size 3365395 diff --git a/ncurses.changes b/ncurses.changes index c906add..525a94f 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,91 @@ +------------------------------------------------------------------- +Tue Jan 30 07:51:09 UTC 2018 - werner@suse.de + +- Correct include path for wide chraracter header files for ABI 6.1 + +------------------------------------------------------------------- +Mon Jan 29 10:48:07 UTC 2018 - werner@suse.de + +- Update to ncurses 6.1 (patch 20180127) + + updated release notes + + amend a warning message from tic which should have flagged misuse + of "XT" capability in "screen" terminal description. + > terminfo changes: + + trim "XT" from screen entry, add comments to explain why it was + not suitable -TD + + modify iterm to use xterm+sl-twm building block -TD + + mark konsole-420pc, konsole-vt100, konsole-xf3x obsolete reflecting + konsole's removal in 2008 -TD + + expanded the history section of konsole to explain its flawed + imitation of xterm's keyboard -TD + + use xterm+x11mouse in screen.* entries because screen does not yet + support xterm's 1006 mode -TD + + add nsterm-build400 for macOS 10.13 -TD + + add ansi+idc1, use that in ansi+idc adding dch for consistency -TD + + update vte to vte-2017 -TD + + add ecma+strikeout to vte-2017 -TD + + add iterm2-direct -TD + + updated teraterm, added teraterm-256color -TD + + add mlterm-direct -TD + + add descriptions for ANSI building-blocks -TD +- Modify patch ncurses-5.9-ibm327x.dif +- Rename patch ncurses-6.0.dif to new name ncurses-6.1.dif +- Modify patch ncurses-6.1.dif + +------------------------------------------------------------------- +Mon Jan 22 11:02:30 UTC 2018 - werner@suse.de + +- Add ncurses patch 20180121 pre-release 6.1 + > terminfo changes: + + add xterm+noalt, xterm+titlestack, xterm+alt1049, xterm+alt+title + blocks from xterm #331 -TD + + add xterm+direct, xterm+indirect, xterm-direct entries from xterm + #331 -TD + + modify xterm+256color and xterm+256setaf to use correct number of + color pairs, for ncurses 6.1 -TD + + add rs1 capability to xterm-256color -TD + + modify xterm-r5, xterm-r6 and xterm-xf86-v32 to use xterm+kbs to + match xterm #272, reflecting packager's changes -TD + + remove "boolean" Se, Ss from st-0.7 -TD + + add konsole-direct and st-direct -TD + + remove unsupported "Tc" capability from st-0.7; use st-direct if + direct-colors are wanted -TD + + add vte-direct -TD + + add XT, hpa, indn, and vpa to screen, and invis, E3 to tmux (patch by + Pierre Carru) + + use xterm+sm+1006 in xterm-new, vte-2014 -TD + + use xterm+x11mouse in iterm, iterm2, mlterm3 because xterm's 1006 + mode does not work with those programs. konsole is debatable -TD + + add "termite" entry (report by Markus Pfeiffer) -TD + > merge branch begun April 2, 2017 which provides these features: + + support read/write new binary-format for terminfo which stores + numeric capabilities as a signed 32-bit integer. The test programs + such as picsmap, ncurses were created or updated during 2017 to use + this feature. + + the new format is written by the wide-character configuration of + tic when it finds a numeric capability larger than 32767. + + other applications such as infocmp built with the wide-character + ncurses library work as expected. + + applications built with the "narrow" (8-bit) configuration will + read the new format, but will limit those extended values to 32767. + + in either wide/narrow configuration, the structure defined in + term.h still uses signed 16-bit values. + + because it is incompatible with the legacy (mid-1980s) binary format, + a new magic value is provided for the "file" program. + + the term.5 manual page is updated to describe this new format. + + the limit on file-size for compiled terminfo is increased in the + wide-character configuration to 32768. +- Add ncurses patch 20180120 + + build-fix in picsmap.c for stdint.h existence. + + add --disable-stripping option to configure scripts. + + modify ncurses-examples to install test-scripts in the data directory. + + work around tool-breakage in Debian 9 and later by invoking + gprconfig to specify the C compiler to be used by gnatmake, + and conditionally suppressing Library_Options line for static + libraries. + + bump the compat level for test-packages to 7, i.e., Debian 5. +- Add tack patch 1.08-20170818 + ------------------------------------------------------------------- Tue Jan 9 11:11:49 UTC 2018 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 947e7f7..054f852 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -48,23 +48,23 @@ Obsoletes: ncurses-64bit # but also build the ABI version 5 as this is part of the source # tar ball including the latest upstream fixes for ABI 5. # -Version: 6.0 +Version: 6.1 Release: 0 Summary: Terminal control library #Git: http://ncurses.scripts.mit.edu License: MIT Group: System/Base -Url: http://invisible-island.net/ncurses/ncurses.html -Source0: ftp://invisible-island.net/ncurses/ncurses-6.0.tar.gz -Source1: ncurses-6.0-patches.tar.bz2 +Url: http://www.invisible-island.net/ncurses/ncurses.html +Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.1.tar.gz +Source1: ncurses-6.1-patches.tar.bz2 Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc -# Latest tack can be found at ftp://invisible-island.net/pub/ncurses/current/ -Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.07-20170318.tgz +# Latest tack can be found at ftp://ftp.invisible-island.net/pub/ncurses/current/ +Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.08-20170818.tgz Source6: edit.sed Source7: baselibs.conf -Patch0: ncurses-6.0.dif +Patch0: ncurses-6.1.dif Patch1: ncurses-5.9-ibm327x.dif Patch4: ncurses-5.7-tack.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -235,12 +235,11 @@ incoming data stream. %prep %setup -q -rm -f Ada95/src/terminal_interface-curses.adb -rm -f mkinstalldirs tar -xjf %{S:1} set +x for patch in patches/ncurses*.patch do + test -e "$patch" || continue patch -f -T -p1 -s < $patch done set -x @@ -254,10 +253,6 @@ mv tack-* tack %patch1 -p0 -b .327x %patch4 -p0 -b .hs %patch0 -p0 -b .p0 -rm -vf include/ncurses_dll.h -rm -vf mkdirs.sh -rm -vf tar-copy.sh -rm -vf mk-dlls.sh %build # @@ -406,9 +401,8 @@ rm -vf mk-dlls.sh %endif --with-dlsym \ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \ - --with-termlib=tinfo \ - --with-ticlib=tic \ --with-xterm-kbs=del \ + --disable-stripping \ --disable-root-environ \ --disable-termcap \ --disable-overwrite \ @@ -430,7 +424,12 @@ rm -vf mk-dlls.sh --with-pthread \ --enable-reentrant \ --enable-ext-mouse \ - --disable-widec \ + --enable-widec \ + --with-termlib=tinfow \ + --with-ticlib=ticw \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursestw.map \ +%endif --enable-ext-colors \ --enable-weak-symbols \ --enable-wgetch-events \ @@ -452,9 +451,6 @@ rm -vf mk-dlls.sh %else --with-fallbacks="" \ %endif -%if %{with symversion} - --with-versioned-syms=${PWD}/package/ncursest.map \ -%endif %if %{with hasheddb} --with-hashed-db \ %endif @@ -483,29 +479,31 @@ rm -vf mk-dlls.sh # of our preferred fallback terminfo list into the final # fallback.c. # + mkdir lib/.build cp -p progs/tic progs/tic.build cp -p progs/infocmp progs/infocmp.build + cp -p lib/*.so* lib/.build/ PATH=$PWD/progs:$OPATH - LD_LIBRARY_PATH=$PWD/lib - export LD_LIBRARY_PATH PATH + export PATH + (cat > ${PWD}/.build_tic)<<-EOF + export LD_LIBRARY_PATH=$PWD/lib/.build + export BUILD_TIC=$PWD/progs/tic.build + export BUILD_INFOCMP=$PWD/progs/infocmp.build + EOF pushd ncurses/ TERMINFO=$PWD/tmp export TERMINFO mkdir -p $TERMINFO - (cat > ${PWD}/.build_tic)<<-EOF - export BUILD_TIC=$PWD/../progs/tic.build - export BUILD_INFOCMP=$PWD/../progs/infocmp.build - EOF - . ${PWD}/.build_tic + . ${PWD}/../.build_tic $BUILD_TIC -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src $BUILD_TIC -o $TERMINFO -s terminfo.src sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $BUILD_TIC ${FALLBK//,/ } > fallback.c rm -rf $TERMINFO unset TERMINFO cp -p fallback.c ../fallback.c.build + unset LD_LIBRARY_PATH popd PATH=$OPATH - unset LD_LIBRARY_PATH # # Now rebuild libncurses and do the rest of this job # @@ -521,9 +519,9 @@ rm -vf mk-dlls.sh %endif # must not use %jobs here (would lead to: ln: ncurses.h already exists) find man/ -name '*.[1-8]x.*' -print -delete - make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} + make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir} ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} - sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config + sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfow" %{root}%{_bindir}/ncursesw6-config mkdir pc mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ # @@ -552,11 +550,13 @@ rm -vf mk-dlls.sh --disable-reentrant \ --disable-ext-mouse \ --disable-widec \ - --disable-ext-colors \ - --disable-overwrite \ + --with-termlib=tinfo \ + --with-ticlib=tic \ %if %{with symversion} --with-versioned-syms=${PWD}/package/ncurses.map \ %endif + --disable-ext-colors \ + --disable-overwrite \ --without-progs sleep 1 kill $pid @@ -589,7 +589,7 @@ rm -vf mk-dlls.sh done # - # Now use --enable-widec for UTF8/wide character support. + # Now use --disable-widec for narrow character support. # The libs with 16 bit wide characters are binary incompatible # to the normal 8bit wide character libs. # @@ -599,14 +599,14 @@ rm -vf mk-dlls.sh eval screen -D -m ./${c#*./} --with-pthread \ --enable-reentrant \ --enable-ext-mouse \ - --enable-widec \ - --with-termlib=tinfow \ - --with-ticlib=ticw \ + --disable-widec \ + --with-termlib=tinfo \ + --with-ticlib=tic \ +%if %{with symversion} + --with-versioned-syms=${PWD}/package/ncursest.map \ +%endif --enable-ext-colors \ --disable-overwrite \ -%if %{with symversion} - --with-versioned-syms=${PWD}/package/ncursestw.map \ -%endif --without-progs sleep 1 kill $pid @@ -617,10 +617,10 @@ rm -vf mk-dlls.sh make -C c++ etip.h make %{?_smp_mflags} # must not use %jobs here (would lead to: ln: ncurses.h already exists) - make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir} - sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfow" %{root}%{_bindir}/ncursesw6-config + make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} + sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config pushd man - sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1 + sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ @@ -641,11 +641,11 @@ rm -vf mk-dlls.sh --enable-widec \ --with-termlib=tinfow \ --with-ticlib=ticw \ - --disable-ext-colors \ - --disable-overwrite \ %if %{with symversion} --with-versioned-syms=${PWD}/package/ncursesw.map \ %endif + --disable-ext-colors \ + --disable-overwrite \ --without-progs sleep 1 kill $pid @@ -791,10 +791,8 @@ rm -vf mk-dlls.sh install -m 644 NEWS %{buildroot}%{_defaultdocdir}/ncurses/ mkdir -p %{buildroot}%{_sysconfdir}/terminfo mkdir -p %{buildroot}%{_miscdir} - LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{buildroot}/%{_lib} - export LD_LIBRARY_PATH pushd ncurses/ - . ${PWD}/.build_tic + . ${PWD}/../.build_tic { echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2" $BUILD_TIC -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap # Gererate new termcap entries for various linux consoles @@ -802,8 +800,8 @@ rm -vf mk-dlls.sh TERMINFO=%{buildroot}%{_datadir}/terminfo \ bash %{SOURCE2} install -m 0644 termcap.new %{buildroot}%{_miscdir}/termcap + unset LD_LIBRARY_PATH popd - unset LD_LIBRARY_PATH if test `%{_bindir}/id -u` = '0' ; then chown root:root %{buildroot}%{_miscdir}/termcap chmod 0644 %{buildroot}%{_miscdir}/termcap diff --git a/tack-1.07-20170318.tgz b/tack-1.07-20170318.tgz deleted file mode 100644 index 1d2ad5b..0000000 --- a/tack-1.07-20170318.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dca952b1eae20517f44b31865dc706e30869f19d01e3fab8ffbae85f883b521 -size 212340 diff --git a/tack-1.08-20170818.tgz b/tack-1.08-20170818.tgz new file mode 100644 index 0000000..7a4a740 --- /dev/null +++ b/tack-1.08-20170818.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20995ff2b08c9e74b217bbf6f95dcf7321fc22a6b1bdf1f295f0dd369fca5535 +size 225919