From 1d41bd00c2886611e6a1c0a82ba21b13576e491c Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Mar 13 2021 18:23:44 +0000 Subject: Update to 3.2.0 Resolves: #1933886 --- diff --git a/.gitignore b/.gitignore index a10b08a..f795c0a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /fish-3.1.0.tar.gz.asc /fish-3.1.2.tar.gz /fish-3.1.2.tar.gz.asc +/fish-3.2.0.tar.xz +/fish-3.2.0.tar.xz.asc diff --git a/0001-fd_monitor-Explicity-include-thread.patch b/0001-fd_monitor-Explicity-include-thread.patch new file mode 100644 index 0000000..43d8100 --- /dev/null +++ b/0001-fd_monitor-Explicity-include-thread.patch @@ -0,0 +1,27 @@ +From 955c0003ca923dea76e9c953cda871d4209f028b Mon Sep 17 00:00:00 2001 +From: Fabian Homborg +Date: Tue, 2 Mar 2021 15:27:13 +0100 +Subject: [PATCH] fd_monitor: Explicity include + +Might fix issues with gcc 11.0.1. + +See #7764. +--- + src/fd_monitor.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/fd_monitor.cpp b/src/fd_monitor.cpp +index a55e9c55f..2ed2ca4de 100644 +--- a/src/fd_monitor.cpp ++++ b/src/fd_monitor.cpp +@@ -4,6 +4,7 @@ + #include "fd_monitor.h" + + #include ++#include //this_thread::sleep_for + + #include "flog.h" + #include "io.h" +-- +2.29.2 + diff --git a/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch b/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch new file mode 100644 index 0000000..8d8591f --- /dev/null +++ b/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch @@ -0,0 +1,49 @@ +From 29ebd4a5ff5c0a0eefe802a4bcaa8ef32cc5795a Mon Sep 17 00:00:00 2001 +From: Fabian Homborg +Date: Sat, 13 Mar 2021 17:22:35 +0100 +Subject: [PATCH] tests: Don't break when a file unexpectedly exists + +Creating a file called "xfoo" could break the highlight tests because +we'd suddenly get a color with valid_path set to true. + +So what we do is simply compare foreground/background and forced +underline, but only check for path validity if we're expecting a valid +path. + +If we're not expecting a valid path, we don't fail whether it is there +or not. + +This means that we can't check for a non-valid path, but we don't +currently do that anyway and we can just burn that bridge when we get +to it. + +cc @siteshwar @krobelus, who both came across this +--- + src/fish_tests.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp +index 5f57f9e64..3f7777138 100644 +--- a/src/fish_tests.cpp ++++ b/src/fish_tests.cpp +@@ -5386,7 +5386,16 @@ static void test_highlighting() { + // Hackish space handling. We don't care about the colors in spaces. + if (text.at(i) == L' ') continue; + +- if (expected_colors.at(i) != colors.at(i)) { ++ auto e = expected_colors.at(i); ++ auto c = colors.at(i); ++ // Compare the colors, but don't care about pathness ++ // unless we're asking for a valid path. ++ // ++ // That way stray files in the build directory don't break the test. ++ if (e.foreground != c.foreground ++ || e.background != c.background ++ || e.force_underline != c.force_underline ++ || (e.valid_path && !c.valid_path)) { + const wcstring spaces(i, L' '); + err(L"Wrong color in test at index %lu in text (expected %#x, actual " + L"%#x):\n%ls\n%ls^", +-- +2.29.2 + diff --git a/fish.spec b/fish.spec index 3e83b87..5f2860c 100644 --- a/fish.spec +++ b/fish.spec @@ -1,6 +1,6 @@ Name: fish -Version: 3.1.2 -Release: 6%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Friendly interactive shell # GPLv2 @@ -24,10 +24,19 @@ Summary: Friendly interactive shell # - user_doc/html/_static/underscore.js License: GPLv2 and BSD and ISC and LGPLv2+ and MIT URL: https://fishshell.com -Source0: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.gz.asc +Source0: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg +# Remove below patch when rebasing to next minor release +# https://src.fedoraproject.org/rpms/fish/pull-request/6#comment-69933 +# https://github.com/fish-shell/fish-shell/commit/29ebd4a5ff5c0a0eefe802a4bcaa8ef32cc5795a +Patch101: 0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch + +# Remove below patch when rebasing to next minor release +# https://github.com/fish-shell/fish-shell/commit/955c0003ca923dea76e9c953cda871d4209f028b +Patch102: 0001-fd_monitor-Explicity-include-thread.patch + BuildRequires: cmake >= 3.2 BuildRequires: ninja-build BuildRequires: gcc @@ -85,8 +94,8 @@ sed -i 's^/usr/local/^/usr/^g' %{_vpath_builddir}/*.pc %py_byte_compile %{python3} %{buildroot}%{_datadir}/%{name}/tools/ # Install docs from tarball root -cp -a README.md %{buildroot}%{_pkgdocdir} -cp -a CONTRIBUTING.md %{buildroot}%{_pkgdocdir} +cp -a README.rst %{buildroot}%{_pkgdocdir} +cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir} %find_lang %{name} @@ -118,8 +127,14 @@ fi %{_datadir}/fish/ %{_datadir}/pkgconfig/fish.pc %{_pkgdocdir} +%{_datadir}/applications/fish.desktop +%{_datadir}/pixmaps/fish.png %changelog +* Sat Mar 13 2021 Siteshwar Vashisht - 3.2.0-1 +- Update to 3.2.0 + Resolves: #1933886 + * Tue Jan 26 2021 Fedora Release Engineering - 3.1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 5f8846f..baa6c7d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fish-3.1.2.tar.gz) = b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 -SHA512 (fish-3.1.2.tar.gz.asc) = ebfc1d4b7ef3db0d11ef59019bbe2e742adf368dfaa28f630c7982b957f4069d6aee70a856d4c922e554ff19ad9fec54554486cd03c3c463d9dd8c35c8e7680c +SHA512 (fish-3.2.0.tar.xz.asc) = cfa8f3f0463fc60e340ddf17848f5ef94acbb8aece0a5629a4cb846affbaa563052ae65e0505fb3c632136a1cc771023496720e6a28a94122dd133221cbe7072 +SHA512 (fish-3.2.0.tar.xz) = 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face