diff --git a/ncurses.tar.gz b/ncurses-6.2.tar.gz similarity index 32% rename from ncurses.tar.gz rename to ncurses-6.2.tar.gz index 63fff5401d821395acd86176810575365a463336..c56d13ea81e7d05c6e156d30faa11a56bf0253c7 100644 Binary files a/ncurses.tar.gz and b/ncurses-6.2.tar.gz differ diff --git a/ncurses-config.patch b/ncurses-config.patch index cca105eed7765f1b3c8ab30f80996385f6ac06b4..18d672c45a9c3c8835ec37d77dcca85eeeef7300 100644 --- a/ncurses-config.patch +++ b/ncurses-config.patch @@ -1,7 +1,8 @@ -diff -Nur a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in ---- a/misc/gen-pkgconfig.in 2020-03-08 09:57:33.000000000 +0800 -+++ b/misc/gen-pkgconfig.in 2020-04-14 14:12:37.824000000 +0800 -@@ -83,7 +83,7 @@ +diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in +index 8f00b82..009d215 100644 +--- a/misc/gen-pkgconfig.in ++++ b/misc/gen-pkgconfig.in +@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then fi lib_flags= @@ -10,10 +11,11 @@ diff -Nur a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in do case $opt in -l*) # LIBS is handled specially below -diff -Nur a/misc/ncurses-config.in b/misc/ncurses-config.in ---- a/misc/ncurses-config.in 2020-02-03 07:34:34.000000000 +0800 -+++ b/misc/ncurses-config.in 2020-04-14 14:15:53.844000000 +0800 -@@ -41,7 +41,6 @@ +diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in +index 7f8ba69..e483af5 100644 +--- a/misc/ncurses-config.in ++++ b/misc/ncurses-config.in +@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@" bindir="@bindir@" includedir="@includedir@" @@ -21,7 +23,7 @@ diff -Nur a/misc/ncurses-config.in b/misc/ncurses-config.in datarootdir="@datarootdir@" datadir="@datadir@" mandir="@mandir@" -@@ -101,7 +100,7 @@ +@@ -101,7 +100,7 @@ fi # There is no portable way to find the list of standard library directories. # Require a POSIX shell anyway, to keep this simple. lib_flags= @@ -30,7 +32,7 @@ diff -Nur a/misc/ncurses-config.in b/misc/ncurses-config.in do case $opt in -specs*) # ignore linker specs-files which were used to build library -@@ -113,9 +112,6 @@ +@@ -113,9 +112,6 @@ do -L*) [ -d ${opt##-L} ] || continue case ${opt##-L} in @@ -40,7 +42,7 @@ diff -Nur a/misc/ncurses-config.in b/misc/ncurses-config.in *) found=no for check in $lib_flags -@@ -235,7 +231,6 @@ +@@ -235,7 +231,6 @@ ENDECHO echo $INCS ;; --libdir) diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch index 391ad9adc8903a4f97c1208891a20f76abca2177..009d907a1d62b46f601cde3f968a7366e25329d3 100644 --- a/ncurses-kbs.patch +++ b/ncurses-kbs.patch @@ -1,7 +1,8 @@ -diff -Nur a/misc/terminfo.src b/misc/terminfo.src ---- a/misc/terminfo.src 2020-02-23 07:05:24.000000000 +0800 -+++ b/misc/terminfo.src 2020-04-14 14:24:46.972000000 +0800 -@@ -5960,7 +5960,7 @@ +diff --git a/misc/terminfo.src b/misc/terminfo.src +index c4569b9..24d1de5 100644 +--- a/misc/terminfo.src ++++ b/misc/terminfo.src +@@ -5953,7 +5953,7 @@ rxvt-basic|rxvt terminal base (X Window System), enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, @@ -10,7 +11,7 @@ diff -Nur a/misc/terminfo.src b/misc/terminfo.src kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, -@@ -5972,7 +5972,7 @@ +@@ -5965,7 +5965,7 @@ rxvt-basic|rxvt terminal base (X Window System), %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, @@ -19,7 +20,7 @@ diff -Nur a/misc/terminfo.src b/misc/terminfo.src # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -7306,7 +7306,7 @@ +@@ -7468,7 +7468,7 @@ screen|VT 100/ANSI X3.64 virtual terminal, 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, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, @@ -28,7 +29,7 @@ diff -Nur a/misc/terminfo.src b/misc/terminfo.src 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, -@@ -7320,6 +7320,7 @@ +@@ -7482,6 +7482,7 @@ screen|VT 100/ANSI X3.64 virtual terminal, sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=xterm+alt1049, use=ecma+color, @@ -36,7 +37,7 @@ diff -Nur a/misc/terminfo.src b/misc/terminfo.src # The bce and status-line entries are from screen 3.9.13 (and require some # changes to .screenrc). screen-bce|VT 100/ANSI X3.64 virtual terminal with bce, -@@ -7435,6 +7436,7 @@ +@@ -7597,6 +7598,7 @@ screen.xterm-r6|screen customized for X11R6 xterm, # on Solaris because Sun's curses implementation gets confused. screen.teraterm|disable ncv in teraterm, ncv#127, diff --git a/ncurses-libs.patch b/ncurses-libs.patch index 80322bab12ce70856540064a14cb666842d6a34f..ccc613dfeae90db2264dc0c89d22e3e1481a69f7 100644 --- a/ncurses-libs.patch +++ b/ncurses-libs.patch @@ -1,16 +1,17 @@ -diff -Nur a/c++/Makefile.in b/c++/Makefile.in ---- a/c++/Makefile.in 2020-03-09 00:13:11.000000000 +0800 -+++ b/c++/Makefile.in 2020-04-14 14:30:59.228000000 +0800 -@@ -118,7 +118,7 @@ - -l@FORM_NAME@@USE_LIB_SUFFIX@ \ - -l@MENU_NAME@@USE_LIB_SUFFIX@ \ - -l@PANEL_NAME@@USE_LIB_SUFFIX@ \ -- -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ -+ -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@ +diff --git a/c++/Makefile.in b/c++/Makefile.in +index 9b22b6a..878098f 100644 +--- a/c++/Makefile.in ++++ b/c++/Makefile.in +@@ -114,7 +114,7 @@ LOCAL_LIBDIR = @top_builddir@/lib + + LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@ + SHLIB_DIRS = -L../lib +-SHLIB_LIST = $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ ++SHLIB_LIST = $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@ LIBROOT = ncurses++ -@@ -153,8 +153,7 @@ +@@ -149,8 +149,7 @@ LDFLAGS_SHARED = $(TEST_LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@ LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@) # flags for library built by this makefile @@ -20,10 +21,11 @@ diff -Nur a/c++/Makefile.in b/c++/Makefile.in AUTO_SRC = \ etip.h -diff -Nur a/form/Makefile.in b/form/Makefile.in ---- a/form/Makefile.in 2020-02-23 00:32:11.000000000 +0800 -+++ b/form/Makefile.in 2020-04-14 14:31:55.036000000 +0800 -@@ -110,7 +110,7 @@ +diff --git a/form/Makefile.in b/form/Makefile.in +index 3e5be8d..e3688b6 100644 +--- a/form/Makefile.in ++++ b/form/Makefile.in +@@ -108,7 +108,7 @@ LINK = $(LIBTOOL_LINK) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib @@ -32,10 +34,11 @@ diff -Nur a/form/Makefile.in b/form/Makefile.in RPATH_LIST = @RPATH_LIST@ RESULTING_SYMS = @RESULTING_SYMS@ -diff -Nur a/menu/Makefile.in b/menu/Makefile.in ---- a/menu/Makefile.in 2020-02-23 00:35:47.000000000 +0800 -+++ b/menu/Makefile.in 2020-04-14 14:32:21.040000000 +0800 -@@ -110,7 +110,7 @@ +diff --git a/menu/Makefile.in b/menu/Makefile.in +index 495651c..7d97437 100644 +--- a/menu/Makefile.in ++++ b/menu/Makefile.in +@@ -108,7 +108,7 @@ LINK = $(LIBTOOL_LINK) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib @@ -44,10 +47,11 @@ diff -Nur a/menu/Makefile.in b/menu/Makefile.in RPATH_LIST = @RPATH_LIST@ RESULTING_SYMS = @RESULTING_SYMS@ -diff -Nur a/panel/Makefile.in b/panel/Makefile.in ---- a/panel/Makefile.in 2020-02-23 00:40:36.000000000 +0800 -+++ b/panel/Makefile.in 2020-04-14 14:32:41.792000000 +0800 -@@ -112,7 +112,7 @@ +diff --git a/panel/Makefile.in b/panel/Makefile.in +index 5f7b5b9..5958364 100644 +--- a/panel/Makefile.in ++++ b/panel/Makefile.in +@@ -110,7 +110,7 @@ LINK = $(LIBTOOL_LINK) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib diff --git a/ncurses-urxvt.patch b/ncurses-urxvt.patch index 26922336efff3d023621f814c17ec45d1b237e20..e94d447594e2d48888d8f59c0d268bfd1de392c0 100644 --- a/ncurses-urxvt.patch +++ b/ncurses-urxvt.patch @@ -1,7 +1,8 @@ -diff -Nur a/misc/terminfo.src b/misc/terminfo.src ---- a/misc/terminfo.src 2020-02-23 07:05:24.000000000 +0800 -+++ b/misc/terminfo.src 2020-04-14 14:38:19.116000000 +0800 -@@ -6152,6 +6152,175 @@ +diff --git a/misc/terminfo.src b/misc/terminfo.src +index 70047be..c4569b9 100644 +--- a/misc/terminfo.src ++++ b/misc/terminfo.src +@@ -6145,6 +6145,175 @@ rxvt-cygwin-native|rxvt terminal emulator (native MS Window System port) on cygw rxvt-16color|rxvt with 16 colors like aixterm, ncv#32, use=ibm+16color, use=rxvt, diff --git a/ncurses.spec b/ncurses.spec index a34c10e68a8ccd4ed2a6caa8a650775f6d9d4a79..a033e3a8481a31534c331f82dd404d9ea487fbd8 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,11 +1,10 @@ -%global revision 20200411 Name: ncurses Version: 6.2 -Release: 1 +Release: 2 Summary: Terminal control library License: MIT URL: https://invisible-island.net/ncurses/ncurses.html -Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses.tar.gz +Source0: https://invisible-mirror.net/archives/ncurses/ncurses-6.2.tar.gz Patch8: ncurses-config.patch Patch9: ncurses-libs.patch @@ -72,7 +71,7 @@ This package contains development documentation, manuals for interface function, and related documents. %prep -%autosetup -n %{name}-%{version}-%{revision} -p1 +%autosetup -n %{name}-%{version} -p1 for f in ANNOUNCE; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && @@ -221,6 +220,12 @@ xz NEWS %{_mandir}/man7/* %changelog +* Thu Sep 23 2021 zhuyan - 6.2-2 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:correct the source of ncurses + * Thu Apr 16 2020 huzunhao - 6.2-1 - Type:bugfix - Id:NA