<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bfaf4553947e5cb62ff681f389eedd4e02e3efb1">https://github.com/macports/macports-ports/commit/bfaf4553947e5cb62ff681f389eedd4e02e3efb1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bfaf4553947 fish: update to 3.2.2
</span>bfaf4553947 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bfaf4553947e5cb62ff681f389eedd4e02e3efb1
</span>Author: Tair Sabyrgaliyev <tair.sabirgaliev@gmail.com>
AuthorDate: Tue Apr 6 23:00:07 2021 +0600
<span style='display:block; white-space:pre;color:#404040;'> fish: update to 3.2.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - fix path variable,
</span><span style='display:block; white-space:pre;color:#404040;'> - remove failing tests,
</span><span style='display:block; white-space:pre;color:#404040;'> - add py39-pexpect test dependency,
</span><span style='display:block; white-space:pre;color:#404040;'> - use python3.9 for tests
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62422
</span>---
shells/fish/Portfile | 17 ++++++++----
shells/fish/files/patch-share_config_fish.diff | 10 +++----
.../fish/files/patch-tests-interactive-fish.diff | 32 ++++++++++++++++++++++
3 files changed, 48 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/Portfile b/shells/fish/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 328106672bb..5f92b1394e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/fish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup fish-shell fish-shell 3.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fish-shell fish-shell 3.2.2
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9cef0930c4e96852a4c8e8fe88d6d90972bc782d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3409808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e24a3f7a3b073bc9295e897bd3103f7ae33702f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5944da1a8893d11b0828a4fd9136ee174549daffb3d0adfdd8917856fe6b4009 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3411748
</span> use_xz yes
name fish
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +29,15 @@ depends_lib port:libiconv \
</span> port:ncurses \
port:gettext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-share_config_fish.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tests-interactive-fish.diff
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}/bin|g" "${worksrcpath}/share/config.fish"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # skip these 2 failing tests for now, future updates should try enabling them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename "${worksrcpath}/tests/checks/jobs.fish" "${worksrcpath}/tests/checks/jobs.fish.skip"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename "${worksrcpath}/tests/checks/sigint.fish" "${worksrcpath}/tests/checks/sigint.fish.skip"
</span> }
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +61,7 @@ platform darwin 8 {
</span> test.env-append SHELL=${prefix}/bin/bash
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_test-append port:expect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:py39-pexpect
</span> # other possible options are ansi, dtterm, rxvt, vt52, vt100, vt102, xterm
test.env-append TERM=nsterm
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-share_config_fish.diff b/shells/fish/files/patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ccfce88025..56c13ca66ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/fish/files/patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/fish/files/patch-share_config_fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- share/config.fish.orig 2020-02-12 14:04:07.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ share/config.fish 2020-02-27 11:44:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,6 +128,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and set PATH /usr/xpg4/bin $PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- share/config.fish.orig 2021-03-18 09:05:28.000000000 +0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ share/config.fish 2021-04-04 13:57:03.000000000 +0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,6 +96,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set -a fish_complete_path $__fish_data_dir/completions
</span> end
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +# MacPorts specific PATH setting, move ${prefix}/bin at PATH's head
+set MP_PREFIX @@PREFIX@@
+if contains $MP_PREFIX $PATH
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/fish/files/patch-tests-interactive-fish.diff b/shells/fish/files/patch-tests-interactive-fish.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..57ea575b4d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/fish/files/patch-tests-interactive-fish.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/interactive.fish.orig 2021-03-18 09:05:28.000000000 +0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/interactive.fish 2021-04-06 23:34:06.000000000 +0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat interactive.config >>$XDG_CONFIG_HOME/fish/config.fish
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ say -o cyan "Testing interactive functionality"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set python3 python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function test_pexpect_file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set -l file $argv[1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo -n "Testing file $file ... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set -lx fish_test_helper ../test/root/bin/fish_test_helper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note we require Python3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python3 $file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $python3 $file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set -l exit_status $status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,8 +62,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set failed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if not python3 -c 'import pexpect'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- say red "pexpect tests disabled: `python3 -c 'import pexpect'` failed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if not $python3 -c 'import pexpect'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ say red "pexpect tests disabled: `$python3 -c 'import pexpect'` failed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pexpect_files_to_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for i in $pexpect_files_to_test
</span></pre><pre style='margin:0'>
</pre>