ncurses: Update to version 6.5

Message ID 20240711195327.4179201-1-adolf.belka@ipfire.org
State Staged
Commit da8ffd403d277493e60cadbf20e332ee478422d5
Headers
Series ncurses: Update to version 6.5 |

Commit Message

Adolf Belka July 11, 2024, 7:53 p.m. UTC
  - Update from version 6.4 to 6.5
- Update of rootfile
- --with-pkg-config-libdir as the previous default has been changed to $(LIBDIR) and this
   does not work and resulted in procps not building as it could not find ncurses.
- Likely other packages after procps would have also failed.
- Explicitly specifying the pkgconfig directory location worked.
- Changelog
    6.5
	The changelog details are in the NEWS file in the source tarball. Version 6.5
	 is covered by lines 49 to 530

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/ncurses | 61 +++++++++++++++++++++++++++++----
 lfs/ncurses                     |  9 ++---
 2 files changed, 60 insertions(+), 10 deletions(-)
  

Patch

diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses
index 365322b6c..0eeb2c629 100644
--- a/config/rootfiles/common/ncurses
+++ b/config/rootfiles/common/ncurses
@@ -20,34 +20,32 @@  usr/bin/tset
 #usr/include/etip.h
 #usr/include/form.h
 #usr/include/menu.h
-#usr/include/nc_tparm.h
 #usr/include/ncurses.h
 #usr/include/ncurses_dll.h
 #usr/include/panel.h
 #usr/include/term.h
 #usr/include/term_entry.h
 #usr/include/termcap.h
-#usr/include/tic.h
 #usr/include/unctrl.h
 #usr/lib/libcurses.so
 #usr/lib/libcursesw.so
 #usr/lib/libform.so
 #usr/lib/libformw.so
 usr/lib/libformw.so.6
-usr/lib/libformw.so.6.4
+usr/lib/libformw.so.6.5
 #usr/lib/libmenu.so
 #usr/lib/libmenuw.so
 usr/lib/libmenuw.so.6
-usr/lib/libmenuw.so.6.4
+usr/lib/libmenuw.so.6.5
 #usr/lib/libncurses++w.a
 #usr/lib/libncurses.so
 #usr/lib/libncursesw.so
 usr/lib/libncursesw.so.6
-usr/lib/libncursesw.so.6.4
+usr/lib/libncursesw.so.6.5
 #usr/lib/libpanel.so
 #usr/lib/libpanelw.so
 usr/lib/libpanelw.so.6
-usr/lib/libpanelw.so.6.4
+usr/lib/libpanelw.so.6.5
 #usr/lib/pkgconfig/form.pc
 #usr/lib/pkgconfig/formw.pc
 #usr/lib/pkgconfig/menu.pc
@@ -71,15 +69,30 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man1/tset.1
 #usr/share/man/man3/BC.3x
 #usr/share/man/man3/COLORS.3x
+#usr/share/man/man3/COLOR_BLACK.3x
+#usr/share/man/man3/COLOR_BLUE.3x
+#usr/share/man/man3/COLOR_CYAN.3x
+#usr/share/man/man3/COLOR_GREEN.3x
+#usr/share/man/man3/COLOR_MAGENTA.3x
 #usr/share/man/man3/COLOR_PAIR.3x
 #usr/share/man/man3/COLOR_PAIRS.3x
+#usr/share/man/man3/COLOR_RED.3x
+#usr/share/man/man3/COLOR_WHITE.3x
+#usr/share/man/man3/COLOR_YELLOW.3x
 #usr/share/man/man3/COLS.3x
+#usr/share/man/man3/ERR.3x
 #usr/share/man/man3/ESCDELAY.3x
+#usr/share/man/man3/FALSE.3x
 #usr/share/man/man3/LINES.3x
+#usr/share/man/man3/NCURSES_SCREEN_CB.3x
+#usr/share/man/man3/NCURSES_WINDOW_CB.3x
+#usr/share/man/man3/OK.3x
 #usr/share/man/man3/PAIR_NUMBER.3x
 #usr/share/man/man3/PC.3x
+#usr/share/man/man3/SCREEN.3x
 #usr/share/man/man3/SP.3x
 #usr/share/man/man3/TABSIZE.3x
+#usr/share/man/man3/TRUE.3x
 #usr/share/man/man3/TYPE_ALNUM.3x
 #usr/share/man/man3/TYPE_ALPHA.3x
 #usr/share/man/man3/TYPE_ENUM.3x
@@ -88,6 +101,7 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man3/TYPE_NUMERIC.3x
 #usr/share/man/man3/TYPE_REGEXP.3x
 #usr/share/man/man3/UP.3x
+#usr/share/man/man3/WINDOW.3x
 #usr/share/man/man3/_nc_free_and_exit.3x
 #usr/share/man/man3/_nc_free_tinfo.3x
 #usr/share/man/man3/_nc_freeall.3x
