From 0f034a8c30da7426e76ea76c5be5e7899442d33c Mon Sep 17 00:00:00 2001
From: etcusrvar <etcusrvar@users.noreply.github.com>
Date: Sun, 29 Aug 2021 03:36:09 -0500
Subject: [PATCH] feat: Update fish to 3.3.1 (#4815)

* feat: Update fish to 3.3.1

* Add fish license file and fix evansport build

The evansport can't find pthreads.h error is actually a broken gold linker

Co-authored-by: Sebastian Schmidt <publicarray@users.noreply.github.com>
---
 cross/fish/Makefile                           |  2 +-
 cross/fish/digests                            |  6 ++---
 .../i686/001-cmake-remove-gold-linker.patch   | 24 +++++++++++++++++++
 spk/fish/Makefile                             |  7 +++---
 4 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 cross/fish/patches/i686/001-cmake-remove-gold-linker.patch

diff --git a/cross/fish/Makefile b/cross/fish/Makefile
index 723a6b7e161..0bdf889c27c 100644
--- a/cross/fish/Makefile
+++ b/cross/fish/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = fish
-PKG_VERS = 3.2.2
+PKG_VERS = 3.3.1
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/fish-shell/fish-shell/releases/download/$(PKG_VERS)
diff --git a/cross/fish/digests b/cross/fish/digests
index dd8edc2d24e..7722840a35d 100644
--- a/cross/fish/digests
+++ b/cross/fish/digests
@@ -1,3 +1,3 @@
-fish-3.2.2.tar.xz SHA1 a30b2d21ebec63a00282181b8660224ce71edbad
-fish-3.2.2.tar.xz SHA256 5944da1a8893d11b0828a4fd9136ee174549daffb3d0adfdd8917856fe6b4009
-fish-3.2.2.tar.xz MD5 606253699ce41991b03a93bcc6047d51
+fish-3.3.1.tar.xz SHA1 2a220f67b8eee0e0f2439411e9cc6c0320970caa
+fish-3.3.1.tar.xz SHA256 b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89
+fish-3.3.1.tar.xz MD5 94be285255aadfcf0f910bdcc2f56073
diff --git a/cross/fish/patches/i686/001-cmake-remove-gold-linker.patch b/cross/fish/patches/i686/001-cmake-remove-gold-linker.patch
new file mode 100644
index 00000000000..6023190f86f
--- /dev/null
+++ b/cross/fish/patches/i686/001-cmake-remove-gold-linker.patch
@@ -0,0 +1,24 @@
+--- fish-3.2.0/CMakeLists.txt   2021-03-01 23:47:02.000000000 +1100
++++ ./CMakeLists.txt    2021-04-10 13:12:07.280990507 +1000
+@@ -51,22 +51,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
+ # Disable exception handling.
+ add_compile_options(-fno-exceptions)
+
+-# Prefer lld or the gold linker because they don't emit useless warnings about sys_nerr and
+-# _sys_errlist. They're also faster (significantly so in the case of lld).
+-if (UNIX)
+-    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version
+-        ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+-    if ("${LD_VERSION}" MATCHES "LLD ")
+-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+-    elseif (NOT APPLE)
+-        execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
+-            ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+-        if ("${LD_VERSION}" MATCHES "GNU gold")
+-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
+-        endif()
+-    endif()
+-endif()
+-
+ # Hide the CMake Rules directories in Xcode projects.
+ source_group("CMake Rules" REGULAR_EXPRESSION "^$")
diff --git a/spk/fish/Makefile b/spk/fish/Makefile
index 50d3bd54714..908476556ee 100644
--- a/spk/fish/Makefile
+++ b/spk/fish/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = fish
-SPK_VERS = 3.2.2
-SPK_REV = 3
+SPK_VERS = 3.3.1
+SPK_REV = 4
 SPK_ICON = src/ascii_fish.png
 
 DEPENDS = cross/fish
@@ -12,10 +12,11 @@ DESCRIPTION = fish is a smart and user-friendly command line shell for Linux, ma
 RELOAD_UI = no
 DISPLAY_NAME = fish
 STARTABLE = no
-CHANGELOG = "1. Update to 3.2.0<br/>2. Use ncursesw instead of ncurses"
+CHANGELOG = "1. Update to 3.3.1"
 
 HOMEPAGE = https://fishshell.com
 LICENSE = Custom
+LICENSE_FILE = $(WORK_DIR)/$(SPK_NAME)-$(SPK_VERS)/doc_src/license.rst
 
 SERVICE_SETUP = src/service-setup.sh