Skip to content

ncurses/readline/bash: Update and cleanup #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2025
Merged

ncurses/readline/bash: Update and cleanup #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4e9388
ncurses: Update to v6.5-20250301
ReillyBrogan Aug 20, 2024
364b8e4
readline: Cleanup
ReillyBrogan Aug 20, 2024
b328cde
bash: Rebuild and cleanup
ReillyBrogan Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified b/bash/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
11 changes: 5 additions & 6 deletions b/bash/manifest.x86_64.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"packages": {
"bash": {
"build-depends": [
"bison",
"binary(bison)",
"pkgconfig(ncursesw)",
"pkgconfig(readline)"
],
Expand All @@ -17,8 +17,6 @@
"/usr/bin/bash",
"/usr/bin/bashbug",
"/usr/bin/sh",
"/usr/lib/bash/Makefile.inc",
"/usr/lib/bash/Makefile.sample",
"/usr/lib/bash/accept",
"/usr/lib/bash/basename",
"/usr/lib/bash/csv",
Expand Down Expand Up @@ -112,7 +110,8 @@
"/usr/share/locale/zh_CN/LC_MESSAGES/bash.mo",
"/usr/share/locale/zh_TW/LC_MESSAGES/bash.mo",
"/usr/share/man/man1/bash.1",
"/usr/share/man/man1/bashbug.1"
"/usr/share/man/man1/bashbug.1",
"/usr/share/man/man1/sh.1"
],
"name": "bash",
"provides": [
Expand All @@ -123,7 +122,7 @@
},
"bash-devel": {
"build-depends": [
"bison",
"binary(bison)",
"pkgconfig(ncursesw)",
"pkgconfig(readline)"
],
Expand Down Expand Up @@ -199,6 +198,6 @@
}
},
"source-name": "bash",
"source-release": "20",
"source-release": "21",
"source-version": "5.2.37"
}
16 changes: 12 additions & 4 deletions b/bash/stone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
name : bash
version : 5.2.37
release : 20
release : 21
homepage : http://www.gnu.org/software/bash/bash.html
upstreams :
- https://ftp.gnu.org/gnu/bash/bash-5.2.37.tar.gz : 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff
Expand All @@ -20,19 +20,22 @@ description : |
license :
- GPL-3.0-or-later
builddeps :
- binary(bison)
- pkgconfig(ncursesw)
- pkgconfig(readline)
- bison
setup : |
%patch %(pkgdir)/stateless.patch

export CFLAGS="$CFLAGS -DRECYCLES_PIDS -DSYSLOG_HISTORY -DSYSLOG_SHOPT=0"

# often hangs
rm tests/run-jobs

%configure \
--without-bash-malloc \
--with-installed-readline \
--with-ncurses \
--with-curses \
--enable-history \
--enable-readline \
--enable-nls
build : |
Expand All @@ -44,7 +47,12 @@ install : |
%install_file %(pkgdir)/serpent-stateless-shell-conf.sh %(installroot)%(vendordir)%(sysconfdir)/serpent-stateless-shell-conf.sh
%install_file %(pkgdir)/40-prompt.sh %(installroot)%(vendordir)%(sysconfdir)/profile.d/40-prompt.sh
%install_file %(pkgdir)/41-alias.sh %(installroot)%(vendordir)%(sysconfdir)/profile.d/41-alias.sh
ln -svf bash "%(installroot)/usr/bin/sh"

ln -svf bash "%(installroot)%(bindir)/sh"
ln -sv bash.1 "%(installroot)%(mandir)/man1/sh.1"

