1 |
commit: 570aee4e7db0a9182bdca1e5cced4af0b5579e9c |
2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
3 |
AuthorDate: Sat Mar 14 07:33:45 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 23:55:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570aee4e |
7 |
|
8 |
media-sound/audacity: Fix building with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/709840 |
11 |
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/14949 |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
media-sound/audacity/audacity-2.3.3.ebuild | 1 + |
16 |
.../audacity/files/audacity-2.3.3-fno-common.patch | 62 ++++++++++++++++++++++ |
17 |
2 files changed, 63 insertions(+) |
18 |
|
19 |
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild |
20 |
index d72fafa615e..0418e4cc865 100644 |
21 |
--- a/media-sound/audacity/audacity-2.3.3.ebuild |
22 |
+++ b/media-sound/audacity/audacity-2.3.3.ebuild |
23 |
@@ -55,6 +55,7 @@ BDEPEND="app-arch/unzip |
24 |
|
25 |
PATCHES=( |
26 |
"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch |
27 |
+ "${FILESDIR}"/${PN}-2.3.3-fno-common.patch |
28 |
) |
29 |
|
30 |
src_prepare() { |
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 00000000000..5b922638aa5 |
35 |
--- /dev/null |
36 |
+++ b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch |
37 |
@@ -0,0 +1,62 @@ |
38 |
+From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001 |
39 |
+From: Leland Lucius <github@×××××××.net> |
40 |
+Date: Mon, 16 Dec 2019 00:59:33 -0600 |
41 |
+Subject: [PATCH] Misc changes to get new Nyquist to build |
42 |
+ |
43 |
+[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d] |
44 |
+--- |
45 |
+ lib-src/libnyquist/nyquist/cmt/cmtio.h | 4 ++-- |
46 |
+ lib-src/libnyquist/nyquist/cmt/userio.c | 4 ++++ |
47 |
+ lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++--- |
48 |
+ 3 files changed, 9 insertions(+), 5 deletions(-) |
49 |
+ |
50 |
+diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h b/lib-src/libnyquist/nyquist/cmt/cmtio.h |
51 |
+index 3e50ad957..232862b50 100644 |
52 |
+--- a/lib-src/libnyquist/nyquist/cmt/cmtio.h |
53 |
++++ b/lib-src/libnyquist/nyquist/cmt/cmtio.h |
54 |
+@@ -1,7 +1,7 @@ |
55 |
+ #define NOCHAR -2 |
56 |
+ |
57 |
+-int IOinputfd; |
58 |
+-int IOnochar; |
59 |
++extern int IOinputfd; |
60 |
++extern int IOnochar; |
61 |
+ |
62 |
+ int IOsetup(int inputfd); |
63 |
+ int IOcleanup(void); |
64 |
+diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c b/lib-src/libnyquist/nyquist/cmt/userio.c |
65 |
+index f442376c5..a33ac98c9 100644 |
66 |
+--- a/lib-src/libnyquist/nyquist/cmt/userio.c |
67 |
++++ b/lib-src/libnyquist/nyquist/cmt/userio.c |
68 |
+@@ -153,6 +153,10 @@ extern int debug; |
69 |
+ #include "xlisp.h" |
70 |
+ #endif |
71 |
+ |
72 |
++int IOinputfd; /* input file descriptor (usually 0) */ |
73 |
++ |
74 |
++int IOnochar; /* Value to be returned by IOgetchar() |
75 |
++ where there is no input to be had */ |
76 |
+ |
77 |
+ /**************************************************************************** |
78 |
+ * |
79 |
+diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c b/lib-src/libnyquist/nyquist/sys/unix/io.c |
80 |
+index 21b2abed8..f3e499c0d 100644 |
81 |
+--- a/lib-src/libnyquist/nyquist/sys/unix/io.c |
82 |
++++ b/lib-src/libnyquist/nyquist/sys/unix/io.c |
83 |
+@@ -16,10 +16,10 @@ |
84 |
+ #include <sgtty.h> |
85 |
+ #include "cext.h" |
86 |
+ |
87 |
+-int IOinputfd; /* input file descriptor (usually 0) */ |
88 |
++extern int IOinputfd; /* input file descriptor (usually 0) */ |
89 |
+ |
90 |
+-int IOnochar; /* Value to be returned by IOgetchar() |
91 |
+- where there is no input to be had */ |
92 |
++extern int IOnochar; /* Value to be returned by IOgetchar() |
93 |
++ where there is no input to be had */ |
94 |
+ |
95 |
+ static struct sgttyb IOoldmodes, IOcurrentmodes; |
96 |
+ /* Initial and current tty modes */ |
97 |
+-- |
98 |
+2.24.1 |
99 |
+ |