From nobody Thu Oct 03 10:27:26 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK7Cf5WW6z5Y6XR; Thu, 03 Oct 2024 10:27:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK7Cf2hvCz4CbZ; Thu, 3 Oct 2024 10:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kt6a5PnZu2vyHtNgmQBPNnT1ZI9y6gf+wznDQhizWwY=; b=T+BjMmO4ErtWXdeP2w9tj/n/8DOu2xY9dVVKsnHnvnZ6BIyZUb5YUaPgge+Q6GXfWQpkOS juPqqi9BqBwXnjDClZ1JsBX2wfp9PA4e5teIz1fvU8usxGZ1DhRqzGkXh6CiTBUNR8xFyw 5cuq2kWlgIYQDuZrbWmXybWVOs3xTPRFtYwOCQnQ/lVLmHXGl9yTnGK89JPOij/iL6KLQi oWx6vivmKGnkeMJ0pF+vtTDt7vkJhqezNtdHKSIqKmGIsTZyAd3lsJpc+i8FavsyGefYEG /o0VkV4wz0Sv1VXgUA9TumtLPB4pOOgKjkHBClQSBO1z8uSu9EXxMcvt2rVumg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kt6a5PnZu2vyHtNgmQBPNnT1ZI9y6gf+wznDQhizWwY=; b=VO6QxEoS77qtBK0leLNHWdizFL1roBXT92/3T8ACZkyzm2s3bGQkrQ1sJnM/x5QR5eANU4 peAilpmxG/bcPE1s5nxJhZClrt6oXp6s+Ij59dJ6oe5+xswCPQgbzB2j2RdFSg+WhFzZwd zCiVSG2AUOYz6tDmfPdXAjh5MOwk3h0nnHCMG4Jv5TP4IR06Vnj8H7cH50fyeiOsa4s/6G jRKvMIDa02YoVRjv79ywa2FLzU405h7x+BmPqSGlSR+2vOoV8WhU8PJxkVnlaU4hl5nGu0 eatr1fk/rgxTSmDLvgy2wEVKLR2xFEKbp6l8O2GQ4dFEpIzECO61RNf4L91s4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951246; a=rsa-sha256; cv=none; b=yOxz5Dv15dgip5HgrhqcgR2/Fc1hCaUPfCO0ZvQdgFkvIe/rD+SCxdlyZPdgIM9es/VsG6 g+2XBueNfk5jxCkmGoI+ZpXMxlFrJwYkTQi2AW4TJGx6P993ciwroUDKSlZrzblOSDmPzu klKFHQVLlwG8/HjrLpL9v66lw/FhgUsV+AqHnXPW515Ate/3np9bG4/8YCGp6zbZNKIZvD 6HsDPzmoqmsV2v0W0loIzqx7HD387b7lfPr1UHbcS7ExItGS0wKzhDGVFSav+4BpBdoXvn i1Klkht52UnLGGVZNWq2sAb/Iy5V8r/pcdEcTxwe4zPjiF5E+sxKGQu4lGz7iw== 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 4XK7Cf1zR9zmjV; Thu, 3 Oct 2024 10:27:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493ARQbn041972; Thu, 3 Oct 2024 10:27:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARQl1041969; Thu, 3 Oct 2024 10:27:26 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:26 GMT Message-Id: <202410031027.493ARQl1041969@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 5a58ab08535b - main - games/freeorion: unbreak build with boost-1.85 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a58ab08535bdb3d19c5f9ae0fd2599fdfcd6954 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a58ab08535bdb3d19c5f9ae0fd2599fdfcd6954 commit 5a58ab08535bdb3d19c5f9ae0fd2599fdfcd6954 Author: Dima Panov AuthorDate: 2024-10-02 23:30:56 +0000 Commit: Dima Panov CommitDate: 2024-10-03 10:24:54 +0000 games/freeorion: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- games/freeorion/Makefile | 2 +- .../files/patch-GG_src_dialogs_FileDlg.cpp | 42 ++++++++++++++++++++++ games/freeorion/files/patch-util_Directories.cpp | 31 ++++++++++++++++ games/freeorion/files/patch-util_OptionsDB.cpp | 12 +++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile index 30c3879cc34c..f83d9cf59f6d 100644 --- a/games/freeorion/Makefile +++ b/games/freeorion/Makefile @@ -1,7 +1,7 @@ PORTNAME= freeorion DISTVERSIONPREFIX= v DISTVERSION= 0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/games/freeorion/files/patch-GG_src_dialogs_FileDlg.cpp b/games/freeorion/files/patch-GG_src_dialogs_FileDlg.cpp new file mode 100644 index 000000000000..56afc2e3255f --- /dev/null +++ b/games/freeorion/files/patch-GG_src_dialogs_FileDlg.cpp @@ -0,0 +1,42 @@ +--- GG/src/dialogs/FileDlg.cpp.orig 2023-03-21 15:16:58 UTC ++++ GG/src/dialogs/FileDlg.cpp +@@ -9,7 +9,7 @@ + + #include + #include +-#include ++#include + #include + // boost::spirit::classic pulls in windows.h which in turn defines macro + // versions of min and max. Defining NOMINMAX disables the creation of those +@@ -215,7 +215,7 @@ void FileDlg::CompleteConstruction() + + if (!m_init_filename.empty()) { + fs::path filename_path = fs::system_complete(fs::path(m_init_filename)); +- m_files_edit->SetText(filename_path.leaf().string()); ++ m_files_edit->SetText(filename_path.filename().string()); + } + } + +@@ -548,7 +548,7 @@ void FileDlg::UpdateList() + if (!m_in_win32_drive_selection) { + // parent directory selector + if ((s_working_dir.string() != s_working_dir.root_path().string() && +- !s_working_dir.branch_path().string().empty()) || ++ !s_working_dir.parent_path().string().empty()) || + Win32Paths()) + { + auto row = Wnd::Create(); +@@ -694,10 +694,10 @@ void FileDlg::OpenDirectory() + } else if (directory == "..") { + // move to parent directory of current directory + if (s_working_dir.string() != s_working_dir.root_path().string() && +- !s_working_dir.branch_path().string().empty()) ++ !s_working_dir.parent_path().string().empty()) + { + // move to new directory +- SetWorkingDirectory(s_working_dir.branch_path()); ++ SetWorkingDirectory(s_working_dir.parent_path()); + + } else { + // switch to drive selection mode diff --git a/games/freeorion/files/patch-util_Directories.cpp b/games/freeorion/files/patch-util_Directories.cpp new file mode 100644 index 000000000000..40f9b22f6b6d --- /dev/null +++ b/games/freeorion/files/patch-util_Directories.cpp @@ -0,0 +1,31 @@ +--- util/Directories.cpp.orig 2023-03-21 15:16:58 UTC ++++ util/Directories.cpp +@@ -4,9 +4,8 @@ + #include "i18n.h" + + #include +-#include +-#include + #include ++#include + + #include + #include +@@ -266,7 +265,7 @@ void InitBinDir(std::string const& argv0) + #if defined(FREEORION_WIN32) + try { + fs::path binary_file = fs::system_complete(FilenameToPath(argv0)); +- bin_dir = binary_file.branch_path(); ++ bin_dir = binary_file.parent_path(); + } catch (const fs::filesystem_error &) { + bin_dir = fs::initial_path(); + } +@@ -315,7 +314,7 @@ void InitBinDir(std::string const& argv0) + std::string path_text(buf); + + fs::path binary_file = fs::system_complete(fs::path(path_text)); +- bin_dir = binary_file.branch_path(); ++ bin_dir = binary_file.parent_path(); + + // check that a "freeoriond" file (hopefully the freeorion server binary) exists in the found directory + fs::path p(bin_dir); diff --git a/games/freeorion/files/patch-util_OptionsDB.cpp b/games/freeorion/files/patch-util_OptionsDB.cpp new file mode 100644 index 000000000000..90e022129ffc --- /dev/null +++ b/games/freeorion/files/patch-util_OptionsDB.cpp @@ -0,0 +1,12 @@ +--- util/OptionsDB.cpp.orig 2023-03-21 15:16:58 UTC ++++ util/OptionsDB.cpp +@@ -14,8 +14,7 @@ + #include + #include + #include +-#include +-#include ++#include + #include + #include +