Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/files/, games-rpg/manaplus/
Date: Thu, 30 Jun 2022 21:32:44
Message-Id: 1656624750.c4dc15f9ab3eeea684ffc0f4a322ae231bf730e1.sam@gentoo
1 commit: c4dc15f9ab3eeea684ffc0f4a322ae231bf730e1
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 21:18:43 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 21:32:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4dc15f9
7
8 games-rpg/manaplus: fix build with GCC 12
9
10 Closes: https://bugs.gentoo.org/855212
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch | 13 +++++++++++++
14 games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild | 4 ++++
15 2 files changed, 17 insertions(+)
16
17 diff --git a/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch
18 new file mode 100644
19 index 000000000000..5ded1f0fa9d5
20 --- /dev/null
21 +++ b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch
22 @@ -0,0 +1,13 @@
23 +https://bugs.gentoo.org/855212
24 +--- a/src/resources/wallpaper.cpp
25 ++++ b/src/resources/wallpaper.cpp
26 +@@ -38,9 +38,7 @@
27 + #include <sys/time.h>
28 + #endif // WIN32
29 +
30 +-#ifdef __clang__
31 + #include <ctime>
32 +-#endif // __clang__
33 +
34 + #include "debug.h"
35 +
36
37 diff --git a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
38 index 6c1d04cbb663..f481e1cd9b21 100644
39 --- a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
40 +++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
41 @@ -55,6 +55,10 @@ DEPEND="${RDEPEND}
42 virtual/pkgconfig
43 nls? ( sys-devel/gettext )"
44
45 +PATCHES=(
46 + "${FILESDIR}"/${PN}-1.9.3.23-gcc12-time.patch
47 +)
48 +
49 src_prepare() {
50 default