@@ -121,6 +135,7 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man3/attr_off.3x
 #usr/share/man/man3/attr_on.3x
 #usr/share/man/man3/attr_set.3x
+#usr/share/man/man3/attr_t.3x
 #usr/share/man/man3/attroff.3x
 #usr/share/man/man3/attron.3x
 #usr/share/man/man3/attrset.3x
@@ -132,6 +147,7 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man3/bkgdset.3x
 #usr/share/man/man3/bkgrnd.3x
 #usr/share/man/man3/bkgrndset.3x
+#usr/share/man/man3/bool.3x
 #usr/share/man/man3/boolcodes.3x
 #usr/share/man/man3/boolfnames.3x
 #usr/share/man/man3/boolnames.3x
@@ -144,8 +160,10 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man3/can_change_color_sp.3x
 #usr/share/man/man3/cbreak.3x
 #usr/share/man/man3/cbreak_sp.3x
+#usr/share/man/man3/cchar_t.3x
 #usr/share/man/man3/ceiling_panel.3x
 #usr/share/man/man3/chgat.3x
+#usr/share/man/man3/chtype.3x
 #usr/share/man/man3/clear.3x
 #usr/share/man/man3/clearok.3x
 #usr/share/man/man3/clrtobot.3x
@@ -409,16 +427,24 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man3/intrflush.3x
 #usr/share/man/man3/intrflush_sp.3x
 #usr/share/man/man3/inwstr.3x
+#usr/share/man/man3/is_cbreak.3x
+#usr/share/man/man3/is_cbreak_sp.3x
 #usr/share/man/man3/is_cleared.3x
+#usr/share/man/man3/is_echo.3x
+#usr/share/man/man3/is_echo_sp.3x
 #usr/share/man/man3/is_idcok.3x
 #usr/share/man/man3/is_idlok.3x
 #usr/share/man/man3/is_immedok.3x
 #usr/share/man/man3/is_keypad.3x
 #usr/share/man/man3/is_leaveok.3x
 #usr/share/man/man3/is_linetouched.3x
+#usr/share/man/man3/is_nl.3x
+#usr/share/man/man3/is_nl_sp.3x
 #usr/share/man/man3/is_nodelay.3x
 #usr/share/man/man3/is_notimeout.3x
 #usr/share/man/man3/is_pad.3x
+#usr/share/man/man3/is_raw.3x
+#usr/share/man/man3/is_raw_sp.3x
 #usr/share/man/man3/is_scrollok.3x
 #usr/share/man/man3/is_subwin.3x
 #usr/share/man/man3/is_syncok.3x
@@ -746,6 +772,7 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man3/setcchar.3x
 #usr/share/man/man3/setscrreg.3x
 #usr/share/man/man3/setsyx.3x
+#usr/share/man/man3/setterm.3x
 #usr/share/man/man3/setupterm.3x
 #usr/share/man/man3/show_panel.3x
 #usr/share/man/man3/slk_attr.3x
@@ -815,6 +842,8 @@  usr/lib/libpanelw.so.6.4
 #usr/share/man/man3/tigetstr_sp.3x
 #usr/share/man/man3/timeout.3x
 #usr/share/man/man3/tiparm.3x
+#usr/share/man/man3/tiparm_s.3x
+#usr/share/man/man3/tiscan_s.3x
 #usr/share/man/man3/top_panel.3x
 #usr/share/man/man3/top_row.3x
 #usr/share/man/man3/touchline.3x
@@ -1178,6 +1207,7 @@  usr/share/terminfo/E/Eterm-color
 #usr/share/terminfo/a/ampex80
 #usr/share/terminfo/a/annarbor4080
 usr/share/terminfo/a/ansi
+#usr/share/terminfo/a/ansi+apparrows
 #usr/share/terminfo/a/ansi+arrows
 #usr/share/terminfo/a/ansi+cpr
 #usr/share/terminfo/a/ansi+csr
@@ -1541,6 +1571,9 @@  usr/share/terminfo/c/cons25
 #usr/share/terminfo/c/contel301
 #usr/share/terminfo/c/contel320
 #usr/share/terminfo/c/contel321
+#usr/share/terminfo/c/contour
+#usr/share/terminfo/c/contour-direct
+#usr/share/terminfo/c/contour-latest
 #usr/share/terminfo/c/cops
 #usr/share/terminfo/c/cops-10
 #usr/share/terminfo/c/cops10
@@ -2256,6 +2289,7 @@  usr/share/terminfo/k/konsole-256color
 #usr/share/terminfo/l/lft-pc850
 usr/share/terminfo/l/linux
 #usr/share/terminfo/l/linux+decid
+#usr/share/terminfo/l/linux+kbs
 #usr/share/terminfo/l/linux+sfkeys
 #usr/share/terminfo/l/linux-16color
 #usr/share/terminfo/l/linux-basic
@@ -2362,6 +2396,7 @@  usr/share/terminfo/m/mlterm
 #usr/share/terminfo/m/morphos
 #usr/share/terminfo/m/mosh
 #usr/share/terminfo/m/mosh-256color
