From 0dcd8a7ef1d3db45790faeaefe6438dbd2310dcb Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Sun, 2 Jan 2022 12:07:33 -0600 Subject: [PATCH] add upstream patch to fix compiling on GCC 10+ --- games-roguelike/angband/angband-4.1.3.ebuild | 5 ++++- .../angband/files/angband-4.1.3-gcc-10.patch | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 games-roguelike/angband/files/angband-4.1.3-gcc-10.patch diff --git a/games-roguelike/angband/angband-4.1.3.ebuild b/games-roguelike/angband/angband-4.1.3.ebuild index 1df5ea7..4d64818 100644 --- a/games-roguelike/angband/angband-4.1.3.ebuild +++ b/games-roguelike/angband/angband-4.1.3.ebuild @@ -37,7 +37,10 @@ DEPEND="${RDEPEND}" BDEPEND="dev-python/docutils virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${P}-tinfo.patch ) +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-gcc-10.patch +) src_prepare() { default diff --git a/games-roguelike/angband/files/angband-4.1.3-gcc-10.patch b/games-roguelike/angband/files/angband-4.1.3-gcc-10.patch new file mode 100644 index 0000000..4a221d0 --- /dev/null +++ b/games-roguelike/angband/files/angband-4.1.3-gcc-10.patch @@ -0,0 +1,21 @@ +diff -urN angband-4.1.3.orig/src/mon-blows.h angband-4.1.3/src/mon-blows.h +--- angband-4.1.3.orig/src/mon-blows.h 2018-07-21 23:49:08.000000000 -0500 ++++ angband-4.1.3/src/mon-blows.h 2022-01-02 12:04:52.000000000 -0600 +@@ -35,7 +35,7 @@ + struct blow_method *next; + }; + +-struct blow_method *blow_methods; ++extern struct blow_method *blow_methods; + + /** + * Storage for context information for effect handlers called in +@@ -76,7 +76,7 @@ + struct blow_effect *next; + }; + +-struct blow_effect *blow_effects; ++extern struct blow_effect *blow_effects; + + /* Functions */ + int blow_index(const char *name);