summaryrefslogtreecommitdiffstats
path: root/games/freeorion/compilefix.diff
diff options
context:
space:
mode:
author Matteo Bernardini2021-03-27 10:25:10 +0100
committer Matteo Bernardini2021-03-27 10:25:10 +0100
commit2fba1c878b57d3afa631b9369518be5d21221c09 (patch)
treedce412a05dfeb7fbb53d24c934a732c3b522ad0f /games/freeorion/compilefix.diff
parentf4c325577c3399f98410adb164155c38bb8ed86a (diff)
downloadslackbuilds-current-20210327.1.tar.gz
20210327.1 global branch merge.current-20210327.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/freeorion/compilefix.diff')
-rw-r--r--games/freeorion/compilefix.diff36
1 files changed, 0 insertions, 36 deletions
diff --git a/games/freeorion/compilefix.diff b/games/freeorion/compilefix.diff
deleted file mode 100644
index c4c207a520..0000000000
--- a/games/freeorion/compilefix.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur freeorion-0.4.8/parse/ConditionParser.h freeorion-0.4.8.patched/parse/ConditionParser.h
---- freeorion-0.4.8/parse/ConditionParser.h 2018-08-23 05:41:14.000000000 -0400
-+++ freeorion-0.4.8.patched/parse/ConditionParser.h 2021-02-17 04:34:17.063751926 -0500
-@@ -1,6 +1,7 @@
- #ifndef _ConditionParser_h_
- #define _ConditionParser_h_
-
-+#include "../universe/ValueRef.h"
- #include "Lexer.h"
- #include "ParseImpl.h"
- #include "ValueRefParser.h"
-diff -Naur freeorion-0.4.8/server/ServerApp.cpp freeorion-0.4.8.patched/server/ServerApp.cpp
---- freeorion-0.4.8/server/ServerApp.cpp 2018-08-23 05:41:14.000000000 -0400
-+++ freeorion-0.4.8.patched/server/ServerApp.cpp 2021-02-17 16:33:47.472827568 -0500
-@@ -1715,7 +1715,7 @@
- // make a link to new connection
- m_player_empire_ids[player_connection->PlayerID()] = empire.first;
-
-- const OrderSet dummy;
-+ OrderSet dummy;
- const OrderSet& orders = orders_it->second ? *orders_it->second : dummy;
-
- auto player_info_map = GetPlayerInfoMap();
-diff -Naur freeorion-0.4.8/universe/Universe.h freeorion-0.4.8.patched/universe/Universe.h
---- freeorion-0.4.8/universe/Universe.h 2018-08-23 05:41:14.000000000 -0400
-+++ freeorion-0.4.8.patched/universe/Universe.h 2021-02-17 04:03:51.908917840 -0500
-@@ -3,7 +3,8 @@
-
-
- #include "EnumsFwd.h"
--#include "ValueRefFwd.h"
-+#include "ValueRef.h"
-+#include "Condition.h"
- #include "ObjectMap.h"
- #include "UniverseObject.h"
- #include "../util/Pending.h"