Skip to content

Commit be7d040

Browse files
fornwallTomJo2000
authored andcommitted
bump(main/ncurses): 6.6.20260307
- Fixes #28372 - It was an underlying ncurses bug, fixed in 6.6-20260301: https://lists.gnu.org/archive/html/bug-ncurses/2026-03/msg00000.html - Reverts the "really" construction introduced temporarily in #28377
1 parent 8584ba5 commit be7d040

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

packages/ncurses/build.sh

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ TERMUX_PKG_MAINTAINER="@termux"
88
# is checked in termux_step_pre_configure(), so the build will fail on a mistake.
99
# Using this simplifies things (no need to avoid downloading and applying patches manually),
1010
# and uses github is a high available hosting.
11-
_SNAPSHOT_COMMIT=5f58399b2de47ed14bdfe3a0cb149293b27893d5
11+
_SNAPSHOT_COMMIT=591c9c5ddb80e44a110808f0606eb93f9152a28e
1212

1313
# The subshell leaving the value in the outer scope unchanged is the point here.
1414
# shellcheck disable=SC2031
15-
TERMUX_PKG_VERSION=(6.6.20260124+really6.5.20250830
15+
TERMUX_PKG_VERSION=(6.6.20260307
1616
9.31
1717
"$(. "$TERMUX_SCRIPTDIR/x11-packages/kitty/build.sh"; echo "$TERMUX_PKG_VERSION")"
1818
"$(. "$TERMUX_SCRIPTDIR/x11-packages/alacritty/build.sh"; echo "$TERMUX_PKG_VERSION")"
@@ -24,7 +24,7 @@ TERMUX_PKG_SRCURL=("https://github.com/ThomasDickey/ncurses-snapshots/archive/${
2424
"$(. "$TERMUX_SCRIPTDIR/x11-packages/alacritty/build.sh"; echo "$TERMUX_PKG_SRCURL")"
2525
"$(. "$TERMUX_SCRIPTDIR/x11-packages/foot/build.sh"; echo "$TERMUX_PKG_SRCURL")")
2626
# shellcheck disable=SC2031
27-
TERMUX_PKG_SHA256=(28cd102efe6a2610e830cc79cf270da6ff0427b2022900a9a36d2761522f9576
27+
TERMUX_PKG_SHA256=(998dacd8e24f55b25492ecd7bc59b8fdd55ac79a549bce27bf0e7b071aac9c21
2828
aaa13fcbc149fe0f3f391f933279580f74a96fd312d6ed06b8ff03c2d46672e8
2929
"$(. "$TERMUX_SCRIPTDIR/x11-packages/kitty/build.sh"; echo "$TERMUX_PKG_SHA256")"
3030
"$(. "$TERMUX_SCRIPTDIR/x11-packages/alacritty/build.sh"; echo "$TERMUX_PKG_SHA256")"
@@ -71,7 +71,6 @@ termux_step_pre_configure() {
7171
PATCH_VERSION="$(cut -f 3 VERSION)"
7272
ACTUAL_VERSION="${MAIN_VERSION}.${PATCH_VERSION}"
7373
EXPECTED_VERSION="${TERMUX_PKG_VERSION[0]}"
74-
EXPECTED_VERSION="${EXPECTED_VERSION#*really}"
7574
if [[ "${ACTUAL_VERSION}" != "${EXPECTED_VERSION}" ]]; then
7675
termux_error_exit "Version mismatch - expected ${EXPECTED_VERSION}, was ${ACTUAL_VERSION}. Check https://github.com/ThomasDickey/ncurses-snapshots/commit/${_SNAPSHOT_COMMIT}"
7776
fi
@@ -82,23 +81,20 @@ termux_step_pre_configure() {
8281
termux_step_post_make_install() {
8382
cd "$TERMUX_PREFIX/lib" || termux_error_exit "Prefix 'lib' directory does not exist."
8483

85-
local version="${TERMUX_PKG_VERSION[0]}"
86-
version="${version#*really}"
87-
8884
# Ncursesw/Ncurses compatibility symlinks.
8985
for lib in form menu ncurses panel; do
90-
ln -sfr "lib${lib}w.so.${version:0:3}" "lib${lib}.so.${version:0:3}"
91-
ln -sfr "lib${lib}w.so.${version:0:3}" "lib${lib}.so.${version:0:1}"
92-
ln -sfr "lib${lib}w.so.${version:0:3}" "lib${lib}.so"
86+
ln -sfr "lib${lib}w.so.${TERMUX_PKG_VERSION:0:3}" "lib${lib}.so.${TERMUX_PKG_VERSION:0:3}"
87+
ln -sfr "lib${lib}w.so.${TERMUX_PKG_VERSION:0:3}" "lib${lib}.so.${TERMUX_PKG_VERSION:0:1}"
88+
ln -sfr "lib${lib}w.so.${TERMUX_PKG_VERSION:0:3}" "lib${lib}.so"
9389
ln -sfr "lib${lib}w.a" "lib${lib}.a"
9490
(cd pkgconfig; ln -sf "${lib}w.pc" "$lib.pc") || termux_error_exit "Failed to install comatibility symlink for '${lib}'"
9591
done
9692

9793
# Legacy compatibility symlinks (libcurses, libtermcap, libtic, libtinfo).
9894
for lib in curses termcap tic tinfo; do
99-
ln -sfr "libncursesw.so.${version:0:3}" "lib${lib}.so.${version:0:3}"
100-
ln -sfr "libncursesw.so.${version:0:3}" "lib${lib}.so.${version:0:1}"
101-
ln -sfr "libncursesw.so.${version:0:3}" "lib${lib}.so"
95+
ln -sfr "libncursesw.so.${TERMUX_PKG_VERSION:0:3}" "lib${lib}.so.${TERMUX_PKG_VERSION:0:3}"
96+
ln -sfr "libncursesw.so.${TERMUX_PKG_VERSION:0:3}" "lib${lib}.so.${TERMUX_PKG_VERSION:0:1}"
97+
ln -sfr "libncursesw.so.${TERMUX_PKG_VERSION:0:3}" "lib${lib}.so"
10298
ln -sfr libncursesw.a "lib${lib}.a"
10399
(cd pkgconfig; ln -sfr ncursesw.pc "${lib}.pc") || termux_error_exit "Failed to install legacy comatibility symlink for '${lib}'"
104100
done

0 commit comments

Comments
 (0)