[audacity-freeworld] Fix gcc-10 compile issue

commit 2ab9b23cdc83a14a16833ae7b20dbe4bcf133c06 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Thu Mar 26 08:15:23 2020 +0000 Fix gcc-10 compile issue Fix-gcc-10-compile-issue.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ audacity-freeworld.spec | 8 +++++++- 2 files changed, 49 insertions(+), 1 deletion(-) --- diff --git a/Fix-gcc-10-compile-issue.patch b/Fix-gcc-10-compile-issue.patch new file mode 100644 index 0000000..fb096cb --- /dev/null +++ b/Fix-gcc-10-compile-issue.patch @@ -0,0 +1,42 @@ +From 0d5b600c7551e653cb84a661606ae55bd6cddbdd Mon Sep 17 00:00:00 2001 +From: leigh123linux <leigh123linux(a)googlemail.com&gt; +Date: Thu, 26 Mar 2020 08:12:17 +0000 +Subject: [PATCH] Fix gcc-10 compile issue + +--- + lib-src/libnyquist/nyquist/cmt/cmtio.h | 4 ++-- + lib-src/libnyquist/nyquist/cmt/userio.c | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h b/lib-src/libnyquist/nyquist/cmt/cmtio.h +index 3e50ad957..232862b50 100644 +--- a/lib-src/libnyquist/nyquist/cmt/cmtio.h ++++ b/lib-src/libnyquist/nyquist/cmt/cmtio.h +@@ -1,7 +1,7 @@ + #define NOCHAR -2 + +-int IOinputfd; +-int IOnochar; ++extern int IOinputfd; ++extern int IOnochar; + + int IOsetup(int inputfd); + int IOcleanup(void); +diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c b/lib-src/libnyquist/nyquist/cmt/userio.c +index f442376c5..a33ac98c9 100644 +--- a/lib-src/libnyquist/nyquist/cmt/userio.c ++++ b/lib-src/libnyquist/nyquist/cmt/userio.c +@@ -153,6 +153,10 @@ extern int debug; + #include "xlisp.h" + #endif + ++int IOinputfd; /* input file descriptor (usually 0) */ ++ ++int IOnochar; /* Value to be returned by IOgetchar() ++ where there is no input to be had */ + + /**************************************************************************** + * +-- +2.26.0.rc2 + diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index 221e707..b2daa09 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -9,7 +9,7 @@ Name: audacity-freeworld Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multitrack audio editor License: GPLv2 URL: https://www.audacityteam.org @@ -35,6 +35,8 @@ Patch2: audacity-2.3.3-libdir.patch # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature Patch3: audacity-2.0.2-desktop.in.patch Patch4: audacity-2.0.6-non-dl-ffmpeg.patch +# Based on https://github.com/audacity/audacity/commit/bd6ec9c0ed9fe94ae2f6e171969ae... +Patch5: Fix-gcc-10-compile-issue.patch Provides: audacity-nonfree = %{version}-%{release} Obsoletes: audacity-nonfree < %{version}-%{release} @@ -124,6 +126,7 @@ grep -q -s libmp3lame.so\| * -R && exit 1 %patch3 -p1 -b .desktop %patch4 -p1 -b .non-dl-ffmpeg +%patch5 -p1 -b .gcc10 %build @@ -247,6 +250,9 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt %changelog +* Thu Mar 26 2020 leigh123linux <leigh123linux(a)googlemail.com&gt; - 2.3.3-3 +- Fix gcc-10 compile issue + * Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild