Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/openmw/, games-engines/openmw/files/
Date: Sun, 28 Aug 2022 00:10:13
Message-Id: 1661645320.59ff79ab1c87e63d8b6a6b5d9828f4bc48b56ec2.ionen@gentoo
1 commit: 59ff79ab1c87e63d8b6a6b5d9828f4bc48b56ec2
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 27 23:52:39 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 28 00:08:40 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ff79ab
7
8 games-engines/openmw: fix build with gcc12
9
10 Seeing users hit this, so fixing myself quick. Builds but not
11 thoroughly tested so there could be other issues.
12
13 Closes: https://bugs.gentoo.org/858725
14 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
15
16 .../openmw/files/openmw-0.47.0-gcc12.patch | 33 ++++++++++++++++++++++
17 games-engines/openmw/openmw-0.47.0-r1.ebuild | 3 +-
18 2 files changed, 35 insertions(+), 1 deletion(-)
19
20 diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc12.patch b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
21 new file mode 100644
22 index 000000000000..4c04d7b25c78
23 --- /dev/null
24 +++ b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
25 @@ -0,0 +1,33 @@
26 +Backport missing includes causing issues with gcc12.
27 +https://bugs.gentoo.org/858725
28 +https://gitlab.com/OpenMW/openmw/-/commit/5f2e282359
29 +From: elsid <elsid.mail@×××××.com>
30 +Date: Tue, 17 May 2022 00:58:24 +0200
31 +Subject: [PATCH] Add includes for used types and functions
32 +--- a/components/myguiplatform/myguidatamanager.cpp
33 ++++ b/components/myguiplatform/myguidatamanager.cpp
34 +@@ -1,8 +1,11 @@
35 + #include "myguidatamanager.hpp"
36 +
37 ++#include <memory>
38 ++#include <string>
39 ++
40 + #include <MyGUI_DataFileStream.h>
41 +
42 +-#include <boost/filesystem.hpp>
43 ++#include <boost/filesystem/operations.hpp>
44 + #include <boost/filesystem/fstream.hpp>
45 +
46 + #include <components/debug/debuglog.hpp>
47 +--- a/components/myguiplatform/myguidatamanager.hpp
48 ++++ b/components/myguiplatform/myguidatamanager.hpp
49 +@@ -3,6 +3,8 @@
50 +
51 + #include <MyGUI_DataManager.h>
52 +
53 ++#include <string>
54 ++
55 + namespace osgMyGUI
56 + {
57 +
58 +GitLab
59
60 diff --git a/games-engines/openmw/openmw-0.47.0-r1.ebuild b/games-engines/openmw/openmw-0.47.0-r1.ebuild
61 index 7dd2a4a0a958..0d9ccae64cb6 100644
62 --- a/games-engines/openmw/openmw-0.47.0-r1.ebuild
63 +++ b/games-engines/openmw/openmw-0.47.0-r1.ebuild
64 @@ -1,4 +1,4 @@
65 -# Copyright 1999-2021 Gentoo Authors
66 +# Copyright 1999-2022 Gentoo Authors
67 # Distributed under the terms of the GNU General Public License v2
68
69 EAPI=8
70 @@ -64,6 +64,7 @@ BDEPEND="
71 PATCHES=(
72 "${FILESDIR}"/openmw-0.47.0-mygui-license.patch
73 "${FILESDIR}"/openmw-0.47.0-sigstksz.patch
74 + "${FILESDIR}"/openmw-0.47.0-gcc12.patch
75 )
76
77 src_prepare() {