From 8cbcc0e307ccb41742f3a199e2a37a0c3e035dac Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 08 Jan 2023 12:44:06 +0100
Subject: [PATCH] fish: update to 3.6.0 and provide test results
---
components/shell/fish/patches/02-fix-reg.patch | 52 ++++++++++
components/shell/fish/manifests/sample-manifest.p5m | 70 ++++++++++++-
components/shell/fish/test/results-all.master | 27 +++++
components/shell/fish/pkg5 | 3
components/shell/fish/fish.p5m | 76 ++++++++++++--
components/shell/fish/patches/03-memset.patch | 16 +++
components/shell/fish/Makefile | 31 +++--
7 files changed, 238 insertions(+), 37 deletions(-)
diff --git a/components/shell/fish/Makefile b/components/shell/fish/Makefile
index 514daa4..5a32f9d 100644
--- a/components/shell/fish/Makefile
+++ b/components/shell/fish/Makefile
@@ -15,37 +15,44 @@
# Copyright 2022 Niklas Poslovski
#
-BUILD_BITS= 64
-BUILD_STYLE= cmake
+BUILD_BITS= 64
+BUILD_STYLE= cmake
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= fish
-COMPONENT_VERSION= 3.5.1
+COMPONENT_VERSION= 3.6.0
+COMPONENT_SUMMARY= Fish is a smart and user-friendly command line shell
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= https://fishshell.com
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
-COMPONENT_ARCHIVE_HASH= sha256:a6d45b3dc5a45dd31772e7f8dfdfecabc063986e8f67d60bd7ca60cc81db6928
+COMPONENT_ARCHIVE_HASH= sha256:97044d57773ee7ca15634f693d917ed1c3dc0fa7fde1017f1626d60b83ea6181
COMPONENT_ARCHIVE_URL= https://github.com/fish-shell/fish-shell/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
-COMPONENT_LICENSE= GPLv2
-COMPONENT_SUMMARY= Fish is a smart and user-friendly command line shell
COMPONENT_FMRI= shell/fish
COMPONENT_CLASSIFICATION= System/Shells
+COMPONENT_LICENSE= GPLv2
include $(WS_MAKE_RULES)/common.mk
-PATH=$(PATH.gnu)
+PATH= $(PATH.gnu)
CMAKE_OPTIONS += -DCMAKE_INSTALL_SYSCONFDIR="/etc"
-CMAKE_OPTIONS += -DPCRE2_INCLUDE_DIR=/usr/include/pcre
+CMAKE_OPTIONS += -DSYS_PCRE2_INCLUDE_DIR=/usr/include/pcre
+CMAKE_OPTIONS += -DFISH_USE_SYSTEM_PCRE2=ON
+CMAKE_OPTIONS += -DWITH_GETTEXT=ON
COMPONENT_TEST_CMD= gmake
COMPONENT_TEST_TARGETS= test
+# Just keep the failing test results, even it doesn't make the results reproducable:
+COMPONENT_TEST_TRANSFORMS += \
+ '-e "s/[0-9]*\.[0-9]* sec//" ' \
+ '-e "s/[0-9]*\/[0-9]*//" ' \
+ '-n' \
+ '-e "/Failed/p"'
-REQUIRED_PACKAGES += developer/documentation-tool/doxygen
-REQUIRED_PACKAGES += library/pcre2
-# test dependency
-REQUIRED_PACKAGES += library/python/pexpect-39
+# Manually added dependencies (for tests)
+PYTHON_REQUIRED_PACKAGES += library/python/pexpect
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
+REQUIRED_PACKAGES += library/pcre2
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
diff --git a/components/shell/fish/fish.p5m b/components/shell/fish/fish.p5m
index 3b6fc73..f546b9b 100644
--- a/components/shell/fish/fish.p5m
+++ b/components/shell/fish/fish.p5m
@@ -10,11 +10,7 @@
#
#
-# Copyright 2017 Longrin Wischnewski
-# Copyright 2018 Michal Nowak
-# Copyright 2020 Andreas Wacknitz
-# Copyright 2021 Nona Hansel
-# Copyright 2022 Niklas Poslovski
+# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -34,7 +30,6 @@
file path=usr/share/applications/fish.desktop
file path=usr/share/doc/fish/.buildinfo
file path=usr/share/doc/fish/CHANGELOG.rst
-file path=usr/share/doc/fish/_static/_sphinx_javascript_frameworks_compat.js
file path=usr/share/doc/fish/_static/basic.css
file path=usr/share/doc/fish/_static/classic.css
file path=usr/share/doc/fish/_static/default.css
@@ -42,8 +37,6 @@
file path=usr/share/doc/fish/_static/documentation_options.js
file path=usr/share/doc/fish/_static/file.png
file path=usr/share/doc/fish/_static/fish.png
-file path=usr/share/doc/fish/_static/jquery-3.6.0.js
-file path=usr/share/doc/fish/_static/jquery.js
file path=usr/share/doc/fish/_static/language_data.js
file path=usr/share/doc/fish/_static/minus.png
file path=usr/share/doc/fish/_static/plus.png
@@ -51,8 +44,7 @@
file path=usr/share/doc/fish/_static/pygments.css
file path=usr/share/doc/fish/_static/searchtools.js
file path=usr/share/doc/fish/_static/sidebar.js
-file path=usr/share/doc/fish/_static/underscore-1.13.1.js
-file path=usr/share/doc/fish/_static/underscore.js
+file path=usr/share/doc/fish/_static/sphinx_highlight.js
file path=usr/share/doc/fish/cmds/_.html
file path=usr/share/doc/fish/cmds/abbr.html
file path=usr/share/doc/fish/cmds/alias.html
@@ -89,8 +81,11 @@
file path=usr/share/doc/fish/cmds/fish.html
file path=usr/share/doc/fish/cmds/fish_add_path.html
file path=usr/share/doc/fish/cmds/fish_breakpoint_prompt.html
+file path=usr/share/doc/fish/cmds/fish_clipboard_copy.html
+file path=usr/share/doc/fish/cmds/fish_clipboard_paste.html
file path=usr/share/doc/fish/cmds/fish_command_not_found.html
file path=usr/share/doc/fish/cmds/fish_config.html
+file path=usr/share/doc/fish/cmds/fish_delta.html
file path=usr/share/doc/fish/cmds/fish_git_prompt.html
file path=usr/share/doc/fish/cmds/fish_greeting.html
file path=usr/share/doc/fish/cmds/fish_hg_prompt.html
@@ -149,6 +144,7 @@
file path=usr/share/doc/fish/cmds/string-pad.html
file path=usr/share/doc/fish/cmds/string-repeat.html
file path=usr/share/doc/fish/cmds/string-replace.html
+file path=usr/share/doc/fish/cmds/string-shorten.html
file path=usr/share/doc/fish/cmds/string-split.html
file path=usr/share/doc/fish/cmds/string-split0.html
file path=usr/share/doc/fish/cmds/string-sub.html
@@ -251,9 +247,11 @@
file path=usr/share/fish/completions/archlinux-java.fish
file path=usr/share/fish/completions/arepack.fish
file path=usr/share/fish/completions/argparse.fish
+file path=usr/share/fish/completions/ark.fish
file path=usr/share/fish/completions/arp.fish
file path=usr/share/fish/completions/as.fish
file path=usr/share/fish/completions/asciidoctor.fish
+file path=usr/share/fish/completions/asciinema.fish
file path=usr/share/fish/completions/asd.fish
file path=usr/share/fish/completions/asp.fish
file path=usr/share/fish/completions/at.fish
@@ -329,6 +327,8 @@
file path=usr/share/fish/completions/clean.fish
file path=usr/share/fish/completions/cleanmgr.fish
file path=usr/share/fish/completions/climate.fish
+file path=usr/share/fish/completions/clj.fish
+file path=usr/share/fish/completions/clojure.fish
file path=usr/share/fish/completions/cmark.fish
file path=usr/share/fish/completions/cmd.fish
file path=usr/share/fish/completions/cmdkey.fish
@@ -349,6 +349,7 @@
file path=usr/share/fish/completions/configure.fish
file path=usr/share/fish/completions/conjure.fish
file path=usr/share/fish/completions/connmanctl.fish
+file path=usr/share/fish/completions/contains.fish
file path=usr/share/fish/completions/continue.fish
file path=usr/share/fish/completions/convert.fish
file path=usr/share/fish/completions/coredumpctl.fish
@@ -360,6 +361,7 @@
file path=usr/share/fish/completions/createdb.fish
file path=usr/share/fish/completions/cryptsetup.fish
file path=usr/share/fish/completions/csc.fish
+file path=usr/share/fish/completions/csh.fish
file path=usr/share/fish/completions/csharp.fish
file path=usr/share/fish/completions/csi.fish
file path=usr/share/fish/completions/cupsaccept.fish
@@ -385,8 +387,11 @@
file path=usr/share/fish/completions/dhcpcd.fish
file path=usr/share/fish/completions/diff.fish
file path=usr/share/fish/completions/dig.fish
+file path=usr/share/fish/completions/direnv.fish
file path=usr/share/fish/completions/diskutil.fish
+file path=usr/share/fish/completions/disown.fish
file path=usr/share/fish/completions/display.fish
+file path=usr/share/fish/completions/dive.fish
file path=usr/share/fish/completions/djview.fish
file path=usr/share/fish/completions/djview4.fish
file path=usr/share/fish/completions/djxl.fish
@@ -396,6 +401,7 @@
file path=usr/share/fish/completions/dnf.fish
file path=usr/share/fish/completions/doas.fish
file path=usr/share/fish/completions/docker.fish
+file path=usr/share/fish/completions/dolphin.fish
file path=usr/share/fish/completions/dotnet.fish
file path=usr/share/fish/completions/downgrade.fish
file path=usr/share/fish/completions/dpkg-reconfigure.fish
@@ -403,6 +409,7 @@
file path=usr/share/fish/completions/dropdb.fish
file path=usr/share/fish/completions/dscacheutil.fish
file path=usr/share/fish/completions/du.fish
+file path=usr/share/fish/completions/dua.fish
file path=usr/share/fish/completions/dumpcap.fish
file path=usr/share/fish/completions/duply.fish
file path=usr/share/fish/completions/dvipdf.fish
@@ -410,6 +417,8 @@
file path=usr/share/fish/completions/ebuild.fish
file path=usr/share/fish/completions/echo.fish
file path=usr/share/fish/completions/efibootmgr.fish
+file path=usr/share/fish/completions/efivar.fish
+file path=usr/share/fish/completions/eg.fish
file path=usr/share/fish/completions/egrep.fish
file path=usr/share/fish/completions/eix-sync.fish
file path=usr/share/fish/completions/eix.fish
@@ -419,12 +428,14 @@
file path=usr/share/fish/completions/emacs.fish
file path=usr/share/fish/completions/emaint.fish
file path=usr/share/fish/completions/emerge.fish
+file path=usr/share/fish/completions/emit.fish
file path=usr/share/fish/completions/encfs.fish
file path=usr/share/fish/completions/entr.fish
file path=usr/share/fish/completions/env.fish
file path=usr/share/fish/completions/eopkg.fish
file path=usr/share/fish/completions/epkginfo.fish
file path=usr/share/fish/completions/equery.fish
+file path=usr/share/fish/completions/es.fish
file path=usr/share/fish/completions/eselect.fish
file path=usr/share/fish/completions/etex.fish
file path=usr/share/fish/completions/ethtool.fish
@@ -449,10 +460,13 @@
file path=usr/share/fish/completions/file.fish
file path=usr/share/fish/completions/find.fish
file path=usr/share/fish/completions/findstr.fish
+file path=usr/share/fish/completions/firefox-developer-edition.fish
+file path=usr/share/fish/completions/firefox.fish
file path=usr/share/fish/completions/firewall-cmd.fish
file path=usr/share/fish/completions/fish.fish
file path=usr/share/fish/completions/fish_add_path.fish
file path=usr/share/fish/completions/fish_config.fish
+file path=usr/share/fish/completions/fish_delta.fish
file path=usr/share/fish/completions/fish_indent.fish
file path=usr/share/fish/completions/fish_key_reader.fish
file path=usr/share/fish/completions/fish_opt.fish
@@ -461,6 +475,7 @@
file path=usr/share/fish/completions/fluxbox-remote.fish
file path=usr/share/fish/completions/for.fish
file path=usr/share/fish/completions/forfiles.fish
+file path=usr/share/fish/completions/fortune.fish
file path=usr/share/fish/completions/fossil.fish
file path=usr/share/fish/completions/fsharpc.fish
file path=usr/share/fish/completions/fsharpi.fish
@@ -564,17 +579,21 @@
file path=usr/share/fish/completions/julia.fish
file path=usr/share/fish/completions/k3d.fish
file path=usr/share/fish/completions/kak.fish
+file path=usr/share/fish/completions/kb.fish
file path=usr/share/fish/completions/kcmshell5.fish
file path=usr/share/fish/completions/kdeconnect-cli.fish
file path=usr/share/fish/completions/keepassxc-cli.fish
file path=usr/share/fish/completions/keybase.fish
file path=usr/share/fish/completions/kill.fish
file path=usr/share/fish/completions/killall.fish
+file path=usr/share/fish/completions/kind.fish
file path=usr/share/fish/completions/kitchen.fish
file path=usr/share/fish/completions/kitty.fish
file path=usr/share/fish/completions/kldload.fish
file path=usr/share/fish/completions/kldunload.fish
file path=usr/share/fish/completions/kmutil.fish
+file path=usr/share/fish/completions/konsole.fish
+file path=usr/share/fish/completions/ksh.fish
file path=usr/share/fish/completions/kubectl.fish
file path=usr/share/fish/completions/latex.fish
file path=usr/share/fish/completions/latexmk.fish
@@ -585,6 +604,7 @@
file path=usr/share/fish/completions/light.fish
file path=usr/share/fish/completions/lightdm.fish
file path=usr/share/fish/completions/ln.fish
+file path=usr/share/fish/completions/loadkeys.fish
file path=usr/share/fish/completions/localectl.fish
file path=usr/share/fish/completions/locate.fish
file path=usr/share/fish/completions/loginctl.fish
@@ -698,13 +718,18 @@
file path=usr/share/fish/completions/nodeenv.fish
file path=usr/share/fish/completions/not.fish
file path=usr/share/fish/completions/npm.fish
+file path=usr/share/fish/completions/nu.fish
file path=usr/share/fish/completions/nvim.fish
+file path=usr/share/fish/completions/nvme.fish
file path=usr/share/fish/completions/nvram.fish
file path=usr/share/fish/completions/objdump.fish
file path=usr/share/fish/completions/obnam.fish
file path=usr/share/fish/completions/octave.fish
file path=usr/share/fish/completions/oggenc.fish
+file path=usr/share/fish/completions/oksh.fish
+file path=usr/share/fish/completions/okular.fish
file path=usr/share/fish/completions/omega.fish
+file path=usr/share/fish/completions/op.fish
file path=usr/share/fish/completions/opam.fish
file path=usr/share/fish/completions/open.fish
file path=usr/share/fish/completions/openocd.fish
@@ -713,6 +738,7 @@
file path=usr/share/fish/completions/optimus-manager.fish
file path=usr/share/fish/completions/optipng.fish
file path=usr/share/fish/completions/or.fish
+file path=usr/share/fish/completions/ouch.fish
file path=usr/share/fish/completions/p4.fish
file path=usr/share/fish/completions/pabcnetcclear.fish
file path=usr/share/fish/completions/pacaur.fish
@@ -750,6 +776,7 @@
file path=usr/share/fish/completions/pip2.fish
file path=usr/share/fish/completions/pip3.fish
file path=usr/share/fish/completions/pipenv.fish
+file path=usr/share/fish/completions/pix.fish
file path=usr/share/fish/completions/pkg-config.fish
file path=usr/share/fish/completions/pkg.fish
file path=usr/share/fish/completions/pkg_add.fish
@@ -784,6 +811,7 @@
file path=usr/share/fish/completions/psub.fish
file path=usr/share/fish/completions/pushd.fish
file path=usr/share/fish/completions/pv.fish
+file path=usr/share/fish/completions/pwd.fish
file path=usr/share/fish/completions/pydf.fish
file path=usr/share/fish/completions/pyenv.fish
file path=usr/share/fish/completions/pygmentize.fish
@@ -793,21 +821,24 @@
file path=usr/share/fish/completions/pzstd.fish
file path=usr/share/fish/completions/qdbus.fish
file path=usr/share/fish/completions/qmk.fish
+file path=usr/share/fish/completions/qshell.fish
file path=usr/share/fish/completions/qubes-gpg-client.fish
file path=usr/share/fish/completions/quilt.fish
file path=usr/share/fish/completions/rakudo.fish
file path=usr/share/fish/completions/random.fish
file path=usr/share/fish/completions/ranger.fish
-file path=usr/share/fish/completions/reflector.fish
file path=usr/share/fish/completions/rbenv.fish
file path=usr/share/fish/completions/rc-service.fish
file path=usr/share/fish/completions/rc-status.fish
file path=usr/share/fish/completions/rc-update.fish
+file path=usr/share/fish/completions/rc.fish
file path=usr/share/fish/completions/rcctl.fish
file path=usr/share/fish/completions/rclone.fish
file path=usr/share/fish/completions/read.fish
+file path=usr/share/fish/completions/readelf.fish
file path=usr/share/fish/completions/readlink.fish
file path=usr/share/fish/completions/realpath.fish
+file path=usr/share/fish/completions/reflector.fish
file path=usr/share/fish/completions/reg.fish
file path=usr/share/fish/completions/reject.fish
file path=usr/share/fish/completions/rejmerge.fish
@@ -839,6 +870,7 @@
file path=usr/share/fish/completions/rustc.fish
file path=usr/share/fish/completions/rustup.fish
file path=usr/share/fish/completions/s3cmd.fish
+file path=usr/share/fish/completions/sad.fish
file path=usr/share/fish/completions/sass-convert.fish
file path=usr/share/fish/completions/sass.fish
file path=usr/share/fish/completions/sbcl.fish
@@ -902,10 +934,12 @@
file path=usr/share/fish/completions/sysctl.fish
file path=usr/share/fish/completions/systemctl.fish
file path=usr/share/fish/completions/systemd-analyze.fish
+file path=usr/share/fish/completions/systemd-cryptenroll.fish
file path=usr/share/fish/completions/systemd-nspawn.fish
file path=usr/share/fish/completions/tail.fish
file path=usr/share/fish/completions/tar.fish
file path=usr/share/fish/completions/tcpdump.fish
+file path=usr/share/fish/completions/tcsh.fish
file path=usr/share/fish/completions/tee.fish
file path=usr/share/fish/completions/telnet.fish
file path=usr/share/fish/completions/termite.fish
@@ -920,10 +954,12 @@
file path=usr/share/fish/completions/tmux.fish
file path=usr/share/fish/completions/tmuxinator.fish
file path=usr/share/fish/completions/tokei.fish
+file path=usr/share/fish/completions/toot.fish
file path=usr/share/fish/completions/top.fish
file path=usr/share/fish/completions/topgrade.fish
file path=usr/share/fish/completions/totem.fish
file path=usr/share/fish/completions/touch.fish
+file path=usr/share/fish/completions/tox.fish
file path=usr/share/fish/completions/tr.fish
file path=usr/share/fish/completions/tracepath.fish
file path=usr/share/fish/completions/traceroute.fish
@@ -950,6 +986,7 @@
file path=usr/share/fish/completions/unzstd.fish
file path=usr/share/fish/completions/update-eix-remote.fish
file path=usr/share/fish/completions/update-eix.fish
+file path=usr/share/fish/completions/usbip.fish
file path=usr/share/fish/completions/useradd.fish
file path=usr/share/fish/completions/userdbctl.fish
file path=usr/share/fish/completions/usermod.fish
@@ -984,6 +1021,7 @@
file path=usr/share/fish/completions/wineboot.fish
file path=usr/share/fish/completions/winemaker.fish
file path=usr/share/fish/completions/wireshark.fish
+file path=usr/share/fish/completions/wish.fish
file path=usr/share/fish/completions/wpa_cli.fish
file path=usr/share/fish/completions/wslpath.fish
file path=usr/share/fish/completions/wvdial.fish
@@ -1006,18 +1044,23 @@
file path=usr/share/fish/completions/xclip.fish
file path=usr/share/fish/completions/xdg-mime.fish
file path=usr/share/fish/completions/xdvi.fish
+file path=usr/share/fish/completions/xed.fish
file path=usr/share/fish/completions/xelatex.fish
file path=usr/share/fish/completions/xgettext.fish
file path=usr/share/fish/completions/xinput.fish
file path=usr/share/fish/completions/xmms.fish
+file path=usr/share/fish/completions/xonsh.fish
file path=usr/share/fish/completions/xpdf.fish
+file path=usr/share/fish/completions/xplayer.fish
file path=usr/share/fish/completions/xprop.fish
file path=usr/share/fish/completions/xrandr.fish
file path=usr/share/fish/completions/xrdb.fish
+file path=usr/share/fish/completions/xreader.fish
file path=usr/share/fish/completions/xsel.fish
file path=usr/share/fish/completions/xsp.fish
file path=usr/share/fish/completions/xsv.fish
file path=usr/share/fish/completions/xterm.fish
+file path=usr/share/fish/completions/xviewer.fish
file path=usr/share/fish/completions/xxh128sum.fish
file path=usr/share/fish/completions/xxh32sum.fish
file path=usr/share/fish/completions/xxh64sum.fish
@@ -1026,11 +1069,14 @@
file path=usr/share/fish/completions/yadm.fish
file path=usr/share/fish/completions/yaourt.fish
file path=usr/share/fish/completions/yarn.fish
+file path=usr/share/fish/completions/yash.fish
file path=usr/share/fish/completions/yast2.fish
+file path=usr/share/fish/completions/ykman.fish
file path=usr/share/fish/completions/yum.fish
file path=usr/share/fish/completions/zcat.fish
file path=usr/share/fish/completions/zef.fish
file path=usr/share/fish/completions/zfs.fish
+file path=usr/share/fish/completions/zig.fish
file path=usr/share/fish/completions/zip.fish
file path=usr/share/fish/completions/zopfli.fish
file path=usr/share/fish/completions/zopflipng.fish
@@ -1096,7 +1142,6 @@
file path=usr/share/fish/functions/__fish_config_interactive.fish
file path=usr/share/fish/functions/__fish_contains_opt.fish
file path=usr/share/fish/functions/__fish_crux_packages.fish
-file path=usr/share/fish/functions/__fish_cursor_1337.fish
file path=usr/share/fish/functions/__fish_cursor_konsole.fish
file path=usr/share/fish/functions/__fish_cursor_xterm.fish
file path=usr/share/fish/functions/__fish_describe_command.fish
@@ -1212,14 +1257,13 @@
file path=usr/share/fish/functions/fish_config.fish
file path=usr/share/fish/functions/fish_default_key_bindings.fish
file path=usr/share/fish/functions/fish_default_mode_prompt.fish
+file path=usr/share/fish/functions/fish_delta.fish
file path=usr/share/fish/functions/fish_git_prompt.fish
file path=usr/share/fish/functions/fish_greeting.fish
file path=usr/share/fish/functions/fish_hg_prompt.fish
file path=usr/share/fish/functions/fish_hybrid_key_bindings.fish
-file path=usr/share/fish/functions/fish_indent.fish
file path=usr/share/fish/functions/fish_is_root_user.fish
file path=usr/share/fish/functions/fish_job_summary.fish
-file path=usr/share/fish/functions/fish_key_reader.fish
file path=usr/share/fish/functions/fish_mode_prompt.fish
file path=usr/share/fish/functions/fish_opt.fish
file path=usr/share/fish/functions/fish_print_git_action.fish
@@ -1305,8 +1349,11 @@
file path=usr/share/fish/man/man1/fish.1
file path=usr/share/fish/man/man1/fish_add_path.1
file path=usr/share/fish/man/man1/fish_breakpoint_prompt.1
+file path=usr/share/fish/man/man1/fish_clipboard_copy.1
+file path=usr/share/fish/man/man1/fish_clipboard_paste.1
file path=usr/share/fish/man/man1/fish_command_not_found.1
file path=usr/share/fish/man/man1/fish_config.1
+file path=usr/share/fish/man/man1/fish_delta.1
file path=usr/share/fish/man/man1/fish_git_prompt.1
file path=usr/share/fish/man/man1/fish_greeting.1
file path=usr/share/fish/man/man1/fish_hg_prompt.1
@@ -1364,6 +1411,7 @@
file path=usr/share/fish/man/man1/string-pad.1
file path=usr/share/fish/man/man1/string-repeat.1
file path=usr/share/fish/man/man1/string-replace.1
+file path=usr/share/fish/man/man1/string-shorten.1
file path=usr/share/fish/man/man1/string-split.1
file path=usr/share/fish/man/man1/string-split0.1
file path=usr/share/fish/man/man1/string-sub.1
diff --git a/components/shell/fish/manifests/sample-manifest.p5m b/components/shell/fish/manifests/sample-manifest.p5m
index a09390b..34d54e6 100644
--- a/components/shell/fish/manifests/sample-manifest.p5m
+++ b/components/shell/fish/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2022 <contributor>
+# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -30,7 +30,6 @@
file path=usr/share/applications/fish.desktop
file path=usr/share/doc/fish/.buildinfo
file path=usr/share/doc/fish/CHANGELOG.rst
-file path=usr/share/doc/fish/_static/_sphinx_javascript_frameworks_compat.js
file path=usr/share/doc/fish/_static/basic.css
file path=usr/share/doc/fish/_static/classic.css
file path=usr/share/doc/fish/_static/default.css
@@ -38,8 +37,6 @@
file path=usr/share/doc/fish/_static/documentation_options.js
file path=usr/share/doc/fish/_static/file.png
file path=usr/share/doc/fish/_static/fish.png
-file path=usr/share/doc/fish/_static/jquery-3.6.0.js
-file path=usr/share/doc/fish/_static/jquery.js
file path=usr/share/doc/fish/_static/language_data.js
file path=usr/share/doc/fish/_static/minus.png
file path=usr/share/doc/fish/_static/plus.png
@@ -47,8 +44,7 @@
file path=usr/share/doc/fish/_static/pygments.css
file path=usr/share/doc/fish/_static/searchtools.js
file path=usr/share/doc/fish/_static/sidebar.js
-file path=usr/share/doc/fish/_static/underscore-1.13.1.js
-file path=usr/share/doc/fish/_static/underscore.js
+file path=usr/share/doc/fish/_static/sphinx_highlight.js
file path=usr/share/doc/fish/cmds/_.html
file path=usr/share/doc/fish/cmds/abbr.html
file path=usr/share/doc/fish/cmds/alias.html
@@ -85,8 +81,11 @@
file path=usr/share/doc/fish/cmds/fish.html
file path=usr/share/doc/fish/cmds/fish_add_path.html
file path=usr/share/doc/fish/cmds/fish_breakpoint_prompt.html
+file path=usr/share/doc/fish/cmds/fish_clipboard_copy.html
+file path=usr/share/doc/fish/cmds/fish_clipboard_paste.html
file path=usr/share/doc/fish/cmds/fish_command_not_found.html
file path=usr/share/doc/fish/cmds/fish_config.html
+file path=usr/share/doc/fish/cmds/fish_delta.html
file path=usr/share/doc/fish/cmds/fish_git_prompt.html
file path=usr/share/doc/fish/cmds/fish_greeting.html
file path=usr/share/doc/fish/cmds/fish_hg_prompt.html
@@ -145,6 +144,7 @@
file path=usr/share/doc/fish/cmds/string-pad.html
file path=usr/share/doc/fish/cmds/string-repeat.html
file path=usr/share/doc/fish/cmds/string-replace.html
+file path=usr/share/doc/fish/cmds/string-shorten.html
file path=usr/share/doc/fish/cmds/string-split.html
file path=usr/share/doc/fish/cmds/string-split0.html
file path=usr/share/doc/fish/cmds/string-sub.html
@@ -247,9 +247,11 @@
file path=usr/share/fish/completions/archlinux-java.fish
file path=usr/share/fish/completions/arepack.fish
file path=usr/share/fish/completions/argparse.fish
+file path=usr/share/fish/completions/ark.fish
file path=usr/share/fish/completions/arp.fish
file path=usr/share/fish/completions/as.fish
file path=usr/share/fish/completions/asciidoctor.fish
+file path=usr/share/fish/completions/asciinema.fish
file path=usr/share/fish/completions/asd.fish
file path=usr/share/fish/completions/asp.fish
file path=usr/share/fish/completions/at.fish
@@ -325,6 +327,8 @@
file path=usr/share/fish/completions/clean.fish
file path=usr/share/fish/completions/cleanmgr.fish
file path=usr/share/fish/completions/climate.fish
+file path=usr/share/fish/completions/clj.fish
+file path=usr/share/fish/completions/clojure.fish
file path=usr/share/fish/completions/cmark.fish
file path=usr/share/fish/completions/cmd.fish
file path=usr/share/fish/completions/cmdkey.fish
@@ -345,6 +349,7 @@
file path=usr/share/fish/completions/configure.fish
file path=usr/share/fish/completions/conjure.fish
file path=usr/share/fish/completions/connmanctl.fish
+file path=usr/share/fish/completions/contains.fish
file path=usr/share/fish/completions/continue.fish
file path=usr/share/fish/completions/convert.fish
file path=usr/share/fish/completions/coredumpctl.fish
@@ -356,6 +361,7 @@
file path=usr/share/fish/completions/createdb.fish
file path=usr/share/fish/completions/cryptsetup.fish
file path=usr/share/fish/completions/csc.fish
+file path=usr/share/fish/completions/csh.fish
file path=usr/share/fish/completions/csharp.fish
file path=usr/share/fish/completions/csi.fish
file path=usr/share/fish/completions/cupsaccept.fish
@@ -381,8 +387,11 @@
file path=usr/share/fish/completions/dhcpcd.fish
file path=usr/share/fish/completions/diff.fish
file path=usr/share/fish/completions/dig.fish
+file path=usr/share/fish/completions/direnv.fish
file path=usr/share/fish/completions/diskutil.fish
+file path=usr/share/fish/completions/disown.fish
file path=usr/share/fish/completions/display.fish
+file path=usr/share/fish/completions/dive.fish
file path=usr/share/fish/completions/djview.fish
file path=usr/share/fish/completions/djview4.fish
file path=usr/share/fish/completions/djxl.fish
@@ -392,6 +401,7 @@
file path=usr/share/fish/completions/dnf.fish
file path=usr/share/fish/completions/doas.fish
file path=usr/share/fish/completions/docker.fish
+file path=usr/share/fish/completions/dolphin.fish
file path=usr/share/fish/completions/dotnet.fish
file path=usr/share/fish/completions/downgrade.fish
file path=usr/share/fish/completions/dpkg-reconfigure.fish
@@ -399,6 +409,7 @@
file path=usr/share/fish/completions/dropdb.fish
file path=usr/share/fish/completions/dscacheutil.fish
file path=usr/share/fish/completions/du.fish
+file path=usr/share/fish/completions/dua.fish
file path=usr/share/fish/completions/dumpcap.fish
file path=usr/share/fish/completions/duply.fish
file path=usr/share/fish/completions/dvipdf.fish
@@ -406,6 +417,8 @@
file path=usr/share/fish/completions/ebuild.fish
file path=usr/share/fish/completions/echo.fish
file path=usr/share/fish/completions/efibootmgr.fish
+file path=usr/share/fish/completions/efivar.fish
+file path=usr/share/fish/completions/eg.fish
file path=usr/share/fish/completions/egrep.fish
file path=usr/share/fish/completions/eix-sync.fish
file path=usr/share/fish/completions/eix.fish
@@ -415,12 +428,14 @@
file path=usr/share/fish/completions/emacs.fish
file path=usr/share/fish/completions/emaint.fish
file path=usr/share/fish/completions/emerge.fish
+file path=usr/share/fish/completions/emit.fish
file path=usr/share/fish/completions/encfs.fish
file path=usr/share/fish/completions/entr.fish
file path=usr/share/fish/completions/env.fish
file path=usr/share/fish/completions/eopkg.fish
file path=usr/share/fish/completions/epkginfo.fish
file path=usr/share/fish/completions/equery.fish
+file path=usr/share/fish/completions/es.fish
file path=usr/share/fish/completions/eselect.fish
file path=usr/share/fish/completions/etex.fish
file path=usr/share/fish/completions/ethtool.fish
@@ -445,10 +460,13 @@
file path=usr/share/fish/completions/file.fish
file path=usr/share/fish/completions/find.fish
file path=usr/share/fish/completions/findstr.fish
+file path=usr/share/fish/completions/firefox-developer-edition.fish
+file path=usr/share/fish/completions/firefox.fish
file path=usr/share/fish/completions/firewall-cmd.fish
file path=usr/share/fish/completions/fish.fish
file path=usr/share/fish/completions/fish_add_path.fish
file path=usr/share/fish/completions/fish_config.fish
+file path=usr/share/fish/completions/fish_delta.fish
file path=usr/share/fish/completions/fish_indent.fish
file path=usr/share/fish/completions/fish_key_reader.fish
file path=usr/share/fish/completions/fish_opt.fish
@@ -457,6 +475,7 @@
file path=usr/share/fish/completions/fluxbox-remote.fish
file path=usr/share/fish/completions/for.fish
file path=usr/share/fish/completions/forfiles.fish
+file path=usr/share/fish/completions/fortune.fish
file path=usr/share/fish/completions/fossil.fish
file path=usr/share/fish/completions/fsharpc.fish
file path=usr/share/fish/completions/fsharpi.fish
@@ -560,17 +579,21 @@
file path=usr/share/fish/completions/julia.fish
file path=usr/share/fish/completions/k3d.fish
file path=usr/share/fish/completions/kak.fish
+file path=usr/share/fish/completions/kb.fish
file path=usr/share/fish/completions/kcmshell5.fish
file path=usr/share/fish/completions/kdeconnect-cli.fish
file path=usr/share/fish/completions/keepassxc-cli.fish
file path=usr/share/fish/completions/keybase.fish
file path=usr/share/fish/completions/kill.fish
file path=usr/share/fish/completions/killall.fish
+file path=usr/share/fish/completions/kind.fish
file path=usr/share/fish/completions/kitchen.fish
file path=usr/share/fish/completions/kitty.fish
file path=usr/share/fish/completions/kldload.fish
file path=usr/share/fish/completions/kldunload.fish
file path=usr/share/fish/completions/kmutil.fish
+file path=usr/share/fish/completions/konsole.fish
+file path=usr/share/fish/completions/ksh.fish
file path=usr/share/fish/completions/kubectl.fish
file path=usr/share/fish/completions/latex.fish
file path=usr/share/fish/completions/latexmk.fish
@@ -581,6 +604,7 @@
file path=usr/share/fish/completions/light.fish
file path=usr/share/fish/completions/lightdm.fish
file path=usr/share/fish/completions/ln.fish
+file path=usr/share/fish/completions/loadkeys.fish
file path=usr/share/fish/completions/localectl.fish
file path=usr/share/fish/completions/locate.fish
file path=usr/share/fish/completions/loginctl.fish
@@ -694,13 +718,18 @@
file path=usr/share/fish/completions/nodeenv.fish
file path=usr/share/fish/completions/not.fish
file path=usr/share/fish/completions/npm.fish
+file path=usr/share/fish/completions/nu.fish
file path=usr/share/fish/completions/nvim.fish
+file path=usr/share/fish/completions/nvme.fish
file path=usr/share/fish/completions/nvram.fish
file path=usr/share/fish/completions/objdump.fish
file path=usr/share/fish/completions/obnam.fish
file path=usr/share/fish/completions/octave.fish
file path=usr/share/fish/completions/oggenc.fish
+file path=usr/share/fish/completions/oksh.fish
+file path=usr/share/fish/completions/okular.fish
file path=usr/share/fish/completions/omega.fish
+file path=usr/share/fish/completions/op.fish
file path=usr/share/fish/completions/opam.fish
file path=usr/share/fish/completions/open.fish
file path=usr/share/fish/completions/openocd.fish
@@ -709,6 +738,7 @@
file path=usr/share/fish/completions/optimus-manager.fish
file path=usr/share/fish/completions/optipng.fish
file path=usr/share/fish/completions/or.fish
+file path=usr/share/fish/completions/ouch.fish
file path=usr/share/fish/completions/p4.fish
file path=usr/share/fish/completions/pabcnetcclear.fish
file path=usr/share/fish/completions/pacaur.fish
@@ -746,6 +776,7 @@
file path=usr/share/fish/completions/pip2.fish
file path=usr/share/fish/completions/pip3.fish
file path=usr/share/fish/completions/pipenv.fish
+file path=usr/share/fish/completions/pix.fish
file path=usr/share/fish/completions/pkg-config.fish
file path=usr/share/fish/completions/pkg.fish
file path=usr/share/fish/completions/pkg_add.fish
@@ -780,6 +811,7 @@
file path=usr/share/fish/completions/psub.fish
file path=usr/share/fish/completions/pushd.fish
file path=usr/share/fish/completions/pv.fish
+file path=usr/share/fish/completions/pwd.fish
file path=usr/share/fish/completions/pydf.fish
file path=usr/share/fish/completions/pyenv.fish
file path=usr/share/fish/completions/pygmentize.fish
@@ -789,6 +821,7 @@
file path=usr/share/fish/completions/pzstd.fish
file path=usr/share/fish/completions/qdbus.fish
file path=usr/share/fish/completions/qmk.fish
+file path=usr/share/fish/completions/qshell.fish
file path=usr/share/fish/completions/qubes-gpg-client.fish
file path=usr/share/fish/completions/quilt.fish
file path=usr/share/fish/completions/rakudo.fish
@@ -798,9 +831,11 @@
file path=usr/share/fish/completions/rc-service.fish
file path=usr/share/fish/completions/rc-status.fish
file path=usr/share/fish/completions/rc-update.fish
+file path=usr/share/fish/completions/rc.fish
file path=usr/share/fish/completions/rcctl.fish
file path=usr/share/fish/completions/rclone.fish
file path=usr/share/fish/completions/read.fish
+file path=usr/share/fish/completions/readelf.fish
file path=usr/share/fish/completions/readlink.fish
file path=usr/share/fish/completions/realpath.fish
file path=usr/share/fish/completions/reflector.fish
@@ -835,6 +870,7 @@
file path=usr/share/fish/completions/rustc.fish
file path=usr/share/fish/completions/rustup.fish
file path=usr/share/fish/completions/s3cmd.fish
+file path=usr/share/fish/completions/sad.fish
file path=usr/share/fish/completions/sass-convert.fish
file path=usr/share/fish/completions/sass.fish
file path=usr/share/fish/completions/sbcl.fish
@@ -898,10 +934,12 @@
file path=usr/share/fish/completions/sysctl.fish
file path=usr/share/fish/completions/systemctl.fish
file path=usr/share/fish/completions/systemd-analyze.fish
+file path=usr/share/fish/completions/systemd-cryptenroll.fish
file path=usr/share/fish/completions/systemd-nspawn.fish
file path=usr/share/fish/completions/tail.fish
file path=usr/share/fish/completions/tar.fish
file path=usr/share/fish/completions/tcpdump.fish
+file path=usr/share/fish/completions/tcsh.fish
file path=usr/share/fish/completions/tee.fish
file path=usr/share/fish/completions/telnet.fish
file path=usr/share/fish/completions/termite.fish
@@ -916,10 +954,12 @@
file path=usr/share/fish/completions/tmux.fish
file path=usr/share/fish/completions/tmuxinator.fish
file path=usr/share/fish/completions/tokei.fish
+file path=usr/share/fish/completions/toot.fish
file path=usr/share/fish/completions/top.fish
file path=usr/share/fish/completions/topgrade.fish
file path=usr/share/fish/completions/totem.fish
file path=usr/share/fish/completions/touch.fish
+file path=usr/share/fish/completions/tox.fish
file path=usr/share/fish/completions/tr.fish
file path=usr/share/fish/completions/tracepath.fish
file path=usr/share/fish/completions/traceroute.fish
@@ -946,6 +986,7 @@
file path=usr/share/fish/completions/unzstd.fish
file path=usr/share/fish/completions/update-eix-remote.fish
file path=usr/share/fish/completions/update-eix.fish
+file path=usr/share/fish/completions/usbip.fish
file path=usr/share/fish/completions/useradd.fish
file path=usr/share/fish/completions/userdbctl.fish
file path=usr/share/fish/completions/usermod.fish
@@ -980,6 +1021,7 @@
file path=usr/share/fish/completions/wineboot.fish
file path=usr/share/fish/completions/winemaker.fish
file path=usr/share/fish/completions/wireshark.fish
+file path=usr/share/fish/completions/wish.fish
file path=usr/share/fish/completions/wpa_cli.fish
file path=usr/share/fish/completions/wslpath.fish
file path=usr/share/fish/completions/wvdial.fish
@@ -1002,18 +1044,23 @@
file path=usr/share/fish/completions/xclip.fish
file path=usr/share/fish/completions/xdg-mime.fish
file path=usr/share/fish/completions/xdvi.fish
+file path=usr/share/fish/completions/xed.fish
file path=usr/share/fish/completions/xelatex.fish
file path=usr/share/fish/completions/xgettext.fish
file path=usr/share/fish/completions/xinput.fish
file path=usr/share/fish/completions/xmms.fish
+file path=usr/share/fish/completions/xonsh.fish
file path=usr/share/fish/completions/xpdf.fish
+file path=usr/share/fish/completions/xplayer.fish
file path=usr/share/fish/completions/xprop.fish
file path=usr/share/fish/completions/xrandr.fish
file path=usr/share/fish/completions/xrdb.fish
+file path=usr/share/fish/completions/xreader.fish
file path=usr/share/fish/completions/xsel.fish
file path=usr/share/fish/completions/xsp.fish
file path=usr/share/fish/completions/xsv.fish
file path=usr/share/fish/completions/xterm.fish
+file path=usr/share/fish/completions/xviewer.fish
file path=usr/share/fish/completions/xxh128sum.fish
file path=usr/share/fish/completions/xxh32sum.fish
file path=usr/share/fish/completions/xxh64sum.fish
@@ -1022,11 +1069,14 @@
file path=usr/share/fish/completions/yadm.fish
file path=usr/share/fish/completions/yaourt.fish
file path=usr/share/fish/completions/yarn.fish
+file path=usr/share/fish/completions/yash.fish
file path=usr/share/fish/completions/yast2.fish
+file path=usr/share/fish/completions/ykman.fish
file path=usr/share/fish/completions/yum.fish
file path=usr/share/fish/completions/zcat.fish
file path=usr/share/fish/completions/zef.fish
file path=usr/share/fish/completions/zfs.fish
+file path=usr/share/fish/completions/zig.fish
file path=usr/share/fish/completions/zip.fish
file path=usr/share/fish/completions/zopfli.fish
file path=usr/share/fish/completions/zopflipng.fish
@@ -1092,7 +1142,6 @@
file path=usr/share/fish/functions/__fish_config_interactive.fish
file path=usr/share/fish/functions/__fish_contains_opt.fish
file path=usr/share/fish/functions/__fish_crux_packages.fish
-file path=usr/share/fish/functions/__fish_cursor_1337.fish
file path=usr/share/fish/functions/__fish_cursor_konsole.fish
file path=usr/share/fish/functions/__fish_cursor_xterm.fish
file path=usr/share/fish/functions/__fish_describe_command.fish
@@ -1208,14 +1257,13 @@
file path=usr/share/fish/functions/fish_config.fish
file path=usr/share/fish/functions/fish_default_key_bindings.fish
file path=usr/share/fish/functions/fish_default_mode_prompt.fish
+file path=usr/share/fish/functions/fish_delta.fish
file path=usr/share/fish/functions/fish_git_prompt.fish
file path=usr/share/fish/functions/fish_greeting.fish
file path=usr/share/fish/functions/fish_hg_prompt.fish
file path=usr/share/fish/functions/fish_hybrid_key_bindings.fish
-file path=usr/share/fish/functions/fish_indent.fish
file path=usr/share/fish/functions/fish_is_root_user.fish
file path=usr/share/fish/functions/fish_job_summary.fish
-file path=usr/share/fish/functions/fish_key_reader.fish
file path=usr/share/fish/functions/fish_mode_prompt.fish
file path=usr/share/fish/functions/fish_opt.fish
file path=usr/share/fish/functions/fish_print_git_action.fish
@@ -1301,8 +1349,11 @@
file path=usr/share/fish/man/man1/fish.1
file path=usr/share/fish/man/man1/fish_add_path.1
file path=usr/share/fish/man/man1/fish_breakpoint_prompt.1
+file path=usr/share/fish/man/man1/fish_clipboard_copy.1
+file path=usr/share/fish/man/man1/fish_clipboard_paste.1
file path=usr/share/fish/man/man1/fish_command_not_found.1
file path=usr/share/fish/man/man1/fish_config.1
+file path=usr/share/fish/man/man1/fish_delta.1
file path=usr/share/fish/man/man1/fish_git_prompt.1
file path=usr/share/fish/man/man1/fish_greeting.1
file path=usr/share/fish/man/man1/fish_hg_prompt.1
@@ -1360,6 +1411,7 @@
file path=usr/share/fish/man/man1/string-pad.1
file path=usr/share/fish/man/man1/string-repeat.1
file path=usr/share/fish/man/man1/string-replace.1
+file path=usr/share/fish/man/man1/string-shorten.1
file path=usr/share/fish/man/man1/string-split.1
file path=usr/share/fish/man/man1/string-split0.1
file path=usr/share/fish/man/man1/string-sub.1
diff --git a/components/shell/fish/patches/02-fix-reg.patch b/components/shell/fish/patches/02-fix-reg.patch
new file mode 100644
index 0000000..62dfb92
--- /dev/null
+++ b/components/shell/fish/patches/02-fix-reg.patch
@@ -0,0 +1,52 @@
+We need to rename the regular file constant in order to prevent a gcc compiler error:
+
+ In file included from /export2/home/andreas/oi-userland/components/shell/fish/fish-3.6.0/src/env_dispatch.cpp:15:
+ oi-userland/components/shell/fish/fish-3.6.0/src/wutil.h:162:5: error: expected identifier before 'register'
+ 162 | reg, // regular file
+ | ^~~
+
+--- fish-3.6.0/src/wutil.h.orig 2023-01-07 15:12:25.000000000 +0000
++++ fish-3.6.0/src/wutil.h 2023-01-08 10:47:45.570118762 +0000
+@@ -159,7 +159,7 @@
+ chr, // character device
+ dir, // directory
+ blk, // block device
+- reg, // regular file
++ regr, // regular file
+ lnk, // symlink
+ sock, // socket
+ whiteout, // whiteout (from BSD)
+--- fish-3.6.0/src/wutil.cpp.orig 2023-01-08 10:47:17.199812493 +0000
++++ fish-3.6.0/src/wutil.cpp 2023-01-08 10:48:38.986129968 +0000
+@@ -78,7 +78,7 @@
+ case DT_BLK:
+ return dir_entry_type_t::blk;
+ case DT_REG:
+- return dir_entry_type_t::reg;
++ return dir_entry_type_t::regr;
+ case DT_LNK:
+ return dir_entry_type_t::lnk;
+ case DT_SOCK:
+@@ -106,7 +106,7 @@
+ case S_IFBLK:
+ return dir_entry_type_t::blk;
+ case S_IFREG:
+- return dir_entry_type_t::reg;
++ return dir_entry_type_t::regr;
+ case S_IFLNK:
+ return dir_entry_type_t::lnk;
+ case S_IFSOCK:
+--- fish-3.6.0/src/fish_tests.cpp.orig 2023-01-07 15:12:25.000000000 +0000
++++ fish-3.6.0/src/fish_tests.cpp 2023-01-08 10:49:07.581582097 +0000
+@@ -1755,9 +1755,9 @@
+ if (entry->name == dirname) {
+ expected = dir_entry_type_t::dir;
+ } else if (entry->name == regname) {
+- expected = dir_entry_type_t::reg;
++ expected = dir_entry_type_t::regr;
+ } else if (entry->name == reglinkname) {
+- expected = dir_entry_type_t::reg;
++ expected = dir_entry_type_t::regr;
+ } else if (entry->name == dirlinkname) {
+ expected = dir_entry_type_t::dir;
+ } else if (entry->name == badlinkname) {
diff --git a/components/shell/fish/patches/03-memset.patch b/components/shell/fish/patches/03-memset.patch
new file mode 100644
index 0000000..8912b88
--- /dev/null
+++ b/components/shell/fish/patches/03-memset.patch
@@ -0,0 +1,16 @@
+We need to include <cstring> because memset() is defined there.
+ oi-userland/components/shell/fish/fish-3.6.0/src/fds.cpp:204:5: error: 'memset' was not declared in this scope
+ 204 | FD_ZERO(&fds);
+
+--- fish-3.6.0/src/fds.cpp.orig 2023-01-07 15:12:25.000000000 +0000
++++ fish-3.6.0/src/fds.cpp 2023-01-08 10:55:33.610119460 +0000
+@@ -17,6 +17,9 @@
+ #include <sys/eventfd.h>
+ #endif
+
++// memset() is defined in cstring:
++#include <cstring>
++
+ // The first fd in the "high range." fds below this are allowed to be used directly by users in
+ // redirections, e.g. >&3
+ const int k_first_high_fd = 10;
diff --git a/components/shell/fish/pkg5 b/components/shell/fish/pkg5
index c669dfa..f671bac 100644
--- a/components/shell/fish/pkg5
+++ b/components/shell/fish/pkg5
@@ -1,12 +1,11 @@
{
"dependencies": [
"SUNWcs",
- "developer/documentation-tool/doxygen",
"library/pcre2",
"library/python/pexpect-39",
"shell/ksh93",
"system/library",
- "system/library/g++-7-runtime",
+ "system/library/g++-10-runtime",
"system/library/math"
],
"fmris": [
diff --git a/components/shell/fish/test/results-all.master b/components/shell/fish/test/results-all.master
new file mode 100644
index 0000000..05e5644
--- /dev/null
+++ b/components/shell/fish/test/results-all.master
@@ -0,0 +1,27 @@
+ Test #107: complete.fish ............................***Failed
+ Test #96: check-completions.fish ...................***Failed
+ Test #160: path.fish ................................***Failed
+ Test #194: tmux-bind.fish ...........................***Failed
+ Test #197: tmux-prompt.fish .........................***Failed
+ Test #196: tmux-history-search.fish .................***Failed
+ Test #193: tmux-abbr.fish ...........................***Failed
+ Test #223: exit_nohang.py ...........................***Failed
+ Test #195: tmux-complete.fish .......................***Failed
+ Test #225: fkr.py ...................................***Failed
+Testing file pexpectsfkr.py:[31mFailed to match pattern:[39m [1mExiting\ at\ your\ request\.\\r\\n[0m
+ Test #241: terminal.py ..............................***Failed
+Testing file pexpectsterminal.py:[31mFailed to match pattern:[39m [1mterm\-support:\ Terminal\ has\ 0\ columns,\ falling\ back\ to\ default\ width[0m
+ Test #224: fg.py ....................................***Failed
+Testing file pexpectsfg.py:[31mFailed to match pattern:[39m [1mSIGTSTP[0m
+ 96 - check-completions.fish (Failed)
+ 107 - complete.fish (Failed)
+ 160 - path.fish (Failed)
+ 193 - tmux-abbr.fish (Failed)
+ 194 - tmux-bind.fish (Failed)
+ 195 - tmux-complete.fish (Failed)
+ 196 - tmux-history-search.fish (Failed)
+ 197 - tmux-prompt.fish (Failed)
+ 223 - exit_nohang.py (Failed)
+ 224 - fg.py (Failed)
+ 225 - fkr.py (Failed)
+ 241 - terminal.py (Failed)
--
Gitblit v1.9.3