git: ec981e26cd31 - main - games/freeorion: update 0.5 → 0.5.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Mar 2025 21:04:15 UTC
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ec981e26cd312887c3888afa567130c044790252
commit ec981e26cd312887c3888afa567130c044790252
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2024-03-28 19:48:55 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2025-03-05 21:04:11 +0000
games/freeorion: update 0.5 → 0.5.1
---
games/freeorion/Makefile | 5 +--
games/freeorion/distinfo | 6 ++--
.../files/patch-GG_src_dialogs_FileDlg.cpp | 42 ----------------------
.../files/patch-cmake_make__versioncpp.py | 6 ++--
games/freeorion/files/patch-util_Directories.cpp | 31 ----------------
games/freeorion/files/patch-util_OptionsDB.cpp | 12 -------
games/freeorion/pkg-plist | 12 +++----
7 files changed, 13 insertions(+), 101 deletions(-)
diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile
index 4031490c3cb0..bde0c1dbbc59 100644
--- a/games/freeorion/Makefile
+++ b/games/freeorion/Makefile
@@ -1,7 +1,6 @@
PORTNAME= freeorion
DISTVERSIONPREFIX= v
-DISTVERSION= 0.5
-PORTREVISION= 5
+DISTVERSION= 0.5.1
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
@@ -11,8 +10,6 @@ WWW= https://www.freeorion.org/
LICENSE= GPLv2 CC-BY-SA-3.0
LICENSE_COMB= multi
-BROKEN= fails to build with Boost>=1.87
-
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
${PY_BOOST}
diff --git a/games/freeorion/distinfo b/games/freeorion/distinfo
index 3ac89b0f2932..7cfd7bad062c 100644
--- a/games/freeorion/distinfo
+++ b/games/freeorion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680518770
-SHA256 (freeorion-freeorion-v0.5_GH0.tar.gz) = b95667957047e02cf4bf4b230bf3ad02edbeffff6be600cc38a62cb115adb10c
-SIZE (freeorion-freeorion-v0.5_GH0.tar.gz) = 154593192
+TIMESTAMP = 1738928662
+SHA256 (freeorion-freeorion-v0.5.1_GH0.tar.gz) = 6fbb5ed90400950a1fd611c0e02898a339487622471390571d609b6e3e1289b7
+SIZE (freeorion-freeorion-v0.5.1_GH0.tar.gz) = 156626275
diff --git a/games/freeorion/files/patch-GG_src_dialogs_FileDlg.cpp b/games/freeorion/files/patch-GG_src_dialogs_FileDlg.cpp
deleted file mode 100644
index 56afc2e3255f..000000000000
--- a/games/freeorion/files/patch-GG_src_dialogs_FileDlg.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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
diff --git a/games/freeorion/files/patch-cmake_make__versioncpp.py b/games/freeorion/files/patch-cmake_make__versioncpp.py
index c094ae07b028..4fbc473af2e6 100644
--- a/games/freeorion/files/patch-cmake_make__versioncpp.py
+++ b/games/freeorion/files/patch-cmake_make__versioncpp.py
@@ -1,6 +1,6 @@
---- cmake/make_versioncpp.py.orig 2023-03-21 15:16:58 UTC
+--- cmake/make_versioncpp.py.orig 2025-02-02 17:09:54 UTC
+++ cmake/make_versioncpp.py
-@@ -136,26 +136,6 @@ branch = ""
+@@ -136,26 +136,6 @@ version_file_name = version
build_no = INVALID_BUILD_NO
version_file_name = version
@@ -16,7 +16,7 @@
- timestamp = float(
- check_output(["git", "show", "--no-show-signature", "-s", "--format=%ct", "HEAD"], text=True).strip()
- )
-- build_no = ".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
+- build_no = ".".join([datetime.fromtimestamp(timestamp, tz=timezone.utc).strftime("%Y-%m-%d"), commit])
- if branch[:7] == "release":
- version_file_name = "v" + version
- else:
diff --git a/games/freeorion/files/patch-util_Directories.cpp b/games/freeorion/files/patch-util_Directories.cpp
deleted file mode 100644
index 40f9b22f6b6d..000000000000
--- a/games/freeorion/files/patch-util_Directories.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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);
diff --git a/games/freeorion/files/patch-util_OptionsDB.cpp b/games/freeorion/files/patch-util_OptionsDB.cpp
deleted file mode 100644
index 90e022129ffc..000000000000
--- a/games/freeorion/files/patch-util_OptionsDB.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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>
-
diff --git a/games/freeorion/pkg-plist b/games/freeorion/pkg-plist
index a08ca241213e..494af15685a0 100644
--- a/games/freeorion/pkg-plist
+++ b/games/freeorion/pkg-plist
@@ -5,12 +5,12 @@ bin/freeoriond
lib/freeorion/libfreeorioncommon.so
lib/freeorion/libfreeorionparse.so
%%CLIENT_GG%%share/applications/org.freeorion.FreeOrion.desktop
-%%CLIENT_GG%%share/icons/hicolor/128x128/apps/freeorion.png
-%%CLIENT_GG%%share/icons/hicolor/16x16/apps/freeorion.png
-%%CLIENT_GG%%share/icons/hicolor/24x24/apps/freeorion.png
-%%CLIENT_GG%%share/icons/hicolor/256x256/apps/freeorion.png
-%%CLIENT_GG%%share/icons/hicolor/32x32/apps/freeorion.png
-%%CLIENT_GG%%share/icons/hicolor/64x64/apps/freeorion.png
+%%CLIENT_GG%%share/icons/hicolor/128x128/apps/org.freeorion.FreeOrion.png
+%%CLIENT_GG%%share/icons/hicolor/16x16/apps/org.freeorion.FreeOrion.png
+%%CLIENT_GG%%share/icons/hicolor/24x24/apps/org.freeorion.FreeOrion.png
+%%CLIENT_GG%%share/icons/hicolor/256x256/apps/org.freeorion.FreeOrion.png
+%%CLIENT_GG%%share/icons/hicolor/32x32/apps/org.freeorion.FreeOrion.png
+%%CLIENT_GG%%share/icons/hicolor/64x64/apps/org.freeorion.FreeOrion.png
%%CLIENT_GG%%share/metainfo/org.freeorion.FreeOrion.metainfo.xml
@dir %%DATADIR%%/default/data/sound/combat
@dir %%DATADIR%%/default/data/art/stars_sidepanel