On Wed, Apr 03, 2024 at 02:34:39AM -0400, Brad Smith wrote:
> Here is an update to FreeOrion 0.5.0.1.
>
>
> [v0.5.0.1] - 2024-03-04
> ---------------
>
> ### Bugfixes / Improvements
>
> - Fixed issue with Boost for Boost version 1.82 and greater
> - Fixed ship design validation
> - Fixed species description in encyclopedia
> - Fixed division by zero error in AI scripts
> - Fixed issue with rendering caret at start of line in multi line edit boxes
> - Update logistics facilitator description to fix number of external slots
> - Fixed Megalith increase infrastructure effect
> - Ignore irrelevant SDL error message
> - Build prerequisite ship facilities when needed
> - Only show scrap building popup if a scrap order could be issued for that
> building by the client empire
> - Apply self-sustaining xenophobic malus only where self-sustaining bonus
> applies
> - Fix division by zero when AI has researched everything
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/freeorion/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile 26 Sep 2023 09:41:35 -0000 1.19
> +++ Makefile 3 Apr 2024 06:29:20 -0000
> @@ -1,4 +1,4 @@
> -V = 0.5
> +V = 0.5.0.1
> COMMENT = turn-based space empire and galactic conquest computer game
> DISTNAME = FreeOrion_v${V}_Source
> PKGNAME = freeorion-${V}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/freeorion/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo 13 May 2023 18:34:18 -0000 1.6
> +++ distinfo 3 Apr 2024 06:29:20 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (FreeOrion_v0.5_Source.tar.gz) =
> CfMc/lXWFlvf7pfbOnXCRarhEzx5L9SAr3oTqmdnTLE=
> -SIZE (FreeOrion_v0.5_Source.tar.gz) = 152861207
> +SHA256 (FreeOrion_v0.5.0.1_Source.tar.gz) =
> xvYsO0ANULM21iUIrF1dZW5MDI5X0P8rJw9yOB5o4ds=
> +SIZE (FreeOrion_v0.5.0.1_Source.tar.gz) = 152861158
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 13 May 2023 18:34:18 -0000 1.6
> +++ patches/patch-CMakeLists_txt 3 Apr 2024 06:29:20 -0000
> @@ -3,7 +3,7 @@ Remove hardcoded optimisation option.
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -501,7 +501,6 @@ target_compile_options(freeorionparseobj
> +@@ -500,7 +500,6 @@ target_compile_options(freeorionparseobj
> PRIVATE
> $<$<CXX_COMPILER_ID:Clang>:-ftemplate-depth=512>
> $<$<CXX_COMPILER_ID:AppleClang>:-ftemplate-depth=512>
> Index: patches/patch-GG_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/freeorion/patches/patch-GG_CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-GG_CMakeLists_txt
> --- patches/patch-GG_CMakeLists_txt 13 May 2023 18:34:18 -0000 1.3
> +++ patches/patch-GG_CMakeLists_txt 3 Apr 2024 06:29:20 -0000
> @@ -2,7 +2,7 @@ Add X11BASE include directory
> Index: GG/CMakeLists.txt
> --- GG/CMakeLists.txt.orig
> +++ GG/CMakeLists.txt
> -@@ -86,6 +86,7 @@ endif()
> +@@ -85,6 +85,7 @@ endif()
> include_directories(
> ${CMAKE_CURRENT_SOURCE_DIR}
> ${CMAKE_CURRENT_BINARY_DIR}
> Index: patches/patch-GG_src_dialogs_FileDlg_cpp
> ===================================================================
> RCS file: patches/patch-GG_src_dialogs_FileDlg_cpp
> diff -N patches/patch-GG_src_dialogs_FileDlg_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-GG_src_dialogs_FileDlg_cpp 3 Apr 2024 06:29:20 -0000
> @@ -0,0 +1,46 @@
> +updates for Boost 1.85
> +https://github.com/freeorion/freeorion/commit/bc02d58fc1efc70c6c3d33c20a71ef0dd4852d23
> +
> +Index: GG/src/dialogs/FileDlg.cpp
> +--- GG/src/dialogs/FileDlg.cpp.orig
> ++++ GG/src/dialogs/FileDlg.cpp
> +@@ -9,7 +9,7 @@
> +
> + #include <boost/cast.hpp>
> + #include <boost/algorithm/string/predicate.hpp>
> +-#include <boost/filesystem/operations.hpp>
> ++#include <boost/filesystem.hpp>
> + #include <boost/format.hpp>
> + // 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<ListBox::Row>();
> +@@ -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
> Index: patches/patch-util_Directories_cpp
> ===================================================================
> RCS file: patches/patch-util_Directories_cpp
> diff -N patches/patch-util_Directories_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-util_Directories_cpp 3 Apr 2024 06:29:20 -0000
> @@ -0,0 +1,35 @@
> +updates for Boost 1.85
> +https://github.com/freeorion/freeorion/commit/bc02d58fc1efc70c6c3d33c20a71ef0dd4852d23
> +
> +Index: util/Directories.cpp
> +--- util/Directories.cpp.orig
> ++++ util/Directories.cpp
> +@@ -4,9 +4,8 @@
> + #include "i18n.h"
> +
> + #include <boost/algorithm/string/trim.hpp>
> +-#include <boost/filesystem/convenience.hpp>
> +-#include <boost/filesystem/operations.hpp>
> + #include <boost/date_time/posix_time/posix_time.hpp>
> ++#include <boost/filesystem.hpp>
> +
> + #include <cstdlib>
> + #include <mutex>
> +@@ -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);
> Index: patches/patch-util_OptionsDB_cpp
> ===================================================================
> RCS file: patches/patch-util_OptionsDB_cpp
> diff -N patches/patch-util_OptionsDB_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-util_OptionsDB_cpp 3 Apr 2024 06:29:20 -0000
> @@ -0,0 +1,16 @@
> +updates for Boost 1.85
> +https://github.com/freeorion/freeorion/commit/bc02d58fc1efc70c6c3d33c20a71ef0dd4852d23
> +
> +Index: util/OptionsDB.cpp
> +--- util/OptionsDB.cpp.orig
> ++++ util/OptionsDB.cpp
> +@@ -14,8 +14,7 @@
> + #include <boost/algorithm/string/classification.hpp>
> + #include <boost/algorithm/string/erase.hpp>
> + #include <boost/algorithm/string/predicate.hpp>
> +-#include <boost/filesystem/fstream.hpp>
> +-#include <boost/filesystem/operations.hpp>
> ++#include <boost/filesystem.hpp>
> + #include <boost/range/algorithm_ext/erase.hpp>
> + #include <boost/tokenizer.hpp>
> +
Compiles and runs fine on amd64.
Thanks!
Tom
