diff --git a/0001-revert-GCC_PRINTF-and-GCC_SCANF-to-workaround-some-p.patch b/0001-revert-GCC_PRINTF-and-GCC_SCANF-to-workaround-some-p.patch deleted file mode 100644 index d0059c49e174e1033a3a6e0f28a4d03a43949e4f..0000000000000000000000000000000000000000 --- a/0001-revert-GCC_PRINTF-and-GCC_SCANF-to-workaround-some-p.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 61c58e0942e339ddacb1c7339bca3815cf693b90 Mon Sep 17 00:00:00 2001 -From: forrest_ly -Date: Wed, 16 Mar 2022 17:16:48 +0800 -Subject: [PATCH] revert GCC_PRINTF and GCC_SCANF to workaround some pkg build - fail - ---- - include/curses.h.in | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/include/curses.h.in b/include/curses.h.in -index 6acf2d0..9ecdfe6 100644 ---- a/include/curses.h.in -+++ b/include/curses.h.in -@@ -557,10 +557,14 @@ struct _win_st - - /* - * We cannot define these in ncurses_cfg.h, since they require parameters to be -- * passed (that is non-portable). -+ * passed (that is non-portable). If you happen to be using gcc with warnings -+ * enabled, define -+ * GCC_PRINTF -+ * GCC_SCANF -+ * to improve checking of calls to printw(), etc. - */ - #ifndef GCC_PRINTFLIKE --#ifndef printf -+#if defined(GCC_PRINTF) && !defined(printf) - #define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var))) - #else - #define GCC_PRINTFLIKE(fmt,var) /*nothing*/ -@@ -568,7 +572,7 @@ struct _win_st - #endif - - #ifndef GCC_SCANFLIKE --#ifndef scanf -+#if defined(GCC_SCANF) && !defined(scanf) - #define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var))) - #else - #define GCC_SCANFLIKE(fmt,var) /*nothing*/ -@@ -816,14 +820,10 @@ extern NCURSES_EXPORT(void) use_tioctl (bool); /* implemented */ - extern NCURSES_EXPORT(int) vidattr (chtype); /* implemented */ - extern NCURSES_EXPORT(int) vidputs (chtype, NCURSES_OUTC); /* implemented */ - extern NCURSES_EXPORT(int) vline (chtype, int); /* generated */ --extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *, va_list) GCC_DEPRECATED(use vw_printw) /* implemented */ -- GCC_PRINTFLIKE(2,0); --extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *, va_list) /* implemented */ -- GCC_PRINTFLIKE(2,0); --extern NCURSES_EXPORT(int) vwscanw (WINDOW *, const char *, va_list) GCC_DEPRECATED(use vw_scanw) /* implemented */ -- GCC_SCANFLIKE(2,0); --extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, const char *, va_list) /* implemented */ -- GCC_SCANFLIKE(2,0); -+extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *, va_list) GCC_PRINTFLIKE(2,0) GCC_DEPRECATED(use vw_printw); /* implemented */ -+extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *, va_list) GCC_PRINTFLIKE(2,0); /* implemented */ -+extern NCURSES_EXPORT(int) vwscanw (WINDOW *, const char *, va_list) GCC_SCANFLIKE(2,0) GCC_DEPRECATED(use vw_scanw); /* implemented */ -+extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, const char *, va_list) GCC_SCANFLIKE(2,0); /* implemented */ - extern NCURSES_EXPORT(int) waddch (WINDOW *, const chtype); /* implemented */ - extern NCURSES_EXPORT(int) waddchnstr (WINDOW *,const chtype *,int); /* implemented */ - extern NCURSES_EXPORT(int) waddchstr (WINDOW *,const chtype *); /* generated */ --- -2.27.0 - diff --git a/ncurses-6.4-20221231.tgz b/ncurses-6.4-20230520.tgz similarity index 34% rename from ncurses-6.4-20221231.tgz rename to ncurses-6.4-20230520.tgz index e84ddd17aa6139bd7de05a1e1f7b892fbf1d48cb..c0877fe330edbf8deab5c974d4a27a863cb470cb 100644 Binary files a/ncurses-6.4-20221231.tgz and b/ncurses-6.4-20230520.tgz differ diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch index 5d80ebc3d2486c5cb6f7d3d3ff6a151ebb3c594c..78d91e59d62e0972f88334ea6c305d9cfd242efe 100644 --- a/ncurses-kbs.patch +++ b/ncurses-kbs.patch @@ -1,7 +1,7 @@ -diff -up ncurses-6.3-20221126/misc/terminfo.src.kbs ncurses-6.3-20221126/misc/terminfo.src ---- ncurses-6.3-20221126/misc/terminfo.src.kbs 2022-11-29 17:11:34.557911207 +0100 -+++ ncurses-6.3-20221126/misc/terminfo.src 2022-11-29 17:13:11.646709427 +0100 -@@ -6698,7 +6698,7 @@ +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, @@ -10,7 +10,7 @@ diff -up ncurses-6.3-20221126/misc/terminfo.src.kbs ncurses-6.3-20221126/misc/te 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, -@@ -6709,7 +6709,7 @@ +@@ -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, @@ -19,24 +19,7 @@ diff -up ncurses-6.3-20221126/misc/terminfo.src.kbs ncurses-6.3-20221126/misc/te # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -8367,7 +8367,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, -- ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z, -+ ind=\n, indn=\E[%p1%dS, is2=\E)0, kcbt=\E[Z, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 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~, -@@ -8380,6 +8380,7 @@ - smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, - E0=\E(B, S0=\E(%p1%c, use=vt220+pcedit, - use=xterm+alt1049, use=ecma+color, use=vt100+enq, -+ use=xterm+kbs, - - screen|VT 100/ANSI X3.64 virtual terminal, - use=screen4, -@@ -8509,6 +8510,7 @@ +@@ -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, diff --git a/ncurses.spec b/ncurses.spec index 63d5cab471981e40fb355234a3137eca0a607bef..8f338718ad25ffc9215d282b49900bff07aab650 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,6 +1,6 @@ %define anolis_release 1 %define ver 6.4 -%define patchdate 20221231 +%define patchdate 20230520 Name: ncurses Version: %{ver}.%{patchdate} @@ -11,7 +11,6 @@ License: MIT URL: https://invisible-island.net/ncurses/ncurses.html Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{ver}-%{patchdate}.tgz -Patch0: 0001-revert-GCC_PRINTF-and-GCC_SCANF-to-workaround-some-p.patch Patch8: ncurses-config.patch Patch9: ncurses-libs.patch Patch11: ncurses-urxvt.patch @@ -122,6 +121,8 @@ common_options="\ --enable-overwrite \ --enable-pc-files \ --enable-xmc-glitch \ + --disable-root-access \ + --disable-root-environ \ --disable-stripping \ --disable-wattr-macros \ --with-cxx-shared \ @@ -306,6 +307,9 @@ xz NEWS %changelog +* Thu May 25 2023 Funda Wang - 6.4.20230520-1 +- Update to patchlevel 20230520 + * Sun Jan 1 2023 Funda Wang - 6.4.20221231-1 - New version 6.4