Remove remaining mentions of curses

.builds/alpine.yml

@@ -3,7 +3,6 @@ packages:
   - cargo
   - clang17-libclang
   - cmake
-  - ncurses-dev
   - ninja
   - pcre2-dev
   - py3-pexpect

.builds/freebsd.yml

@@ -5,7 +5,7 @@ packages:
   - gettext
   - gmake
   - llvm
-  - ncurses
+  - terminfo-db
   - ninja
   - pcre2
   - py39-pexpect

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: dtolnay/rust-toolchain@1.67
     - name: Install deps
       run: |
-        sudo apt install gettext libncurses5-dev libpcre2-dev python3-pip tmux
+        sudo apt install gettext libpcre2-dev python3-pip tmux
         sudo pip3 install pexpect
         # Generate a locale that uses a comma as decimal separator.
         sudo locale-gen fr_FR.UTF-8
@@ -49,7 +49,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt update
-        sudo apt install gettext lib32ncurses5-dev python3-pip g++-multilib tmux
+        sudo apt install gettext python3-pip g++-multilib tmux
         sudo pip3 install pexpect
     - name: cmake
       env:
@@ -87,7 +87,7 @@ jobs:
         components: rust-src
     - name: Install deps
       run: |
-        sudo apt install gettext libncurses5-dev libpcre2-dev python3-pip tmux
+        sudo apt install gettext libpcre2-dev python3-pip tmux
         sudo pip3 install pexpect
     - name: cmake
       env:
@@ -131,7 +131,7 @@ jobs:
   #   - uses: dtolnay/rust-toolchain@1.67
   #   - name: Install deps
   #     run: |
-  #       sudo apt install gettext libncurses5-dev libpcre2-dev python3-pip tmux
+  #       sudo apt install gettext libpcre2-dev python3-pip tmux
   #       sudo pip3 install pexpect
   #   - name: cmake
   #     env:

.github/workflows/rust_checks.yml

@@ -23,7 +23,7 @@ jobs:
     - uses: dtolnay/rust-toolchain@stable
     - name: Install deps
       run: |
-        sudo apt install gettext libncurses5-dev libpcre2-dev python3-pip tmux
+        sudo apt install gettext libpcre2-dev python3-pip tmux
         sudo pip3 install pexpect
     - name: cmake
       run: |

CONTRIBUTING.rst

@@ -29,7 +29,6 @@ For that, you'll require:
 -  Rust (version 1.67 or later) - when in doubt, try rustup
 -  a C++11 compiler (g++ 4.8 or later, or clang 3.3 or later)
 -  CMake (version 3.5 or later)
--  a curses implementation such as ncurses (headers and libraries)
 -  PCRE2 (headers and libraries) - optional, this will be downloaded if missing
 -  gettext (headers and libraries) - optional, for translation support
 -  Sphinx - optional, to build the documentation

Dockerfile

@@ -3,7 +3,7 @@ FROM centos:latest
 # Build dependency
 RUN yum update -y &&\
   yum install -y epel-release &&\
-  yum install -y clang cmake3 gcc-c++ make ncurses-devel &&\
+  yum install -y clang cmake3 gcc-c++ make &&\
   yum clean all
 
 # Test dependency

README.rst

@@ -88,7 +88,8 @@ Dependencies
 
 Running fish requires:
 
