openharmony/third_party_ncurses
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ncurses synced 2024-11-23 05:49:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct the source of ncurses

Browse Source 
Signed-off-by: zhuyan <zhuyan34@huawei.com>
This commit is contained in:
zhuyan 2021-09-23 17:11:54 +08:00
parent ecd1288738
commit 923e3b7069
7 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ncurses-6.2.tar.gz Normal file
View File

Binary file not shown.

24
ncurses-config.patch
View File

@ -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)

17
ncurses-kbs.patch
View File

@ -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,

48
ncurses-libs.patch
View File

@ -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

9
ncurses-urxvt.patch
View File

@ -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,

13
ncurses.spec
View File

@ -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 <zhuyan34@huawei.com> - 6.2-2
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:correct the source of ncurses
* Thu Apr 16 2020 huzunhao <huzunhao2@huawei.com> - 6.2-1
- Type:bugfix
- Id:NA

BIN
ncurses.tar.gz
View File

Binary file not shown.