1 |
commit: 82797d77cac4993aec2a27bed2ac315d5c404a4b |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 30 19:57:11 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 30 19:57:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82797d77 |
7 |
|
8 |
games-action/xblast: tweak for gcc-10, bug #707470 |
9 |
|
10 |
Reported-by: Toralf Förster |
11 |
Closes: https://bugs.gentoo.org/707470 |
12 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
.../xblast/files/xblast-2.10.4-gcc-10.patch | 22 ++++++++++++++++++++++ |
16 |
games-action/xblast/xblast-2.10.4-r1.ebuild | 6 +++++- |
17 |
2 files changed, 27 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/games-action/xblast/files/xblast-2.10.4-gcc-10.patch b/games-action/xblast/files/xblast-2.10.4-gcc-10.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..01d6da9bd13 |
22 |
--- /dev/null |
23 |
+++ b/games-action/xblast/files/xblast-2.10.4-gcc-10.patch |
24 |
@@ -0,0 +1,22 @@ |
25 |
+--- a/cfg_control.h |
26 |
++++ b/cfg_control.h |
27 |
+@@ -29,7 +29,7 @@ |
28 |
+ #define NUM_KEYB_CONTROLS 2 |
29 |
+ |
30 |
+ /* constant assignment of control to event type */ |
31 |
+-const XBEventCode keyEventType[NUM_KEYB_CONTROLS]; |
32 |
++extern const XBEventCode keyEventType[NUM_KEYB_CONTROLS]; |
33 |
+ |
34 |
+ /* ingame controls for editing*/ |
35 |
+ typedef struct |
36 |
+--- a/network.h |
37 |
++++ b/network.h |
38 |
+@@ -105,7 +105,7 @@ typedef enum |
39 |
+ #define TEAM_UNDEF 252 |
40 |
+ |
41 |
+ /* team color assignment */ |
42 |
+-const XBColor teamColors[NUM_XBTS]; |
43 |
++extern const XBColor teamColors[NUM_XBTS]; |
44 |
+ |
45 |
+ /* results of game config receive/create */ |
46 |
+ typedef enum |
47 |
|
48 |
diff --git a/games-action/xblast/xblast-2.10.4-r1.ebuild b/games-action/xblast/xblast-2.10.4-r1.ebuild |
49 |
index 72666813a3c..3da27dd600a 100644 |
50 |
--- a/games-action/xblast/xblast-2.10.4-r1.ebuild |
51 |
+++ b/games-action/xblast/xblast-2.10.4-r1.ebuild |
52 |
@@ -1,4 +1,4 @@ |
53 |
-# Copyright 1999-2017 Gentoo Foundation |
54 |
+# Copyright 1999-2020 Gentoo Authors |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=6 |
58 |
@@ -32,6 +32,10 @@ RDEPEND=" |
59 |
DEPEND="${RDEPEND} |
60 |
x11-libs/libXt" |
61 |
|
62 |
+PATCHES=( |
63 |
+ "${FILESDIR}"/${P}-gcc-10.patch |
64 |
+) |
65 |
+ |
66 |
src_prepare() { |
67 |
default |