commit: 0797eb1343330b24b4b9097622b5419d7c518dbc Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Mar 20 13:30:43 2022 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 13:30:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0797eb13
games-engines/odamex: Patch fix USE=master breakage on newer compilers Closes: https://bugs.gentoo.org/835638 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../odamex/files/odamex-10.0.0-master-std.patch | 28 ++++++++++++++++++++++ games-engines/odamex/odamex-10.0.0.ebuild | 1 + 2 files changed, 29 insertions(+) diff --git a/games-engines/odamex/files/odamex-10.0.0-master-std.patch b/games-engines/odamex/files/odamex-10.0.0-master-std.patch new file mode 100644 index 000000000000..2fe299fd12df --- /dev/null +++ b/games-engines/odamex/files/odamex-10.0.0-master-std.patch @@ -0,0 +1,28 @@ +From 08ff1a04abfde739f7b6d273ebfad65e9a09c24a Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <ch...@gentoo.org> +Date: Sun, 20 Mar 2022 13:19:49 +0000 +Subject: [PATCH] Set odamast C++ standard to 98 + +Otherwise the use of `byte` is ambiguous with newer compilers, resulting +in a build error. + +(cherry picked from commit 4c06d27e60b1e10c4d661523894430323398b140) +--- + master/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt +index cbe6a0311..f216eab9a 100644 +--- a/master/CMakeLists.txt ++++ b/master/CMakeLists.txt +@@ -6,6 +6,7 @@ file(GLOB MASTER_SOURCES *.cpp *.h) + # Master target + add_executable(odamast ${MASTER_SOURCES}) + odamex_target_settings(odamast) ++set_property(TARGET odamast PROPERTY CXX_STANDARD 98) + + if(WIN32) + target_link_libraries(odamast wsock32) +-- +2.34.1 + diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.0.0.ebuild index 36c7c98744f3..3f412be3f47d 100644 --- a/games-engines/odamex/odamex-10.0.0.ebuild +++ b/games-engines/odamex/odamex-10.0.0.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-10.0.0-unbundle-jsoncpp.patch "${FILESDIR}"/${PN}-10.0.0-unbundle-fltk.patch "${FILESDIR}"/${PN}-10.0.0-musl.patch + "${FILESDIR}"/${PN}-10.0.0-master-std.patch ) src_prepare() {