# These are useless
rm -rfv %(installroot)%(libdir)/bash/Makefile.*
check : |
%make check
workload : |
Expand Down
Binary file modified n/ncurses/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
55 changes: 43 additions & 12 deletions n/ncurses/manifest.x86_64.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"/usr/bin/clear",
"/usr/bin/infocmp",
"/usr/bin/infotocap",
"/usr/bin/ncursesw6-config",
"/usr/bin/reset",
"/usr/bin/tabs",
"/usr/bin/tic",
Expand All @@ -31,12 +30,13 @@
"/usr/lib/libncursesw.so.6.5",
"/usr/lib/libpanelw.so.6",
"/usr/lib/libpanelw.so.6.5",
"/usr/lib/libtic.so.6",
"/usr/lib/libtinfo.so.6",
"/usr/lib/terminfo",
"/usr/share/man/man1/captoinfo.1m",
"/usr/share/man/man1/clear.1",
"/usr/share/man/man1/infocmp.1m",
"/usr/share/man/man1/infotocap.1m",
"/usr/share/man/man1/ncursesw6-config.1",
"/usr/share/man/man1/reset.1",
"/usr/share/man/man1/tabs.1",
"/usr/share/man/man1/tic.1m",
Expand Down Expand Up @@ -992,6 +992,7 @@
"/usr/share/terminfo/g/gator-52",
"/usr/share/terminfo/g/gator-52t",
"/usr/share/terminfo/g/gator-t",
"/usr/share/terminfo/g/ghostty",
"/usr/share/terminfo/g/gigi",
"/usr/share/terminfo/g/glasstty",
"/usr/share/terminfo/g/gnome",
Expand Down Expand Up @@ -1323,6 +1324,7 @@
"/usr/share/terminfo/l/linux",
"/usr/share/terminfo/l/linux+decid",
"/usr/share/terminfo/l/linux+kbs",
"/usr/share/terminfo/l/linux+lockeys",
"/usr/share/terminfo/l/linux+sfkeys",
"/usr/share/terminfo/l/linux-16color",
"/usr/share/terminfo/l/linux-basic",
Expand Down Expand Up @@ -1432,7 +1434,9 @@
"/usr/share/terminfo/m/mouse-sun",
"/usr/share/terminfo/m/mrxvt",
"/usr/share/terminfo/m/mrxvt-256color",
"/usr/share/terminfo/m/ms+terminal",
"/usr/share/terminfo/m/ms-terminal",
"/usr/share/terminfo/m/ms-terminal-direct",
"/usr/share/terminfo/m/ms-vt-utf8",
"/usr/share/terminfo/m/ms-vt100",
"/usr/share/terminfo/m/ms-vt100+",
Expand Down Expand Up @@ -2000,6 +2004,7 @@
"/usr/share/terminfo/s/st-0.6",
"/usr/share/terminfo/s/st-0.7",
"/usr/share/terminfo/s/st-0.8",
"/usr/share/terminfo/s/st-0.8.5",
"/usr/share/terminfo/s/st-16color",
"/usr/share/terminfo/s/st-256color",
"/usr/share/terminfo/s/st-direct",
Expand Down Expand Up @@ -2424,6 +2429,8 @@
"/usr/share/terminfo/v/vt220+cvis8",
"/usr/share/terminfo/v/vt220+keypad",
"/usr/share/terminfo/v/vt220+pcedit",
"/usr/share/terminfo/v/vt220+sfkeys",
"/usr/share/terminfo/v/vt220+ufkeys",
"/usr/share/terminfo/v/vt220+vtedit",
"/usr/share/terminfo/v/vt220-8",
"/usr/share/terminfo/v/vt220-8bit",
Expand Down Expand Up @@ -2463,8 +2470,10 @@
"/usr/share/terminfo/v/vt52+keypad",
"/usr/share/terminfo/v/vt52-basic",
"/usr/share/terminfo/v/vt520",
"/usr/share/terminfo/v/vt520-w",
"/usr/share/terminfo/v/vt520ansi",
"/usr/share/terminfo/v/vt525",
"/usr/share/terminfo/v/vt525-w",
"/usr/share/terminfo/v/vt61",
"/usr/share/terminfo/v/vt61.5",
"/usr/share/terminfo/v/vte",
Expand Down Expand Up @@ -2826,6 +2835,8 @@
"/usr/share/terminfo/x/xterm+pcf0",
"/usr/share/terminfo/x/xterm+pcf2",
"/usr/share/terminfo/x/xterm+pcfkeys",
"/usr/share/terminfo/x/xterm+r5+fkeys",
"/usr/share/terminfo/x/xterm+r5+lockeys",
"/usr/share/terminfo/x/xterm+r6f2",
"/usr/share/terminfo/x/xterm+sl",
"/usr/share/terminfo/x/xterm+sl-alt",
Expand Down Expand Up @@ -2930,7 +2941,6 @@
"binary(clear)",
"binary(infocmp)",
"binary(infotocap)",
"binary(ncursesw6-config)",
"binary(reset)",
"binary(tabs)",
"binary(tic)",
Expand All @@ -2947,9 +2957,9 @@
"ncurses-32bit": {
"depends": [
"ncurses",
"soname(libc++.so.1(x86))",
"soname(libc.so.6(x86))",
"soname(libunwind.so.1(x86))"
"soname(libc++.so.1(386))",
"soname(libc.so.6(386))",
"soname(libunwind.so.1(386))"
],
"files": [
"/usr/lib32/libformw.so.6",
Expand All @@ -2961,7 +2971,9 @@
"/usr/lib32/libncursesw.so.6",
"/usr/lib32/libncursesw.so.6.5",
"/usr/lib32/libpanelw.so.6",
"/usr/lib32/libpanelw.so.6.5"
"/usr/lib32/libpanelw.so.6.5",
"/usr/lib32/libtic.so.6",
"/usr/lib32/libtinfo.so.6"
],
"name": "ncurses-32bit",
"provides": [
Expand Down Expand Up @@ -2993,6 +3005,8 @@
"/usr/lib32/libncursesw.so",
"/usr/lib32/libpanel.so",
"/usr/lib32/libpanelw.so",
"/usr/lib32/libtic.so",
"/usr/lib32/libtinfo.so",
"/usr/lib32/pkgconfig/form.pc",
"/usr/lib32/pkgconfig/formw.pc",
"/usr/lib32/pkgconfig/menu.pc",
Expand All @@ -3002,7 +3016,9 @@
"/usr/lib32/pkgconfig/ncurses.pc",
"/usr/lib32/pkgconfig/ncursesw.pc",
"/usr/lib32/pkgconfig/panel.pc",
"/usr/lib32/pkgconfig/panelw.pc"
"/usr/lib32/pkgconfig/panelw.pc",
"/usr/lib32/pkgconfig/tic.pc",
"/usr/lib32/pkgconfig/tinfo.pc"
],
"name": "ncurses-32bit-devel",
"provides": [
Expand All @@ -3015,14 +3031,17 @@
"pkgconfig32(ncurses++w)",
"pkgconfig32(ncursesw)",
"pkgconfig32(panel)",
"pkgconfig32(panelw)"
"pkgconfig32(panelw)",
"pkgconfig32(tic)",
"pkgconfig32(tinfo)"
]
},
"ncurses-devel": {
"depends": [
"ncurses"
],
"files": [
"/usr/bin/ncursesw6-config",
"/usr/include/curses.h",
"/usr/include/cursesapp.h",
"/usr/include/cursesf.h",
Expand Down Expand Up @@ -3051,6 +3070,8 @@
"/usr/lib/libncursesw.so",
"/usr/lib/libpanel.so",
"/usr/lib/libpanelw.so",
"/usr/lib/libtic.so",
"/usr/lib/libtinfo.so",
"/usr/lib/pkgconfig/form.pc",
"/usr/lib/pkgconfig/formw.pc",
"/usr/lib/pkgconfig/menu.pc",
Expand All @@ -3061,7 +3082,12 @@
"/usr/lib/pkgconfig/ncursesw.pc",
"/usr/lib/pkgconfig/panel.pc",
"/usr/lib/pkgconfig/panelw.pc",
"/usr/lib/pkgconfig/tic.pc",
"/usr/lib/pkgconfig/tinfo.pc",
"/usr/share/man/man1/ncursesw6-config.1",
"/usr/share/man/man3/A_COLOR.3x",
"/usr/share/man/man3/BC.3x",
"/usr/share/man/man3/CCHARW_MAX.3x",
"/usr/share/man/man3/COLORS.3x",
"/usr/share/man/man3/COLOR_BLACK.3x",
"/usr/share/man/man3/COLOR_BLUE.3x",
Expand All @@ -3078,6 +3104,7 @@
"/usr/share/man/man3/ESCDELAY.3x",
"/usr/share/man/man3/FALSE.3x",
"/usr/share/man/man3/LINES.3x",
"/usr/share/man/man3/MEVENT.3x",
"/usr/share/man/man3/NCURSES_SCREEN_CB.3x",
"/usr/share/man/man3/NCURSES_WINDOW_CB.3x",
"/usr/share/man/man3/OK.3x",
Expand Down Expand Up @@ -3516,6 +3543,7 @@
"/usr/share/man/man3/mitem_userptr.3x",
"/usr/share/man/man3/mitem_value.3x",
"/usr/share/man/man3/mitem_visible.3x",
"/usr/share/man/man3/mmask_t.3x",
"/usr/share/man/man3/mouse_trafo.3x",
"/usr/share/man/man3/mouseinterval.3x",
"/usr/share/man/man3/mouseinterval_sp.3x",
Expand Down Expand Up @@ -3977,6 +4005,7 @@
],
"name": "ncurses-devel",
"provides": [
"binary(ncursesw6-config)",
"pkgconfig(form)",
"pkgconfig(formw)",
"pkgconfig(menu)",
Expand All @@ -3986,11 +4015,13 @@
"pkgconfig(ncurses++w)",
"pkgconfig(ncursesw)",
"pkgconfig(panel)",
"pkgconfig(panelw)"
"pkgconfig(panelw)",
"pkgconfig(tic)",
"pkgconfig(tinfo)"
]
}
},
"source-name": "ncurses",
"source-release": "10",
"source-version": "6.5"
"source-release": "11",
"source-version": "6.5-20250301"
}
35 changes: 28 additions & 7 deletions n/ncurses/stone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
# SPDX-License-Identifier: MPL-2.0
#
name : ncurses
version : 6.5
release : 10
version : 6.5-20250301
release : 11
homepage : https://invisible-island.net/ncurses/ncurses.html
upstreams :
- https://ftp.gnu.org/gnu/ncurses/ncurses-6.5.tar.gz : 136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6
- https://invisible-island.net/archives/ncurses/current/ncurses-6.5-20250301.tgz : b19934a5ca9e4425c4ad82d7335cec3ab03526d99c9d2cb5ea1c4f9269b31b1c
summary : Console display library
description : |
The ncurses (new curses) library is a free software emulation of curses in System V Release 4.0 (SVr4), and more. It uses terminfo format, supports pads and color and multiple highlights and forms characters and function-key mapping, and has all the other SVr4-curses enhancements over BSD curses. SVr4 curses became the basis of X/Open Curses.
Expand All @@ -19,28 +19,49 @@ setup : |
%patch %(pkgdir)/pkgconfig.patch
unset CPP # Breaks stdin on this build.

