Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/quake2-icculus/files/, games-fps/quake2-icculus/
Date: Tue, 09 Feb 2021 16:59:51
Message-Id: 1612889962.fd2a72e2b447db3b0a3554f7b3918e7f63a9bedc.bkohler@gentoo
1 commit: fd2a72e2b447db3b0a3554f7b3918e7f63a9bedc
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Thu Feb 4 19:51:39 2021 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 9 16:59:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2a72e2
7
8 games-fps/quake2-icculus: Fix build with gcc-10
9
10 Closes: https://bugs.gentoo.org/733962
11 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
12 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
13
14 .../files/quake2-icculus-0.16.1-fno-common.patch | 10 ++++++++++
15 games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild | 3 ++-
16 2 files changed, 12 insertions(+), 1 deletion(-)
17
18 diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch
19 new file mode 100644
20 index 00000000000..8392ec63b78
21 --- /dev/null
22 +++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch
23 @@ -0,0 +1,10 @@
24 +--- a/src/client/client.h
25 ++++ b/src/client/client.h
26 +@@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27 + #ifdef QMAX
28 + #define random() ((rand () & 0x7fff) / ((float)0x7fff))
29 + #define crandom() (2.0 * (random() - 0.5))
30 +-vec3_t clientOrg; //lerped org of client for server->client side effects
31 +
32 + void vectoangles2 (vec3_t value1, vec3_t angles);
33 +
34
35 diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
36 index 13756e436dc..5a5e6b99431 100644
37 --- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
38 +++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
39 @@ -70,7 +70,8 @@ src_prepare() {
40 "${FILESDIR}"/${P}-x11_soft.patch \
41 "${FILESDIR}"/${P}-x11_mouse.patch \
42 "${FILESDIR}"/${P}-alsa.patch \
43 - "${FILESDIR}"/${P}-ia64.patch
44 + "${FILESDIR}"/${P}-ia64.patch \
45 + "${FILESDIR}"/${P}-fno-common.patch
46
47 if use xatrix ; then
48 epatch "${FILESDIR}/${P}"-gcc41.patch