From owner-dev-commits-ports-main@freebsd.org Tue Jun 1 17:38:01 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05DAA659237; Tue, 1 Jun 2021 17:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FvfWX65TQz3tGG; Tue, 1 Jun 2021 17:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4A99278CE; Tue, 1 Jun 2021 17:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 151Hc0q6018664; Tue, 1 Jun 2021 17:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 151Hc03N018663; Tue, 1 Jun 2021 17:38:00 GMT (envelope-from git) Date: Tue, 1 Jun 2021 17:38:00 GMT Message-Id: <202106011738.151Hc03N018663@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 1588865b218d - main - games/freeorion: fix build with boost 1.76 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1588865b218de69d8583bb0f9f98167e99c42d41 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2021 17:38:01 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=1588865b218de69d8583bb0f9f98167e99c42d41 commit 1588865b218de69d8583bb0f9f98167e99c42d41 Author: Dmitry Marakasov AuthorDate: 2021-05-31 18:09:19 +0000 Commit: Dmitry Marakasov CommitDate: 2021-06-01 17:34:50 +0000 games/freeorion: fix build with boost 1.76 --- .../patch-UI_CombatReport_GraphicalSummary.cpp | 21 +++++++++++++++++++++ games/freeorion/files/patch-universe_Conditions.cpp | 11 +++++++++++ 2 files changed, 32 insertions(+) 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 + #include + ++#include // for FLT_MAX ++ + + using boost::io::str; +