--  curses or ncurses (preinstalled on most \*nix systems)
+-  A terminfo database, typically from curses or ncurses (preinstalled on most \*nix systems) - this needs to be the directory tree format, not the "hashed" database.
+   If this is unavailable, fish uses an included xterm-256color definition.
 -  some common \*nix system utilities (currently ``mktemp``), in
    addition to the basic POSIX utilities (``cat``, ``cut``, ``dirname``,
    ``file``, ``ls``, ``mkdir``, ``mkfifo``, ``rm``, ``sort``, ``tee``, ``tr``,
@@ -124,7 +125,6 @@ Compiling fish from a tarball requires:
 
 -  a C++11 compiler (g++ 4.8 or later, or clang 3.3 or later)
 -  CMake (version 3.5 or later)
--  a curses implementation such as ncurses (headers and libraries)
 -  PCRE2 (headers and libraries) - optional, this will be downloaded if missing
 -  gettext (headers and libraries) - optional, for translation support
 
@@ -179,20 +179,13 @@ Note that fish does *not* support static linking and will attempt to error out i
 Help, it didn’t build!
 ~~~~~~~~~~~~~~~~~~~~~~
 
-If fish reports that it could not find curses, try installing a curses
+On Debian or Ubuntu you want these packages:
-development package and build again.
-
-On Debian or Ubuntu you want:
 
 ::
 
-   sudo apt install build-essential cmake ncurses-dev libncurses5-dev libpcre2-dev gettext
+   sudo apt install build-essential cmake libpcre2-dev gettext
 
-On RedHat, CentOS, or Amazon EC2:
+On RedHat, CentOS, or Amazon EC2 everything should be preinstalled.
-
-::
-
-   sudo yum install ncurses-devel
 
 Contributing Changes to the Code
 --------------------------------

build_tools/iwyu.osx.imp

@@ -118,7 +118,6 @@
     { symbol: ["__uint32_t", "private", "<cstdint>", "public"] },
     { symbol: ["uint32_t", "private", "<cstdint>", "public"] },
     { symbol: ["intptr_t", "private", "<cstdint>", "public"] },
-    { symbol: ["tparm", "private", "<ncurses.h>", "public"] },
     { symbol: ["select", "private", "<sys/select.h>", "public"] },
     { symbol: ["_LIBCPP_VERSION", "private", "<cstddef>", "public"] },
     { symbol: ["_LIBCPP_VERSION", "private", "<unistd.h>", "public"] },

build_tools/lsan_suppressions.txt

@@ -1,7 +1,3 @@
 # LSAN can detect leaks tracing back to __asan::AsanThread::ThreadStart (probably caused by our
 # threads not exiting before their TLS dtors are called). Just ignore it.
 leak:AsanThread
-
-# ncurses leaks allocations freely as it assumes it will be running throughout. Ignore these.
-leak:tparm
-leak:_nc_doalloc

cmake/Rust.cmake

@@ -31,7 +31,6 @@ endif()
 
 # CMAKE_BINARY_DIR can include symlinks, since we want to compare this to the dir fish is executed in we need to canonicalize it.
 file(REAL_PATH "${CMAKE_BINARY_DIR}" fish_binary_dir)
-string(JOIN "," CURSES_LIBRARY_LIST ${CURSES_LIBRARY} ${CURSES_EXTRA_LIBRARY})
 
 if(FISH_CRATE_FEATURES)
     set(FEATURES_ARG ${FISH_CRATE_FEATURES})
@@ -54,7 +53,6 @@ set(VARS_FOR_CARGO
     "SYSCONFDIR=${CMAKE_INSTALL_FULL_SYSCONFDIR}"
     "BINDIR=${CMAKE_INSTALL_FULL_BINDIR}"
     "LOCALEDIR=${CMAKE_INSTALL_FULL_LOCALEDIR}"
-    "CURSES_LIBRARY_LIST=${CURSES_LIBRARY_LIST}"
     "CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}"
     "CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}"
     "${FISH_PCRE2_BUILDFLAG}"

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: ridiculous_fish <corydoras@ridiculousfish.com>
 Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
 # Debhelper should be bumped to >= 10 once Ubuntu Xenial is no longer supported
-Build-Depends: debhelper (>= 9.20160115), libncurses5-dev, cmake (>= 3.5.0), gettext, libpcre2-dev,
+Build-Depends: debhelper (>= 9.20160115), cmake (>= 3.5.0), gettext, libpcre2-dev,
 # Test dependencies
  locales-all, python3, rustc (>= 1.67) | rustc-mozilla (>= 1.67), cargo
 Standards-Version: 4.1.5

docker/alpine.Dockerfile

@@ -12,7 +12,6 @@ RUN apk add --no-cache \
   git \
   libintl \
   musl-dev \
-  ncurses-dev \
   ninja \
   pcre2-dev \
   python3 \

docker/bionic-tsan-clang.Dockerfile

@@ -11,7 +11,6 @@ RUN apt-get update \
     clang-9 \
     gettext \
     git \
-    libncurses5-dev \
     libpcre2-dev \
     locales \
     ninja-build \

docker/bionic-tsan.Dockerfile

@@ -11,7 +11,6 @@ RUN apt-get update \
     clang-9 \
     gettext \
     git \
-    libncurses5-dev \
     libpcre2-dev \
     locales \
     ninja-build \

docker/bionic.Dockerfile

@@ -11,7 +11,6 @@ RUN apt-get update \
     clang-9 \
     gettext \
     git \
-    libncurses5-dev \
     libpcre2-dev \
     locales \
     ninja-build \

docker/centos7.Dockerfile

@@ -7,7 +7,6 @@ RUN yum install --assumeyes epel-release https://repo.ius.io/ius-release-el7.rpm
     cmake3 \
     gcc-c++ \
     git236 \
-    ncurses-devel \
     ninja-build \
     python3 \
     openssl \

docker/centos8.Dockerfile

@@ -17,7 +17,6 @@ RUN dnf -y install dnf-plugins-core \
     diffutils \
     gcc-c++ \
     git \
-    ncurses-devel \
     ninja-build \
     python3 \
     openssl \

docker/fedora.Dockerfile

@@ -6,7 +6,6 @@ RUN dnf install --assumeyes \
       diffutils \
       gcc-c++ \
       git-core \
-      ncurses-devel \
       ninja-build \
       pcre2-devel \
       python3 \

docker/focal-32bit.Dockerfile

@@ -13,7 +13,6 @@ RUN apt-get update \
     g++-multilib \
     gettext \
     git \
-    lib32ncurses5-dev \
     locales \
     ninja-build \
     pkg-config \

docker/focal-arm64.Dockerfile

@@ -12,7 +12,6 @@ RUN apt-get update \
     clang-9 \
     gettext \
     git \
-    libncurses5-dev \
     libpcre2-dev \
     locales \
     ninja-build \

docker/jammy-armv7-32bit.Dockerfile

@@ -14,7 +14,6 @@ RUN apt-get update \
     g++ \
     gettext \
     git \
-    libncurses5-dev \
     libpcre2-dev \
     locales \
     ninja-build \

docker/jammy-asan-clang.Dockerfile

@@ -11,7 +11,6 @@ RUN apt-get update \
     clang \
     gettext \
     git \
-    libncurses5-dev \
     libpcre2-dev \
     locales \
     ninja-build \

docker/opensuse-tumbleweed.docker

@@ -10,7 +10,6 @@ RUN zypper --non-interactive install \
   diffutils \
   gcc-c++ \
   git-core \
-  ncurses-devel \
   ninja \
   pcre2-devel \
   python311 \

docker/xenial.Dockerfile

@@ -10,7 +10,6 @@ RUN apt-get update \
     cmake \
     gettext \
     git \
-    libncurses5-dev \
     libpcre2-dev \
     locales \
     ninja-build \

fish.spec.in

@@ -9,7 +9,7 @@ Group:                  System/Shells
 URL:                    https://fishshell.com/
 
 Source0:                %{name}_@VERSION@.orig.tar.xz
-BuildRequires:          cargo ncurses-devel gettext gcc-c++ xz pcre2-devel
+BuildRequires:          cargo gettext gcc-c++ xz pcre2-devel
 BuildRequires:          rust >= 1.67
 
 %if 0%{?rhel} && 0%{?rhel} < 8