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-arcade/cavezofphear/files/, games-arcade/cavezofphear/
Date: Sun, 18 Oct 2020 14:06:12
Message-Id: 1603029963.5d8bf83756a2536d0b445f49066de3708fa93fee.slyfox@gentoo
1 commit: 5d8bf83756a2536d0b445f49066de3708fa93fee
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 18 14:05:50 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 18 14:06:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8bf837
7
8 games-arcade/cavezofphear: tweak for -fno-common
9
10 Reported-by: Toralf Förster
11 Closes: https://bugs.gentoo.org/706880
12 Package-Manager: Portage-3.0.8, Repoman-3.0.1
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 .../cavezofphear/cavezofphear-0.5.1.ebuild | 3 ++-
16 .../files/cavezofphear-0.5.1-no-common.patch | 23 ++++++++++++++++++++++
17 2 files changed, 25 insertions(+), 1 deletion(-)
18
19 diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
20 index 459bd6d3f2a..1069f5a9ce3 100644
21 --- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
22 +++ b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 +# Copyright 1999-2020 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=5
29 @@ -20,6 +20,7 @@ S=${WORKDIR}/${P/cavezof/}
30
31 src_prepare() {
32 epatch "${FILESDIR}"/${P}-gentoo.patch
33 + epatch "${FILESDIR}"/${P}-no-common.patch
34 sed -i \
35 -e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
36 src/{chk.c,main.c,gplot.c} \
37
38 diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
39 new file mode 100644
40 index 00000000000..4cc9bb5be02
41 --- /dev/null
42 +++ b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
43 @@ -0,0 +1,23 @@
44 +https://bugs.gentoo.org/706880
45 +--- a/src/editor.c
46 ++++ b/src/editor.c
47 +@@ -24,7 +24,7 @@
48 + #include "common.h"
49 + #include "proto.h"
50 +
51 +-char map[MAP_YSIZE][MAP_XSIZE];
52 ++extern char map[MAP_YSIZE][MAP_XSIZE];
53 + int lock;
54 + int last_obj;
55 +
56 +--- a/src/frame.c
57 ++++ b/src/frame.c
58 +@@ -26,7 +26,7 @@ void bail(char *message);
59 + void sigint_handler();
60 + void sigwinch_handler();
61 +
62 +-int need_refresh;
63 ++extern int need_refresh;
64 +
65 + void curses_start(void)
66 + {