Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/, games-roguelike/angband/files/
Date: Sat, 29 Feb 2020 11:40:27
Message-Id: 1582976407.03c993729b80cc6835e8213ef80265b3b02e5305.slyfox@gentoo
1 commit: 03c993729b80cc6835e8213ef80265b3b02e5305
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 29 11:39:27 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 29 11:40:07 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c99372
7
8 games-roguelike/angband: tweak for gcc-10, bug #707770
9
10 Closes: https://bugs.gentoo.org/707770
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 games-roguelike/angband/angband-4.2.0.ebuild | 4 +++-
15 .../angband/files/angband-4.2.0-gcc-10.patch | 22 ++++++++++++++++++++++
16 2 files changed, 25 insertions(+), 1 deletion(-)
17
18 diff --git a/games-roguelike/angband/angband-4.2.0.ebuild b/games-roguelike/angband/angband-4.2.0.ebuild
19 index acb1f3d093c..f9dfb300662 100644
20 --- a/games-roguelike/angband/angband-4.2.0.ebuild
21 +++ b/games-roguelike/angband/angband-4.2.0.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2019 Gentoo Authors
24 +# Copyright 1999-2020 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28 @@ -48,6 +48,8 @@ RDEPEND="X? (
29 DEPEND="${RDEPEND}"
30 BDEPEND="virtual/pkgconfig"
31
32 +PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
33 +
34 src_prepare() {
35 default
36
37
38 diff --git a/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch b/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch
39 new file mode 100644
40 index 00000000000..6aeb1f7a204
41 --- /dev/null
42 +++ b/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch
43 @@ -0,0 +1,22 @@
44 +https://bugs.gentoo.org/707770
45 +
46 +--- a/src/mon-blows.h
47 ++++ b/src/mon-blows.h
48 +@@ -41,7 +41,7 @@ struct blow_method {
49 + struct blow_method *next;
50 + };
51 +
52 +-struct blow_method *blow_methods;
53 ++extern struct blow_method *blow_methods;
54 +
55 + /**
56 + * Storage for context information for effect handlers called in
57 +@@ -83,7 +83,7 @@ struct blow_effect {
58 + struct blow_effect *next;
59 + };
60 +
61 +-struct blow_effect *blow_effects;
62 ++extern struct blow_effect *blow_effects;
63 +
64 + /* Functions */
65 + int blow_index(const char *name);