Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package fish for openSUSE:Factory checked in 
at 2022-03-24 22:56:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fish (Old)
 and      /work/SRC/openSUSE:Factory/.fish.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fish"

Thu Mar 24 22:56:50 2022 rev:33 rq:963794 version:3.4.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/fish/fish.changes        2022-03-18 
16:41:27.577152265 +0100
+++ /work/SRC/openSUSE:Factory/.fish.new.1900/fish.changes      2022-03-24 
22:56:53.836186072 +0100
@@ -1,0 +2,5 @@
+Mon Mar 21 13:20:42 UTC 2022 - Matej Cepl <mc...@suse.com>
+
+- Add 8784-old-school-cmd-subst.patch fixing fish_title.fish
+
+-------------------------------------------------------------------

New:
----
  8784-old-school-cmd-subst.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fish.spec ++++++
--- /var/tmp/diff_new_pack.gk5brJ/_old  2022-03-24 22:56:54.448186674 +0100
+++ /var/tmp/diff_new_pack.gk5brJ/_new  2022-03-24 22:56:54.452186678 +0100
@@ -25,6 +25,9 @@
 URL:            https://fishshell.com/
 Source:         
https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.xz
 Source1:        
https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.xz.asc
+# PATCH-FIX-UPSTREAM 8784-old-school-cmd-subst.patch 
gh#fish-shell/fish-shell#8784 mc...@suse.com
+# Fix a syntax error (fish != bash)
+Patch0:         8784-old-school-cmd-subst.patch
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
@@ -52,7 +55,7 @@
 This package contains development files for the fish shell.
 
 %prep
-%setup -q
+%autosetup -p1
 
 # fix E: env-script-interpreter
 find share/tools -type f -name *.py -exec sed -i -r '1s|^#!%{_bindir}/env 
|#!%{_bindir}/|' {} +

++++++ 8784-old-school-cmd-subst.patch ++++++
>From 0c5a13346cd2a09125b3c24e24855723bca8679d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <fhomb...@gmail.com>
Date: Sun, 13 Mar 2022 20:00:02 +0100
Subject: [PATCH] Use old-school "()" command substitution in fish_title

Because we reload changed function files, a common issue on upgrading
to 3.4.0 is that fish_title causes errors.

So we simply use the oldschool syntax.
---
 share/functions/fish_title.fish |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/share/functions/fish_title.fish
+++ b/share/functions/fish_title.fish
@@ -4,7 +4,7 @@ function fish_title
         # If we're connected via ssh, we print the hostname.
         set -l ssh
         set -q SSH_TTY
-        and set ssh "[$(prompt_hostname | string sub -l 10)]"
+        and set ssh "["(prompt_hostname | string sub -l 10 | string collect)"]"
         # An override for the current command is passed as the first parameter.
         # This is used by `fg` to show the true process name, among others.
         if set -q argv[1]

Reply via email to