From 22e6b3db165e1e01d423ad69f44b51148e04bcca Mon Sep 17 00:00:00 2001 From: David Adam Date: Tue, 6 Jul 2021 22:18:40 +0800 Subject: [PATCH 1/4] Revert "CMake: bump minimum requirement to 3.5" This reverts commit 210dda2c4c0701658c2ad79fc65d813049ec1900. The patch release should not change the build requirements. --- CHANGELOG.rst | 2 +- CMakeLists.txt | 2 +- README.rst | 2 +- cmake/ConfigureChecks.cmake | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e358b23dd..de6e14bc4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -27,7 +27,7 @@ Improved terminal support For distributors ---------------- -- The minimum version of CMake required to build fish was raised to 3.5.0. +- *This placeholder silences a sphinx doc warning, so the last section is not empty.* -------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index fda837cd3..3913ab668 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.2) if(POLICY CMP0066) cmake_policy(SET CMP0066 OLD) diff --git a/README.rst b/README.rst index 4d63647d4..eaf8dd180 100644 --- a/README.rst +++ b/README.rst @@ -143,7 +143,7 @@ Dependencies Compiling fish requires: - a C++11 compiler (g++ 4.8 or later, or clang 3.3 or later) -- CMake (version 3.5 or later) +- CMake (version 3.2 or later) - a curses implementation such as ncurses (headers and libraries) - PCRE2 (headers and libraries) - a copy is included with fish - gettext (headers and libraries) - optional, for translation support diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 924c0a41d..a4c5efe42 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -56,6 +56,10 @@ endif() # Get threads. set(THREADS_PREFER_PTHREAD_FLAG ON) +# FindThreads < 3.4.0 doesn't work for C++-only projects +if(CMAKE_VERSION VERSION_LESS 3.4.0) + enable_language(C) +endif() find_package(Threads REQUIRED) # Detect WSL. Does not match against native Windows/WIN32. From 86a736df5727b349b7625f0adb6563a36cb43768 Mon Sep 17 00:00:00 2001 From: David Adam Date: Tue, 6 Jul 2021 22:19:22 +0800 Subject: [PATCH 2/4] Revert "CHANGELOG: add scaffolding for 3.4.0" This reverts commit 251fbc7260528971d542f7bdd0f9e4cd5970a706. The patch release will not include these major changes. --- CHANGELOG.rst | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index de6e14bc4..2adf91335 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,40 +1,6 @@ -fish 3.4.0 (released ???) -========================= - -Notable improvements and fixes ------------------------------- - -Deprecations and removed features ---------------------------------- - -Scripting improvements ----------------------- - -Interactive improvements ------------------------- - -New or improved bindings -^^^^^^^^^^^^^^^^^^^^^^^^ - -Improved prompts -^^^^^^^^^^^^^^^^ - -Completions -^^^^^^^^^^^ - -Improved terminal support -^^^^^^^^^^^^^^^^^^^^^^^^^ - -For distributors ----------------- -- *This placeholder silences a sphinx doc warning, so the last section is not empty.* - --------------- - fish 3.3.0 (released June 28, 2021) =================================== - Notable improvements and fixes ------------------------------ - ``fish_config`` gained a ``prompt`` subcommand to show and pick from the sample prompts directly in the terminal, instead of having to open a webbrowser. For example ``fish_config prompt choose default`` loads the default prompt in the current session (:issue:`7958`). From 61a637bcc587d21e027376dfffd3ed19e575860b Mon Sep 17 00:00:00 2001 From: David Adam Date: Tue, 6 Jul 2021 22:20:17 +0800 Subject: [PATCH 3/4] CHANGELOG: work on 3.3.1 --- CHANGELOG.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2adf91335..3befe7ee1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,17 @@ +fish 3.3.1 (released July XX, 2021) +================================== + +This release of fish fixes the following problems identified in fish 3.3.0: + +- The prompt and command line are redrawn correctly in response to universal variable changes (:issue:`8088`). +- A superfluous error that was produced when setting the ``PATH`` or ``CDPATH`` environment variables to include colon-delimited components that do not exist was removed (:issue:`8095`). +- The Vi mode indicator in the prompt is repainted correctly after :kbd:`Ctrl-C` cancels the current command (:issue:`8103`). +- fish builds correctly on platforms that do not have a ``spawn.h`` header, such as old versions of OS X (:issue:`8097`). + +A number of improvements to the documentation, and fixes for completions, are included as well. + +-------------- + fish 3.3.0 (released June 28, 2021) =================================== From b2f791b577e9041fbe28042771b80146849d37af Mon Sep 17 00:00:00 2001 From: David Adam Date: Tue, 6 Jul 2021 22:45:37 +0800 Subject: [PATCH 4/4] Release 3.3.1 Closes #8107. --- CHANGELOG.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3befe7ee1..6dff85c78 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,4 +1,4 @@ -fish 3.3.1 (released July XX, 2021) +fish 3.3.1 (released July 6, 2021) ================================== This release of fish fixes the following problems identified in fish 3.3.0: @@ -10,6 +10,8 @@ This release of fish fixes the following problems identified in fish 3.3.0: A number of improvements to the documentation, and fixes for completions, are included as well. +If you are upgrading from version 3.2.2 or before, please also review the release notes for 3.3.0 (included below). + -------------- fish 3.3.0 (released June 28, 2021)