!7 upgrade to 6.2

Merge pull request !7 from 通行百万/local
2020-07-27 18:55:20 +08:00 · 2020-07-27 18:55:20 +08:00 · ecd1288738
commit ecd1288738
parent 5c06b9922d 3774d00642
7 changed files with 218 additions and 213 deletions
--- a/ncurses-6.1-20191109.tgz
+++ b/ncurses-6.1-20191109.tgz
--- a/ncurses-config.patch
+++ b/ncurses-config.patch
@ -1,7 +1,7 @@
-diff -up ncurses-6.1-20191109/misc/gen-pkgconfig.in.config ncurses-6.1-20191109/misc/gen-pkgconfig.in
--- ncurses-6.1-20191109/misc/gen-pkgconfig.in.config	2019-10-13 00:27:10.000000000 +0200
-+++ ncurses-6.1-20191109/misc/gen-pkgconfig.in	2019-11-12 09:52:09.693017663 +0100
-@@ -78,7 +78,7 @@ if [ "$includedir" != "/usr/include" ];
+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 @@
 fi
 
 lib_flags=
@ -10,10 +10,10 @@ diff -up ncurses-6.1-20191109/misc/gen-pkgconfig.in.config ncurses-6.1-20191109/
 do
 	case $opt in
 	-l*) # LIBS is handled specially below
-diff -up ncurses-6.1-20191109/misc/ncurses-config.in.config ncurses-6.1-20191109/misc/ncurses-config.in
--- ncurses-6.1-20191109/misc/ncurses-config.in.config	2019-10-12 23:25:17.000000000 +0200
-+++ ncurses-6.1-20191109/misc/ncurses-config.in	2019-11-12 09:54:42.069324995 +0100
-@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
+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 @@
 
 bindir="@bindir@"
 includedir="@includedir@"
@ -21,7 +21,7 @@ diff -up ncurses-6.1-20191109/misc/ncurses-config.in.config ncurses-6.1-20191109
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 mandir="@mandir@"
-@@ -100,7 +99,7 @@ fi
+@@ -101,7 +100,7 @@
 # There is no portable way to find the list of standard library directories. 
 # Require a POSIX shell anyway, to keep this simple.
 lib_flags=
@ -29,8 +29,8 @@ diff -up ncurses-6.1-20191109/misc/ncurses-config.in.config ncurses-6.1-20191109
 +for opt in $LIBS
 do
 	case $opt in
