mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-17 19:39:43 +00:00
Code Issues Releases Activity

games/freeorion: unbreak build with boost-1.85

Browse Source 
With hat:	office
Sponsored by:	Future Crew, LLC
This commit is contained in:
Dima Panov 2024-10-03 02:30:56 +03:00
parent fd17258b34
commit 5a58ab0853
No known key found for this signature in database
GPG Key ID: FB8BA09DD5398F29
4 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/freeorion/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= freeorion
DISTVERSIONPREFIX= v
DISTVERSION= 0.5
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org

42
games/freeorion/files/patch-GG_src_dialogs_FileDlg.cpp Normal file
View File

@ -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 <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

31
games/freeorion/files/patch-util_Directories.cpp Normal file
View File

@ -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 <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);

12
games/freeorion/files/patch-util_OptionsDB.cpp Normal file
View File

@ -0,0 +1,12 @@
--- util/OptionsDB.cpp.orig 2023-03-21 15:16:58 UTC
+++ 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>