gentoo auto-resync : 28:08:2022 - 02:55:12

5 files changed, 38 insertions, 7 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 9a5f3799997e..e3d461e8ec70 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 057813593c6d..da29d5349e65 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,7 +1,8 @@
+AUX openmw-0.47.0-gcc12.patch 873 BLAKE2B 88f9176278d90410322d3509ead43bc7315d4afe6f258dde8b5c66f0f0d2b97d03001638b6ef35223f1e1347d5f6fc492f8affcdca1a7e9ffabbd6adddccff0f SHA512 81b9c40721ea5b27e825f412a3f80aba94a9131df7c9bf8ad490228d6efbf85e5e4a58a8c7654ed784ef085bc3591e1ccfe35c99de43c1e784ed502c54e8380e
 AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9def640457bcc8ce9df842e4423e8fe9634f7069a820602710fe4315d06801159aff53520843f92155865d294234f4712fed7 SHA512 fb156f963aa103fc04b515faec0ef536e47da78da9ee5fbc2cc4ccaa51d382a229d3ee8a07b007d34442200834a9aba41489cea85e90c73f9acc6943e2274079
 AUX openmw-0.47.0-sigstksz.patch 1409 BLAKE2B f023d8fa0a0e9dd31c0621bad330ed9620983ceac6eed026b5a7f4790a183d222e34e1e91a3e74bad706040ed2e61079650ae4333261095b0e53d3d475dc51cb SHA512 396c47070ed609bae2c8e09d6bc51c45c9fa6158cd8450cf7110f133d07fdc2e82d736b93e4342a982a8cb80080fcc2e005cd4239a246997526d4a114255b974
 DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B 40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d SHA512 517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
 DIST openmw-template-8966dab24692555eec720c854fb0f73d108070cd.omwgame 139730 BLAKE2B bf7f96912fd828078c62d112f3ff83e9a35298516135fb46b15ed01fc0260247cc0cba4aa3bbc55bf6a688f216384dbd9a5aa3328c4387b9b180b80f7463963e SHA512 6e38642bcf013c5f496a9cb0bf3ec7c9553b6e86b836e7844824c5a05f556c9391167214469b6318401684b702d7569896bf743c85aee4198612b3315ba778d6
-EBUILD openmw-0.47.0-r1.ebuild 3610 BLAKE2B ead1421432bb03e0ce690973bd077b62ae29197ad264022178b7ea8e26828ce75f11c3faa0b3462792de05b0ba576a33dbebc2ae4d51de037307b8ef8eccafdc SHA512 2eb1b7ec1fbe8617a7863560a88c7defdca367117e12b6808591a4b09c6ef17e091e062c868ff67a85dcda40e54cb36281ac43bf745b68a4daa9b72edcb9698c
-EBUILD openmw-9999.ebuild 4441 BLAKE2B ec87f644a2e68da3cea3c9ba8d617e7d8939eb4bc86aa52bd9a561a4bbdad7e7c764127bdf8d5ba93caf10cc7d8f276a875785f5952667458c5cb9b2977c428a SHA512 6e66f9981e0090568dbaa3ed23b26131675cb326f2987180a1aa30de0e76eb3a6f928f2e0ed8a79674961cc5905e7a7958868ac73400dc5c4839866350cf38f1
+EBUILD openmw-0.47.0-r1.ebuild 3651 BLAKE2B 03181e20d1f2a2d50b0736c352a81c7ea6d5ea4431f5e66a31bbb6785f011471da831bce219101e6a8daa33604bb18c980ff7809daab2239bd0b2c1fcb3dcd65 SHA512 22e022519ba040b160c043554eb2e64a82d6154f1ee6ac176bad6c341b9b34cbb6ecf28228521b38697219cefbaaa046f7cf4750041ee36e91b5a373fefef0b1
+EBUILD openmw-9999.ebuild 4379 BLAKE2B 34c21ecb980117464d6a7f1c8eaa8e267b975f1def93861170fad27c93a6783d2d1d9a6dfafc067cf0bc96ef4a0c576d47bb4bf900c1f8352953c558e75f8c3d SHA512 889eba9283329b5c15651fc20c3c3c12bfb6dea360f1555a3bbd09be671431146fdc5e84969a28acc1f7011b650db43e1e5e8620dbfef372ab6aed814484718d
 MISC metadata.xml 1454 BLAKE2B f0cfc77e752bbd3b7a4cd1bee5d7e76aa913e402525928980f728273807be80555fb03e8b9891d28fea8b941c3e632395322536f006b94dea5a00d74bced610b SHA512 9aa67b87fd886d8c3fe29f5eb3f5fbd943a7d690c1dca21a34746a286d0b193e36ec8c96b75554ca3f98c4d149dcd7e072aa702b09c6670d63739a3c8b766df3
diff --git a/games-engines/openmw/files/openmw-0.47.0-gcc12.patch b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
new file mode 100644
index 000000000000..4c04d7b25c78
--- /dev/null
+++ b/games-engines/openmw/files/openmw-0.47.0-gcc12.patch
@@ -0,0 +1,33 @@
+Backport missing includes causing issues with gcc12.
+https://bugs.gentoo.org/858725
+https://gitlab.com/OpenMW/openmw/-/commit/5f2e282359
+From: elsid <elsid.mail@gmail.com>
+Date: Tue, 17 May 2022 00:58:24 +0200
+Subject: [PATCH] Add includes for used types and functions
+--- a/components/myguiplatform/myguidatamanager.cpp
++++ b/components/myguiplatform/myguidatamanager.cpp
+@@ -1,8 +1,11 @@
+ #include "myguidatamanager.hpp"
+ 
++#include <memory>
++#include <string>
++
+ #include <MyGUI_DataFileStream.h>
+ 
+-#include <boost/filesystem.hpp>
++#include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ 
+ #include <components/debug/debuglog.hpp>
+--- a/components/myguiplatform/myguidatamanager.hpp
++++ b/components/myguiplatform/myguidatamanager.hpp
+@@ -3,6 +3,8 @@
+ 
+ #include <MyGUI_DataManager.h>
+ 
++#include <string>
++
+ namespace osgMyGUI
+ {
+ 
+GitLab
diff --git a/games-engines/openmw/openmw-0.47.0-r1.ebuild b/games-engines/openmw/openmw-0.47.0-r1.ebuild
index 7dd2a4a0a958..0d9ccae64cb6 100644
--- a/games-engines/openmw/openmw-0.47.0-r1.ebuild
+++ b/games-engines/openmw/openmw-0.47.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -64,6 +64,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
 	"${FILESDIR}"/openmw-0.47.0-sigstksz.patch
+	"${FILESDIR}"/openmw-0.47.0-gcc12.patch
 )
 
 src_prepare() {
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 45b3ed5e772f..a2b322e775a8 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -73,10 +73,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
-)
-
 src_prepare() {
 	cmake_src_prepare