summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild6
-rw-r--r--games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch23
2 files changed, 28 insertions, 1 deletions
diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
index 9842d07150b2..3ab9976cc817 100644
--- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
+++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
@@ -70,8 +70,12 @@ src_prepare() {
ln -rs "${target}" "${link}" || die
done
+ local serious_proton_patches=(
+ "${FILESDIR}/SeriousProton-cmake.patch"
+ "${FILESDIR}/SeriousProton-Add-missing-include-memory-to-websocket.h.patch"
+ )
eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \
- "${FILESDIR}/SeriousProton-cmake.patch"
+ "${serious_proton_patches[@]}"
}
src_configure() {
diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch
new file mode 100644
index 000000000000..861eaa781e8f
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch
@@ -0,0 +1,23 @@
+From 9fe127233eae44f14e37900c3f54e8a305d2f161 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 22 May 2022 12:36:08 +0200
+Subject: [PATCH] Add missing #include <memory> to websocket.h
+
+std::unique_ptr, which is used for the 'socket' field, is defined in
+<memory> but currently not included. Starting with GCC 12, the missing
+include will cause a compilation error.
+
+The missing include was found by Gentoo's CI and reported as
+https://bugs.gentoo.org/846935
+--- a/src/io/http/websocket.h
++++ b/src/io/http/websocket.h
+@@ -5,6 +5,9 @@
+ #include <io/network/tcpSocket.h>
+ #include <unordered_map>
+
++#ifndef EMSCRIPTEN
++#include <memory>
++#endif
+
+ namespace sp {
+ namespace io {