%configure --disable-rpath \
%configure \
--disable-rpath \
--disable-root-access \
--disable-root-environ \
--disable-setuid-environ \
--disable-stripping \
--enable-colorfgbg \
--enable-db-install \
--enable-largefile \
--enable-pc-files \
--enable-widec \
--with-cxx-binding \
--with-cxx-shared \
--with-pkg-config-libdir=%(libdir)/pkgconfig \
--with-shared \
--with-terminfo-dirs='/etc/terminfo:/usr/share/terminfo' \
--without-ada \
--without-debug \
--without-normal \
--enable-pc-files \
--disable-root-access \
--disable-setuid-environ \
PKG_CONFIG_LIBDIR=%(libdir)/pkgconfig
build : |
%make
install : |
%make_install

# Additional symlink support
for component in form menu ncurses ncurses++ panel; do
ln -s "${component}w.pc" %(installroot)%(libdir)/pkgconfig/${component}.pc
echo "INPUT(-l${component}w)" > "%(installroot)%(libdir)/lib${component}.so"
done

# Needs to match ABI version
abi=6
# tic and tinfo are built in by default
for lib in tic tinfo; do
ln -sv libncursesw.so.${abi} %(installroot)/%(libdir)/lib${lib}.so.${abi}
ln -sv lib${lib}.so.${abi} %(installroot)/%(libdir)/lib${lib}.so
ln -sv ncursesw.pc %(installroot)/%(libdir)/pkgconfig/${lib}.pc
done
tuning :
- lto: full
packages :
- "%(name)-devel":
paths:
- /usr/bin/ncursesw6-config
- /usr/share/man/man1/ncursesw6-config*
Binary file modified r/readline/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
Loading