diff options
author | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2020-06-08 20:28:32 +0300 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2020-06-08 22:54:19 +0100 |
commit | 604c163d3a85f4de6a35bda75e77518060c3e7c8 (patch) | |
tree | 1f4abacc291f4b81acd575f3a075219a3cd02274 /games-puzzle/freesweep/files | |
parent | x11-misc/xkeyboard-config: Version bump to 2.30 (diff) | |
download | gentoo-604c163d3a85f4de6a35bda75e77518060c3e7c8.tar.gz gentoo-604c163d3a85f4de6a35bda75e77518060c3e7c8.tar.bz2 gentoo-604c163d3a85f4de6a35bda75e77518060c3e7c8.zip |
games-puzzle/freesweep: update to 1.0.1
Update to new version, fix gcc 10 compilation (#706910, patch taken from
https://github.com/rwestlund/freesweep/pull/8).
Closes: https://bugs.gentoo.org/706910
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-puzzle/freesweep/files')
-rw-r--r-- | games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch b/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch new file mode 100644 index 000000000000..4288c8b26a2c --- /dev/null +++ b/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch @@ -0,0 +1,39 @@ +From a86245df4f3ff276a393f799d737d28a5cb0a5a8 Mon Sep 17 00:00:00 2001 +From: Reiner Herrmann <reiner@reiner-h.de> +Date: Thu, 23 Apr 2020 00:46:58 +0200 +Subject: [PATCH] Fix build with GCC 10 + +mark variable declaration in sweep.h as extern, as otherwise +linker would complain about multiple definitions. +keep actual declaration in a C file. +--- + main.c | 2 ++ + sweep.h.in | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/main.c b/main.c +index 6411dcb..8d5cbe7 100644 +--- a/main.c ++++ b/main.c +@@ -10,6 +10,8 @@ + + #include "sweep.h" + ++DrawChars CharSet; ++ + int main(int argc, char** argv) + { + GameStats* Game; +diff --git a/sweep.h.in b/sweep.h.in +index f30c133..7f398de 100644 +--- a/sweep.h.in ++++ b/sweep.h.in +@@ -246,7 +246,7 @@ struct FileBuf + FILE* DebugLog; + #endif /* DEBUG_LOG */ + +-DrawChars CharSet; ++extern DrawChars CharSet; + + /* These are the functions defined in files.c */ + int SourceHomeFile(GameStats* Game); |