summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Tsoy <alexander@tsoy.me>2020-03-14 10:33:45 +0300
committerLars Wendler <polynomial-c@gentoo.org>2020-05-01 01:55:18 +0200
commit570aee4e7db0a9182bdca1e5cced4af0b5579e9c (patch)
tree01f124c60a67d71adbda1e60de0cdd1ea0c96bca /media-sound
parentapp-emulation/qemu: bump up to 5.0.0, bug #720138 (diff)
downloadgentoo-570aee4e7db0a9182bdca1e5cced4af0b5579e9c.tar.gz
gentoo-570aee4e7db0a9182bdca1e5cced4af0b5579e9c.tar.bz2
gentoo-570aee4e7db0a9182bdca1e5cced4af0b5579e9c.zip
media-sound/audacity: Fix building with -fno-common
Closes: https://bugs.gentoo.org/709840 Signed-off-by: Alexander Tsoy <alexander@tsoy.me> Closes: https://github.com/gentoo/gentoo/pull/14949 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/audacity/audacity-2.3.3.ebuild1
-rw-r--r--media-sound/audacity/files/audacity-2.3.3-fno-common.patch62
2 files changed, 63 insertions, 0 deletions
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild
index d72fafa615e9..0418e4cc8654 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -55,6 +55,7 @@ BDEPEND="app-arch/unzip
PATCHES=(
"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+ "${FILESDIR}"/${PN}-2.3.3-fno-common.patch
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
new file mode 100644
index 000000000000..5b922638aa5c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
@@ -0,0 +1,62 @@
+From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
+From: Leland Lucius <github@homerow.net>
+Date: Mon, 16 Dec 2019 00:59:33 -0600
+Subject: [PATCH] Misc changes to get new Nyquist to build
+
+[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d]
+---
+ lib-src/libnyquist/nyquist/cmt/cmtio.h | 4 ++--
+ lib-src/libnyquist/nyquist/cmt/userio.c | 4 ++++
+ lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++---
+ 3 files changed, 9 insertions(+), 5 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 */
+
+ /****************************************************************************
+ *
+diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c b/lib-src/libnyquist/nyquist/sys/unix/io.c
+index 21b2abed8..f3e499c0d 100644
+--- a/lib-src/libnyquist/nyquist/sys/unix/io.c
++++ b/lib-src/libnyquist/nyquist/sys/unix/io.c
+@@ -16,10 +16,10 @@
+ #include <sgtty.h>
+ #include "cext.h"
+
+-int IOinputfd; /* input file descriptor (usually 0) */
++extern int IOinputfd; /* input file descriptor (usually 0) */
+
+-int IOnochar; /* Value to be returned by IOgetchar()
+- where there is no input to be had */
++extern int IOnochar; /* Value to be returned by IOgetchar()
++ where there is no input to be had */
+
+ static struct sgttyb IOoldmodes, IOcurrentmodes;
+ /* Initial and current tty modes */
+--
+2.24.1
+