+#usr/share/terminfo/m/mostlike
 #usr/share/terminfo/m/mouse-sun
 usr/share/terminfo/m/mrxvt
 #usr/share/terminfo/m/mrxvt-256color
@@ -2369,6 +2404,7 @@  usr/share/terminfo/m/mrxvt
 #usr/share/terminfo/m/ms-vt-utf8
 #usr/share/terminfo/m/ms-vt100
 #usr/share/terminfo/m/ms-vt100+
+#usr/share/terminfo/m/ms-vt100-16color
 #usr/share/terminfo/m/ms-vt100-color
 #usr/share/terminfo/m/msk227
 #usr/share/terminfo/m/msk22714
@@ -2596,6 +2632,7 @@  usr/share/terminfo/n/nsterm
 #usr/share/terminfo/o/oldibmpc3
 #usr/share/terminfo/o/oldpc3
 #usr/share/terminfo/o/oldsun
+#usr/share/terminfo/o/oldxterm+sm+1006
 #usr/share/terminfo/o/omron
 #usr/share/terminfo/o/opennt
 #usr/share/terminfo/o/opennt-100
@@ -2758,6 +2795,7 @@  usr/share/terminfo/p/pccon
 #usr/share/terminfo/p/pt505-24
 #usr/share/terminfo/p/pty
 usr/share/terminfo/p/putty
+#usr/share/terminfo/p/putty+cursor
 usr/share/terminfo/p/putty+fnkeys
 usr/share/terminfo/p/putty+fnkeys+esc
 usr/share/terminfo/p/putty+fnkeys+linux
@@ -2833,6 +2871,10 @@  usr/share/terminfo/p/putty-vt100
 #usr/share/terminfo/r/regent40
 #usr/share/terminfo/r/regent40+
 #usr/share/terminfo/r/regent60
+#usr/share/terminfo/r/report+da2
+#usr/share/terminfo/r/report+version
+#usr/share/terminfo/r/rio
+#usr/share/terminfo/r/rio-direct
 #usr/share/terminfo/r/rt6221
 #usr/share/terminfo/r/rt6221-w
 #usr/share/terminfo/r/rtpc
@@ -3319,6 +3361,8 @@  usr/share/terminfo/v/vt100
 #usr/share/terminfo/v/vt100+enq
 #usr/share/terminfo/v/vt100+fnkeys
 #usr/share/terminfo/v/vt100+keypad
+#usr/share/terminfo/v/vt100+noapp
+#usr/share/terminfo/v/vt100+noapp+pc
 #usr/share/terminfo/v/vt100+pfkeys
 #usr/share/terminfo/v/vt100-am
 #usr/share/terminfo/v/vt100-bm
@@ -3392,6 +3436,7 @@  usr/share/terminfo/v/vt220
 #usr/share/terminfo/v/vt510pc
 #usr/share/terminfo/v/vt510pcdos
 usr/share/terminfo/v/vt52
+#usr/share/terminfo/v/vt52+arrows
 #usr/share/terminfo/v/vt52+keypad
 #usr/share/terminfo/v/vt52-basic
 #usr/share/terminfo/v/vt520
@@ -3413,6 +3458,8 @@  usr/share/terminfo/v/vte-256color
 #usr/share/terminfo/v/vv100
 usr/share/terminfo/v/vwmterm
 #usr/share/terminfo/w
+#usr/share/terminfo/w/wezterm
+#usr/share/terminfo/w/winconsole
 #usr/share/terminfo/w/wren
 #usr/share/terminfo/w/wrenw
 #usr/share/terminfo/w/wsiris
@@ -3732,6 +3779,8 @@  usr/share/terminfo/x/xterm
 #usr/share/terminfo/x/xterm+alt1049
 #usr/share/terminfo/x/xterm+alt47
 #usr/share/terminfo/x/xterm+app
+#usr/share/terminfo/x/xterm+app+pc
+#usr/share/terminfo/x/xterm+decedit
 #usr/share/terminfo/x/xterm+direct
 #usr/share/terminfo/x/xterm+direct16
 #usr/share/terminfo/x/xterm+direct2
diff --git a/lfs/ncurses b/lfs/ncurses
index bc9bcdf42..b6e331192 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 6.4
+VER        = 6.5
 
 THISAPP    = ncurses-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,8 @@  EXTRA_CONFIG += \
 	--without-normal \
 	--enable-pc-files \
 	--disable-nls \
-	--mandir=/usr/share/man
+	--mandir=/usr/share/man \
+	--with-pkg-config-libdir=/usr/lib/pkgconfig
 
 ###############################################################################
 # Top-level Rules
@@ -58,7 +59,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3
+$(DL_FILE)_BLAKE2 = d0a05c218b5f320ba9abe2f322787baef1d15d764e503c81d49772b54b2927d28ecbeb500c8e514996226b41f69445b4de44ff423cec25b61847307fe61682ec
 
 install : $(TARGET)