Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/files/, app-emulation/ski/
Date: Wed, 29 Jan 2020 20:16:43
Message-Id: 1580328992.8c07d209f2974a24906f4ac9bdddd48e0dc3b063.slyfox@gentoo
1 commit: 8c07d209f2974a24906f4ac9bdddd48e0dc3b063
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 29 20:15:59 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 29 20:16:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c07d209
7
8 app-emulation/ski: tweak for gcc-10
9
10 Reported-by: Toralf Förster
11 Closes: https://bugs.gentoo.org/707144
12 Package-Manager: Portage-2.3.86, Repoman-2.3.20
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 app-emulation/ski/files/ski-1.3.2-gcc-10.patch | 22 ++++++++++++++++++++++
16 app-emulation/ski/ski-1.3.2-r3.ebuild | 3 ++-
17 2 files changed, 24 insertions(+), 1 deletion(-)
18
19 diff --git a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
20 new file mode 100644
21 index 00000000000..bfe5de33acb
22 --- /dev/null
23 +++ b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
24 @@ -0,0 +1,22 @@
25 +--- a/src/linux/syscall-linux.c
26 ++++ b/src/linux/syscall-linux.c
27 +@@ -538,7 +538,7 @@ pid_t cons_pid = -1;
28 + static int cfd = -1;
29 + BOOL trace_syscalls;
30 + char *consLog = NULL;
31 +-extern BOOL noConsole;
32 ++BOOL noConsole;
33 + extern BOOL userint;
34 + static struct termios sane_ttyIos;
35 +
36 +--- a/src/platform.c
37 ++++ b/src/platform.c
38 +@@ -29,7 +29,7 @@
39 + #include "platform.h"
40 + #include "state.h"
41 +
42 +-BOOL autoAlloc, noConsole;
43 ++extern BOOL autoAlloc, noConsole;
44 + extern char *consLog;
45 + extern unsigned va_len, pa_len, rid_len, key_len;
46 + extern unsigned mips;
47
48 diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild
49 index 1063017aad0..e64df45c125 100644
50 --- a/app-emulation/ski/ski-1.3.2-r3.ebuild
51 +++ b/app-emulation/ski/ski-1.3.2-r3.ebuild
52 @@ -1,4 +1,4 @@
53 -# Copyright 1999-2019 Gentoo Authors
54 +# Copyright 1999-2020 Gentoo Authors
55 # Distributed under the terms of the GNU General Public License v2
56
57 EAPI=6
58 @@ -38,6 +38,7 @@ PATCHES=(
59 "${FILESDIR}"/${P}-ncurses-config.patch
60 "${FILESDIR}"/${P}-prototypes.patch
61 "${FILESDIR}"/${P}-glibc-2.28.patch
62 + "${FILESDIR}"/${P}-gcc-10.patch #707144
63 )
64
65 src_prepare() {