Dominique Leuenberger 2020-04-04 10:19:32 +00:00 committed by Git OBS Bridge
commit 8f6b269730
3 changed files with 21 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 31 09:20:39 UTC 2020 - Simon Lees <sflees@suse.de>
- Fix build with gcc10 fix-gcc10-build.patch (boo#1167862)
- Use python3 rather then python2
-------------------------------------------------------------------
Mon Mar 16 14:09:10 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -24,6 +24,7 @@ License: GPL-2.0-only
Group: System/Shells
URL: https://fishshell.com/
Source: https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.gz
Patch0: fix-gcc10-build.patch
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: gcc-c++
@ -32,7 +33,7 @@ BuildRequires: groff
BuildRequires: ncurses-devel
BuildRequires: pcre2-devel >= 10.21
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: python3
Requires: bc
Requires: man
Recommends: terminfo
@ -52,6 +53,7 @@ This package contains development files for the fish shell.
%prep
%setup -q
%autopatch -p1
# fix E: env-script-interpreter
find share/tools -type f -name *.py -exec sed -i -r '1s|^#!%{_bindir}/env |#!%{_bindir}/|' {} +

12
fix-gcc10-build.patch Normal file
View File

@ -0,0 +1,12 @@
Index: fish-3.1.0/src/iothread.h
===================================================================
--- fish-3.1.0.orig/src/iothread.h
+++ fish-3.1.0/src/iothread.h
@@ -4,6 +4,7 @@
#include <pthread.h>
+#include <cstdint> // for uint64_t
#include <functional>
#include <type_traits>