[packages/fish] - updated to 3.6.4
hawk
hawk at pld-linux.org
Sun Dec 10 22:09:44 CET 2023
commit 6f894dc4038f714aff1e8f940dba8e67c771e01a
Author: Marcin Krol <hawk at tld-linux.org>
Date: Sun Dec 10 22:01:47 2023 +0100
- updated to 3.6.4
fish-no_lld.patch | 25 -------------------------
fish-rel_datadir.patch | 15 ---------------
fish.spec | 14 +++++---------
3 files changed, 5 insertions(+), 49 deletions(-)
---
diff --git a/fish.spec b/fish.spec
index 1dbc47a..6762104 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,14 +1,12 @@
Summary: fish - A friendly interactive shell
Summary(pl.UTF-8): fish - przyjazna interaktywna powłoka
Name: fish
-Version: 3.3.1
-Release: 4
+Version: 3.6.4
+Release: 1
License: GPL v2
Group: Applications/Shells
Source0: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 94be285255aadfcf0f910bdcc2f56073
-Patch0: %{name}-no_lld.patch
-Patch1: %{name}-rel_datadir.patch
+# Source0-md5: 600c5d8ffa45b1d73b5263809cb5e6f5
URL: http://fishshell.com/
BuildRequires: cmake >= 3.2
BuildRequires: gettext-tools
@@ -48,10 +46,8 @@ Pliki programistyczne dla fish.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' share/tools/{deroff.py,create_manpage_completions.py,web_config/webconfig.py}
+%{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' share/tools/create_manpage_completions.py
%build
%cmake -B build
@@ -98,7 +94,6 @@ end
%{_datadir}/%{name}/groff/fish.tmac
%dir %{_datadir}/%{name}/functions
%{_datadir}/%{name}/functions/*.fish
-%{_datadir}/%{name}/lynx.lss
%{_datadir}/%{name}/man
%dir %{_datadir}/%{name}/tools
%attr(755,root,root) %{_datadir}/%{name}/tools/create_manpage_completions.py
@@ -111,6 +106,7 @@ end
%{_datadir}/%{name}/tools/web_config/js
%{_datadir}/%{name}/tools/web_config/partials
%{_datadir}/%{name}/tools/web_config/sample_prompts
+%{_datadir}/%{name}/tools/web_config/themes
%attr(755,root,root) %{_datadir}/%{name}/tools/web_config/webconfig.py
%dir %{_datadir}/%{name}/vendor_completions.d
%dir %{_datadir}/%{name}/vendor_conf.d
diff --git a/fish-no_lld.patch b/fish-no_lld.patch
deleted file mode 100644
index 05863e9..0000000
--- a/fish-no_lld.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- fish-3.3.1/CMakeLists.txt.orig 2021-07-06 16:45:37.000000000 +0200
-+++ fish-3.3.1/CMakeLists.txt 2021-07-19 19:39:56.209238876 +0200
-@@ -56,22 +56,6 @@
- # 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/fish-rel_datadir.patch b/fish-rel_datadir.patch
deleted file mode 100644
index 1b2a55a..0000000
--- a/fish-rel_datadir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- fish-3.3.1/cmake/Install.cmake.orig 2021-07-06 16:45:37.000000000 +0200
-+++ fish-3.3.1/cmake/Install.cmake 2021-07-19 20:04:46.496541738 +0200
-@@ -14,7 +14,11 @@
- set(sysconfdir ${CMAKE_INSTALL_SYSCONFDIR})
- set(mandir ${CMAKE_INSTALL_MANDIR})
-
--set(rel_datadir ${CMAKE_INSTALL_DATADIR})
-+if(IS_ABSOLUTE ${CMAKE_INSTALL_DATADIR})
-+ file(RELATIVE_PATH rel_datadir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_DATADIR})
-+else()
-+ set(rel_datadir ${CMAKE_INSTALL_DATADIR})
-+endif()
- set(datadir ${CMAKE_INSTALL_FULL_DATADIR})
-
- set(docdir ${CMAKE_INSTALL_DOCDIR})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fish.git/commitdiff/6f894dc4038f714aff1e8f940dba8e67c771e01a
More information about the pld-cvs-commit
mailing list