diff --git a/ncurses-config.patch b/ncurses-config.patch deleted file mode 100644 index fc326fc584159c725e7f29c8c03d79029cdaeebb..0000000000000000000000000000000000000000 --- a/ncurses-config.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up ncurses-6.3-20221126/misc/gen-pkgconfig.in.config ncurses-6.3-20221126/misc/gen-pkgconfig.in ---- ncurses-6.3-20221126/misc/gen-pkgconfig.in.config 2022-10-08 18:45:20.000000000 +0200 -+++ ncurses-6.3-20221126/misc/gen-pkgconfig.in 2022-11-29 17:04:43.353766420 +0100 -@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; - fi - - lib_flags= --for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ -+for opt in -L$libdir @LIBS@ - do - case $opt in - -l*) # LIBS is handled specially below -diff -up ncurses-6.3-20221126/misc/ncurses-config.in.config ncurses-6.3-20221126/misc/ncurses-config.in ---- ncurses-6.3-20221126/misc/ncurses-config.in.config 2022-07-26 23:36:28.000000000 +0200 -+++ ncurses-6.3-20221126/misc/ncurses-config.in 2022-11-29 17:06:04.381597412 +0100 -@@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@" - - bindir="@bindir@" - includedir="@includedir@" --libdir="@libdir@" - datarootdir="@datarootdir@" - datadir="@datadir@" - mandir="@mandir@" -@@ -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= --for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS -+for opt in $LIBS - do - case $opt in - -specs*) # ignore linker specs-files which were used to build library -@@ -120,13 +119,13 @@ do - lib_check=`echo "x$opt" | sed -e 's/^.-L//'` - [ -d "$lib_check" ] || continue - case "$lib_check" in -- @LD_SEARCHPATH@) # skip standard libdir -+ ////) # skip standard libdir (disabled for multilib) - if [ "$lib_check" = "$libdir" ] - then - lib_first=yes - IFS_save="$IFS" - IFS='|' -- LIBDIRS="@LD_SEARCHPATH@" -+ LIBDIRS="" - for lib_check in $LIBDIRS - do - if [ -d "$lib_check" ] -@@ -274,7 +273,6 @@ ENDECHO - echo "$INCS" - ;; - --libdir) -- echo "${libdir}" - ;; - --mandir) - echo "${mandir}" diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch deleted file mode 100644 index 78d91e59d62e0972f88334ea6c305d9cfd242efe..0000000000000000000000000000000000000000 --- a/ncurses-kbs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up ncurses-6.4-20230107/misc/terminfo.src.kbs ncurses-6.4-20230107/misc/terminfo.src ---- ncurses-6.4-20230107/misc/terminfo.src.kbs 2023-01-09 14:47:05.097093771 +0100 -+++ ncurses-6.4-20230107/misc/terminfo.src 2023-01-09 14:47:05.100093766 +0100 -@@ -6711,7 +6711,7 @@ rxvt-basic|rxvt terminal base (X Window - 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, -- is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, -+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, - kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, - 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, -@@ -6722,7 +6722,7 @@ rxvt-basic|rxvt terminal base (X Window - %p9%t\016%e\017%;, - sgr0=\E[0m\017, smacs=^N, smir=\E[4h, smkx=\E=, smso=\E[7m, - smul=\E[4m, tbc=\E[3g, use=xterm+alt47, use=vt100+enq, -- use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, -+ use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, use=xterm+kbs, - # Key Codes from rxvt reference: - # - # Note: Shift + F1-F10 generates F11-F20 -@@ -8523,6 +8523,7 @@ screen.xterm-r6|screen customized for X1 - # on Solaris because Sun's curses implementation gets confused. - screen.teraterm|disable ncv in teraterm, - ncv#127, -+ kbs=^H, - acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i - \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u - \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, diff --git a/ncurses-libs.patch b/ncurses-libs.patch deleted file mode 100644 index 401da11b9de65ea291b213a24e33a776d7ac8e39..0000000000000000000000000000000000000000 --- a/ncurses-libs.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -up ncurses-6.2-20210306/c++/Makefile.in.libs ncurses-6.2-20210306/c++/Makefile.in ---- ncurses-6.2-20210306/c++/Makefile.in.libs 2021-01-23 21:42:08.000000000 +0100 -+++ ncurses-6.2-20210306/c++/Makefile.in 2021-03-11 12:02:29.576741101 +0100 -@@ -118,7 +118,7 @@ SHLIB_LIST = $(SHLIB_DIRS) \ - -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++ - -@@ -153,8 +153,7 @@ LDFLAGS_SHARED = $(TEST_LDFLAGS) $(CFLAG - LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@) - - # flags for library built by this makefile --LDFLAGS = $(TEST_ARGS) @LDFLAGS@ \ -- @LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS) -+LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS) - - AUTO_SRC = \ - etip.h -diff -up ncurses-6.2-20210306/form/Makefile.in.libs ncurses-6.2-20210306/form/Makefile.in ---- ncurses-6.2-20210306/form/Makefile.in.libs 2021-01-23 21:42:08.000000000 +0100 -+++ ncurses-6.2-20210306/form/Makefile.in 2021-03-11 12:00:59.001470707 +0100 -@@ -110,7 +110,7 @@ LINK = $(LIBTOOL_LINK) - LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ - - SHLIB_DIRS = -L../lib --SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ -+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@ - - RPATH_LIST = @RPATH_LIST@ - RESULTING_SYMS = @RESULTING_SYMS@ -diff -up ncurses-6.2-20210306/menu/Makefile.in.libs ncurses-6.2-20210306/menu/Makefile.in ---- ncurses-6.2-20210306/menu/Makefile.in.libs 2020-08-29 16:50:45.000000000 +0200 -+++ ncurses-6.2-20210306/menu/Makefile.in 2021-03-11 12:00:59.002470754 +0100 -@@ -110,7 +110,7 @@ LINK = $(LIBTOOL_LINK) - LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ - - SHLIB_DIRS = -L../lib --SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ -+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@ - - RPATH_LIST = @RPATH_LIST@ - RESULTING_SYMS = @RESULTING_SYMS@ -diff -up ncurses-6.2-20210306/panel/Makefile.in.libs ncurses-6.2-20210306/panel/Makefile.in ---- ncurses-6.2-20210306/panel/Makefile.in.libs 2020-08-29 16:50:45.000000000 +0200 -+++ ncurses-6.2-20210306/panel/Makefile.in 2021-03-11 12:00:59.002470754 +0100 -@@ -112,7 +112,7 @@ LINK = $(LIBTOOL_LINK) - LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ - - SHLIB_DIRS = -L../lib --SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ -+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@ - - RPATH_LIST = @RPATH_LIST@ - RESULTING_SYMS = @RESULTING_SYMS@ diff --git a/ncurses-urxvt.patch b/ncurses-urxvt.patch deleted file mode 100644 index 92f2169032898a9d92c1c505d2f4e557de309594..0000000000000000000000000000000000000000 --- a/ncurses-urxvt.patch +++ /dev/null @@ -1,185 +0,0 @@ -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,181 @@ rxvt-cygwin-native|rxvt terminal emulato - rxvt-16color|rxvt with 16 colors like aixterm, - ncv#32, use=ibm+16color, use=rxvt, - -+# rxvt-unicode -+# http://cvs.schmorp.de/rxvt-unicode/doc/etc/rxvt-unicode.terminfo?revision=1.34 -+# From: Thomas Dickey 04 Oct 1997 -+# Updated: Özgür Kesim 02 Nov 1997 -+# Updated: Marc Lehmann , 17 Feb 2005 -+# Updated: Marc Lehmann , 04 Nov 2008: change init/reset sequences -+# Updated: Marc Lehmann , 24 Nov 2014: implement cvvis as blinking cursor -+# Updated: Marc Lehmann , 13 Dec 2014: removed superfluous 0 from sgr -+# Updated: Robbie Harwood , 25 Oct 2019: restore deleted rxvt-unicode-256color -+rxvt-unicode|rxvt-unicode terminal (X Window System), -+ am, -+ bce, -+ eo, -+ km, -+ msgr, -+ xenl, -+ hs, -+ cols#80, -+ it#8, -+ lines#24, -+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, -+ bel=^G, -+ blink=\E[5m, -+ bold=\E[1m, -+ clear=\E[H\E[2J, -+ civis=\E[?25l, -+ cnorm=\E[?12l\E[?25h, -+ cvvis=\E[?12;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, -+ 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, -+ el1=\E[1K, -+ flash=\E[?5h$<20/>\E[?5l, -+ 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, -+ is1=\E[\041p, -+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ kDC=\E[3$, -+ kIC=\E[2$, -+ kEND=\E[8$, -+ kHOM=\E[7$, -+ kLFT=\E[d, -+ kNXT=\E[6$, -+ kPRV=\E[5$, -+ kRIT=\E[c, -+ kbs=\177, -+ ka1=\EOw, -+ ka3=\EOy, -+ kb2=\EOu, -+ kc1=\EOq, -+ kc3=\EOs, -+ kcbt=\E[Z, -+ kcub1=\E[D, -+ kcud1=\E[B, -+ kcuf1=\E[C, -+ kcuu1=\E[A, -+ kdch1=\E[3~, -+ kel=\E[8\^, -+ kend=\E[8~, -+ kent=\EOM, -+ 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~, -+ kf2=\E[12~, -+ kf20=\E[34~, -+ kf3=\E[13~, -+ kf4=\E[14~, -+ kf5=\E[15~, -+ kf6=\E[17~, -+ kf7=\E[18~, -+ kf8=\E[19~, -+ kf9=\E[20~, -+ kfnd=\E[1~, -+ khome=\E[7~, -+ kich1=\E[2~, -+ kmous=\E[M, -+ knp=\E[6~, -+ kpp=\E[5~, -+ kslt=\E[4~, -+ rc=\E8, -+ rev=\E[7m, -+ ri=\EM, -+ rmso=\E[27m, -+ rmul=\E[24m, -+ rs1=\Ec, -+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, -+ sgr0=\E[m\E(B, -+ enacs=, -+ smacs=\E(0, -+ rmacs=\E(B, -+ smso=\E[7m, -+ smul=\E[4m, -+ tbc=\E[3g, -+ vpa=\E[%i%p1%dd, -+ colors#88, -+ pairs#7744, -+ btns#5, -+ lm#0, -+ ccc, -+ npc, -+ mc5i, -+ ncv#0, -+ mir, -+ xon, -+ bw, -+ ech=\E[%p1%dX, -+ mc0=\E[i, -+ mc4=\E[4i, -+ mc5=\E[5i, -+ sitm=\E[3m, -+ ritm=\E[23m, -+ smam=\E[?7h, -+ rmam=\E[?7l, -+ smir=\E[4h, -+ rmir=\E[4l, -+ smcup=\E[?1049h, -+ rmcup=\E[r\E[?1049l, -+ smkx=\E=, -+ rmkx=\E>, -+ indn=\E[%p1%dS, -+ rin=\E[%p1%dT, -+ sgr=\E[%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, -+ op=\E[39;49m, -+ setaf=\E[38;5;%p1%dm, -+ setab=\E[48;5;%p1%dm, -+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, -+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, -+ sc=\E7, -+ s0ds=\E(B, -+ s1ds=\E(0, -+ s2ds=\E*B, -+ s3ds=\E+B, -+ u6=\E[%i%d;%dR, -+ u7=\E[6n, -+ u8=\E[?1;2c, -+ u9=\E[c, -+ tsl=\E]2;, -+ fsl=\007, -+ dsl=\E]2;\007, -+ -+rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), -+ colors#256, -+ pairs#32767, -+ use=rxvt-unicode, -+ - #### MRXVT - # mrxvt 0.5.4 - # diff --git a/ncurses.spec b/ncurses.spec index 8f338718ad25ffc9215d282b49900bff07aab650..42048453b1c12c621543d53f2551b1faf761f352 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,20 +1,16 @@ %define anolis_release 1 %define ver 6.4 -%define patchdate 20230520 Name: ncurses -Version: %{ver}.%{patchdate} +Version: %{ver} Release: %{anolis_release}%{?dist} +Epoch: 1 Summary: Ncurses support utilities License: MIT URL: https://invisible-island.net/ncurses/ncurses.html -Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{ver}-%{patchdate}.tgz +Source0: https://github.com/mirror/ncurses/archive/refs/tags/v%{ver}.tar.gz -Patch8: ncurses-config.patch -Patch9: ncurses-libs.patch -Patch11: ncurses-urxvt.patch -Patch12: ncurses-kbs.patch BuildRequires: gcc gcc-c++ gpm-devel gnupg2 make Requires: %{name}-libs = %{version}-%{release} @@ -112,7 +108,7 @@ The ncurses-static package includes static libraries of the ncurses library. %prep -%autosetup -p1 -n %{name}-%{ver}-%{patchdate} +%autosetup -p1 -n %{name}-%{ver} %build common_options="\ @@ -307,6 +303,9 @@ xz NEWS %changelog +* Sat Mar 09 2024 Kaiqiang Wang - 6.4-1 +- Revert to 6.4 + * Thu May 25 2023 Funda Wang - 6.4.20230520-1 - Update to patchlevel 20230520 diff --git a/ncurses-6.4-20230520.tgz b/v6.4.tar.gz similarity index 33% rename from ncurses-6.4-20230520.tgz rename to v6.4.tar.gz index c0877fe330edbf8deab5c974d4a27a863cb470cb..0b3142b2ab087a90a46d5b9c140edca519fb2720 100644 Binary files a/ncurses-6.4-20230520.tgz and b/v6.4.tar.gz differ