openmw-tes3mp: add fix for gcc14 (#402905)

2025-05-04 17:11:03 +08:00
parent 1406eb60c2 325e7cd46b
commit 7bec23b287
2 changed files with 28 additions and 0 deletions
@@ -0,0 +1,25 @@
+diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
+index 2daf734..b77d2a8 100644
+--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
+@@ -1,6 +1,8 @@
+ #ifndef GAME_STATE_CHARACTERMANAGER_H
+ #define GAME_STATE_CHARACTERMANAGER_H
+ 
+#include <list>
+
+ #include <boost/filesystem/path.hpp>
+ 
+ #include "character.hpp"
+diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp
+index 6eef4b9..608323e 100644
+--- a/components/vfs/filesystemarchive.cpp
+++ b/components/vfs/filesystemarchive.cpp
+@@ -1,5 +1,7 @@
+ #include "filesystemarchive.hpp"
+ 
+#include <algorithm>
+
+ #include <boost/filesystem.hpp>
+ 
+ #include <components/debug/debuglog.hpp>
@@ -114,6 +114,9 @@ let

      # https://github.com/TES3MP/openmw-tes3mp/issues/552
      ./tes3mp.patch
+
+      # https://github.com/TES3MP/TES3MP/pull/691
+      ./tes3mp-gcc14-fix.patch
    ];

    env.NIX_CFLAGS_COMPILE = "-fpermissive";