From b82d791403c5b227e30387e72cd4a310efe8ab0f73368aab9575ad8d2b9a342f Mon Sep 17 00:00:00 2001
From: Simon Lees <simonf.lees@suse.com>
Date: Tue, 31 Mar 2020 09:41:37 +0000
Subject: [PATCH] Accepting request 790050 from
 home:simotek:branches:shells:fish2

- Fix build with gcc10 fix-gcc10-build.patch (boo#1167862)
- Use python3 rather then python2

OBS-URL: https://build.opensuse.org/request/show/790050
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=48
---
 fish.changes          |  6 ++++++
 fish.spec             |  4 +++-
 fix-gcc10-build.patch | 12 ++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 fix-gcc10-build.patch

diff --git a/fish.changes b/fish.changes
index 74d53a3..3594716 100644
--- a/fish.changes
+++ b/fish.changes
@@ -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>
 
diff --git a/fish.spec b/fish.spec
index 0ba2f11..05489a7 100644
--- a/fish.spec
+++ b/fish.spec
@@ -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}/|' {} +
diff --git a/fix-gcc10-build.patch b/fix-gcc10-build.patch
new file mode 100644
index 0000000..c1a79d1
--- /dev/null
+++ b/fix-gcc10-build.patch
@@ -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>
+