diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-05-31 21:09:19 +0300 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-06-01 20:34:50 +0300 |
| commit | 1588865b218de69d8583bb0f9f98167e99c42d41 (patch) | |
| tree | d6cfc90fc652be01e4167b66192cf840129270bd | |
| parent | games/violetland: fix build with boost 1.76 (diff) | |
games/freeorion: fix build with boost 1.76
| -rw-r--r-- | games/freeorion/files/patch-UI_CombatReport_GraphicalSummary.cpp | 21 | ||||
| -rw-r--r-- | games/freeorion/files/patch-universe_Conditions.cpp | 11 |
2 files changed, 32 insertions, 0 deletions
diff --git a/games/freeorion/files/patch-UI_CombatReport_GraphicalSummary.cpp b/games/freeorion/files/patch-UI_CombatReport_GraphicalSummary.cpp new file mode 100644 index 000000000000..4947e31e7220 --- /dev/null +++ b/games/freeorion/files/patch-UI_CombatReport_GraphicalSummary.cpp @@ -0,0 +1,21 @@ +Change similar to upstream commit 9cc1926e8126163d3b8877c0112e11c462a96384: +remove unused code to fix build with boost 1.76 + +--- UI/CombatReport/GraphicalSummary.cpp.orig 2020-09-25 11:06:39 UTC ++++ UI/CombatReport/GraphicalSummary.cpp +@@ -409,6 +409,7 @@ class SideBar : public GG::Wnd { (public) + m_y_axis_label->MoveTo(GG::Pt(-m_y_axis_label->MinUsableSize().x / 2 - AXIS_WIDTH, Height()/2 - m_y_axis_label->Height()/2)); + } + ++ /* + void DrawArrow(GG::Pt begin, GG::Pt end) { + double head_width = 5.0; + // A vector (math) of the arrow we wish to draw +@@ -493,6 +494,7 @@ class SideBar : public GG::Wnd { (public) + DrawArrow(begin, x_end); + DrawArrow(begin, y_end); + } ++ */ + + void SizeMove(const GG::Pt& ul, const GG::Pt& lr) override { + GG::Wnd::SizeMove(ul, lr); diff --git a/games/freeorion/files/patch-universe_Conditions.cpp b/games/freeorion/files/patch-universe_Conditions.cpp new file mode 100644 index 000000000000..9b5737aea98f --- /dev/null +++ b/games/freeorion/files/patch-universe_Conditions.cpp @@ -0,0 +1,11 @@ +--- universe/Conditions.cpp.orig 2020-09-25 11:06:39 UTC ++++ universe/Conditions.cpp +@@ -32,6 +32,8 @@ + #include <boost/graph/adjacency_list.hpp> + #include <boost/graph/st_connected.hpp> + ++#include <cfloat> // for FLT_MAX ++ + + using boost::io::str; + |