- 	-Wl,-z,*) # ignore flags used to manipulate shared image
-@@ -109,9 +108,6 @@ do
+ 	-specs*) # ignore linker specs-files which were used to build library
+@@ -113,9 +112,6 @@
 	-L*)
 		[ -d ${opt##-L} ] || continue
 		case ${opt##-L} in
@ -40,7 +40,7 @@ diff -up ncurses-6.1-20191109/misc/ncurses-config.in.config ncurses-6.1-20191109
 		*)
 			found=no
 			for check in $lib_flags
-@@ -231,7 +227,6 @@ ENDECHO
+@@ -235,7 +231,6 @@
 		echo $INCS
 		;;
 	--libdir)
--- a/ncurses-kbs.patch
+++ b/ncurses-kbs.patch
@ -1,7 +1,7 @@
-diff -up ncurses-6.1-20191109/misc/terminfo.src.kbs ncurses-6.1-20191109/misc/terminfo.src
--- ncurses-6.1-20191109/misc/terminfo.src.kbs	2019-11-12 09:23:27.079543254 +0100
-+++ ncurses-6.1-20191109/misc/terminfo.src	2019-11-12 09:24:58.622727887 +0100
-@@ -5952,7 +5952,7 @@ rxvt-basic|rxvt terminal base (X Window
+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 @@
 	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 +10,7 @@ diff -up ncurses-6.1-20191109/misc/terminfo.src.kbs ncurses-6.1-20191109/misc/te
 	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,
-@@ -5964,7 +5964,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -5972,7 +5972,7 @@
 	    %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 +19,7 @@ diff -up ncurses-6.1-20191109/misc/terminfo.src.kbs ncurses-6.1-20191109/misc/te
 # Key Codes from rxvt reference:
 #
 # Note: Shift + F1-F10 generates F11-F20
-@@ -7467,7 +7467,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -7306,7 +7306,7 @@
 	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 +28,7 @@ diff -up ncurses-6.1-20191109/misc/terminfo.src.kbs ncurses-6.1-20191109/misc/te
 	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,
-@@ -7481,6 +7481,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -7320,6 +7320,7 @@
 	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 +36,7 @@ diff -up ncurses-6.1-20191109/misc/terminfo.src.kbs ncurses-6.1-20191109/misc/te
 # 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,
-@@ -7596,6 +7597,7 @@ screen.xterm-r6|screen customized for X1
+@@ -7435,6 +7436,7 @@
 # on Solaris because Sun's curses implementation gets confused.
 screen.teraterm|disable ncv in teraterm,
 	ncv#127,
--- a/ncurses-libs.patch
+++ b/ncurses-libs.patch
@ -1,16 +1,16 @@
-diff -up ncurses-6.0-20150810/c++/Makefile.in.libs ncurses-6.0-20150810/c++/Makefile.in
--- ncurses-6.0-20150810/c++/Makefile.in.libs	2015-08-06 01:15:41.000000000 +0200
-+++ ncurses-6.0-20150810/c++/Makefile.in	2015-08-12 17:07:35.573822650 +0200
-@@ -112,7 +112,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@
+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@
 
 LIBROOT		= ncurses++
 
-@@ -147,8 +147,7 @@ LDFLAGS_SHARED	= $(TEST_LDFLAGS) $(CFLAG
+@@ -153,8 +153,7 @@
 LDFLAGS_DEFAULT	= $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
 
 # flags for library built by this makefile
@ -20,10 +20,10 @@ diff -up ncurses-6.0-20150810/c++/Makefile.in.libs ncurses-6.0-20150810/c++/Make
 
 AUTO_SRC	= \
 		etip.h
-diff -up ncurses-6.0-20150810/form/Makefile.in.libs ncurses-6.0-20150810/form/Makefile.in
--- ncurses-6.0-20150810/form/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.0-20150810/form/Makefile.in	2015-08-12 17:08:14.945939259 +0200
-@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
+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 @@
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
@ -32,10 +32,10 @@ diff -up ncurses-6.0-20150810/form/Makefile.in.libs ncurses-6.0-20150810/form/Ma
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@
-diff -up ncurses-6.0-20150810/menu/Makefile.in.libs ncurses-6.0-20150810/menu/Makefile.in
--- ncurses-6.0-20150810/menu/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.0-20150810/menu/Makefile.in	2015-08-12 17:09:10.135102716 +0200
-@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
+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 @@
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
@ -44,10 +44,10 @@ diff -up ncurses-6.0-20150810/menu/Makefile.in.libs ncurses-6.0-20150810/menu/Ma
 
 RPATH_LIST	= @RPATH_LIST@
 RESULTING_SYMS	= @RESULTING_SYMS@
-diff -up ncurses-6.0-20150810/panel/Makefile.in.libs ncurses-6.0-20150810/panel/Makefile.in
--- ncurses-6.0-20150810/panel/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.0-20150810/panel/Makefile.in	2015-08-12 17:09:33.324171396 +0200
-@@ -109,7 +109,7 @@ LINK		= $(LIBTOOL_LINK)
+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 @@
 LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
 
 SHLIB_DIRS	= -L../lib
--- a/ncurses-urxvt.patch
+++ b/ncurses-urxvt.patch
@ -1,7 +1,7 @@
-diff -up ncurses-6.0-20150810/misc/terminfo.src.urxvt ncurses-6.0-20150810/misc/terminfo.src
--- ncurses-6.0-20150810/misc/terminfo.src.urxvt	2015-07-25 21:27:20.000000000 +0200
-+++ ncurses-6.0-20150810/misc/terminfo.src	2015-08-12 17:38:46.050362567 +0200
-@@ -5214,6 +5214,175 @@ rxvt-cygwin-native|rxvt terminal emulato
+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 @@
 rxvt-16color|rxvt with 16 colors like aixterm,
 	ncv#32, use=ibm+16color, use=rxvt,
 
--- a/ncurses.spec
+++ b/ncurses.spec
@ -1,11 +1,11 @@
-%global revision 20191109
+%global revision 20200411
 Name:          ncurses
-Version:       6.1
-Release:       14
+Version:       6.2
+Release:       1
 Summary:       Terminal control library
 License:       MIT
 URL:           https://invisible-island.net/ncurses/ncurses.html
-Source0:       https://invisible-mirror.net/archives/ncurses/current/ncurses-%{version}-%{revision}.tgz
+Source0:       https://invisible-mirror.net/archives/ncurses/current/ncurses.tar.gz

 Patch8:        ncurses-config.patch
 Patch9:        ncurses-libs.patch
@ -220,8 +220,13 @@ xz NEWS
 %{_mandir}/man5/*
 %{_mandir}/man7/*

-
 %changelog
+* Thu Apr 16 2020 huzunhao <huzunhao2@huawei.com> - 6.2-1
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:update to 6.2
+
 * Mon Feb 17 2020 hexiujun <hexiujun1@huawei.com> - 6.1-14
 - Type:enhancement
 - ID:NA
--- a/ncurses.tar.gz
+++ b/ncurses.tar.gz