From 5d092e1d2eb0ce4da58887a6bd16cecdc4bb4fe9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 25 Jul 2024 17:55:04 -0700 Subject: Fix several more sealed foods spawning partially full. Also fix building with gcc14. --- ...uild-fix-some-build-errors-on-fedora-4979.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch (limited to 'hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch') diff --git a/hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch b/hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch new file mode 100644 index 0000000..d2146d0 --- /dev/null +++ b/hotfix-07_build-fix-some-build-errors-on-fedora-4979.patch @@ -0,0 +1,51 @@ +From abfe66bd28456752b8395b43a364f8f88610e5bf Mon Sep 17 00:00:00 2001 +From: scarf +Date: Mon, 22 Jul 2024 02:33:30 +0900 +Subject: [PATCH] build: fix some build errors on fedora (#4979) + +* build: fix template-id-cdtor error on gcc 14 + +related: https://github.com/project-chip/connectedhomeip/issues/33493 + +* build: use explicit `std::replace` from `` +--- + src/cata_arena.h | 8 ++++---- + src/safe_reference.h | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/cata_arena.h b/src/cata_arena.h +index 7eeec9a0c01..c1aee051719 100644 +--- a/src/cata_arena.h ++++ b/src/cata_arena.h +@@ -37,12 +37,12 @@ class cata_arena + return true; + } + +- cata_arena() = default; +- cata_arena( const cata_arena & ) = delete; +- cata_arena( cata_arena && ) = delete; +- ++ cata_arena() = default; + + public: ++ cata_arena( const cata_arena & ) = delete; ++ cata_arena( cata_arena && ) = delete; ++ + using value_type = T; + + static void mark_for_destruction( T *alloc ) { +diff --git a/src/safe_reference.h b/src/safe_reference.h +index 552aeb6e300..201d0a9500e 100644 +--- a/src/safe_reference.h ++++ b/src/safe_reference.h +@@ -48,6 +48,7 @@ + */ + + #include ++#include + #include + + #include "debug.h" +-- +2.43.0 + -- cgit v1.2.1