diff options
| author |   Alexey Sokolov <sokolov@google.com> | 2020-10-05 23:29:47 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2020-10-15 18:53:00 +0000 |
| commit | ff03dd687e5d62846655e25595b50f72335ee296 (patch) | |
| tree | dd4e5b9eb46399336ff7266912daf539bb353263 /games-board/ace/files | |
| parent | games-board/biloba: xdg-utils -> xdg (diff) | |
| download | gentoo-ff03dd687e5d62846655e25595b50f72335ee296.tar.gz gentoo-ff03dd687e5d62846655e25595b50f72335ee296.tar.bz2 gentoo-ff03dd687e5d62846655e25595b50f72335ee296.zip | |
games-board/ace: fix build with gcc10
And a few more issues
Closes: https://bugs.gentoo.org/707228
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-board/ace/files')
| -rw-r--r-- | games-board/ace/files/ace-1.4-gcc10.patch | 16 | ||||
| -rw-r--r-- | games-board/ace/files/ace-1.4-malloc.patch | 10 |
2 files changed, 26 insertions, 0 deletions
diff --git a/games-board/ace/files/ace-1.4-gcc10.patch b/games-board/ace/files/ace-1.4-gcc10.patch new file mode 100644 index 000000000000..23324d585a04 --- /dev/null +++ b/games-board/ace/files/ace-1.4-gcc10.patch @@ -0,0 +1,16 @@ +Author: Reiner Herrmann <reiner@reiner-h.de> +Description: Fix FTBFS with GCC 10 + Use extern keyword, as linker otherwise sees multiple definitions. +Bug-Debian: https://bugs.debian.org/956976 + +--- a/lib/table.c ++++ b/lib/table.c +@@ -53,7 +53,7 @@ + static int graphics_disabled = 1; + + OptionDesc *app_options; +-OptionDesc *xwin_options; ++extern OptionDesc *xwin_options; + static OptionDesc *options[5]; + + static OptionDesc ace_options[] = { diff --git a/games-board/ace/files/ace-1.4-malloc.patch b/games-board/ace/files/ace-1.4-malloc.patch new file mode 100644 index 000000000000..da9b3b24f82c --- /dev/null +++ b/games-board/ace/files/ace-1.4-malloc.patch @@ -0,0 +1,10 @@ +Avoid warning about implicit malloc() + +diff -r 587fa6195b61 lib/imagelib.c +--- a/lib/imagelib.c Mon Oct 05 22:08:52 2020 +0000 ++++ b/lib/imagelib.c Mon Oct 05 22:09:12 2020 +0000 +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #include <stdio.h> + #include <string.h> + #include "imagelib.h" |