diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile index 4031490c3cb0..bde0c1dbbc59 100644 --- a/games/freeorion/Makefile +++ b/games/freeorion/Makefile @@ -1,60 +1,57 @@ PORTNAME= freeorion DISTVERSIONPREFIX= v -DISTVERSION= 0.5 -PORTREVISION= 5 +DISTVERSION= 0.5.1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Turn-based space empire and galactic conquest game 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} USE_GITHUB= yes USES= cmake compiler:c++17-lang python CMAKE_ARGS= -Wno-dev LDFLAGS_i386= -Wl,-znotext PORTDOCS= ChangeLog.md README.md PORTDATA= * OPTIONS_DEFINE= DOCS TEST CLIENT_GG OPTIONS_DEFAULT=DOCS TEST CLIENT_GG OPTIONS_SUB= yes TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= unittest TEST_USES= localbase CLIENT_GG_DESC= Build GiGi client CLIENT_GG_CMAKE_BOOL= BUILD_CLIENT_GG CLIENT_GG_USES= gl openal sdl CLIENT_GG_USE= SDL=sdl2 GL=gl,glu,glew CLIENT_GG_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ libpng.so:graphics/png .include .if ${PYTHON_VER} != ${PYTHON_DEFAULT} # unable to detect boost_python otherwise since required files are # not installed by boost-python-libs CMAKE_ARGS+= -DBoost_NO_BOOST_CMAKE:BOOL=YES .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor .include 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 - #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-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,29 +1,29 @@ ---- 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 -try: - branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"], text=True).strip() - if (branch == "master") or (branch == "weekly-test-builds") or (branch[:7] == "release"): - branch = "" - else: - branch += " " - commit = check_output( - ["git", "show", "--no-show-signature", "-s", "--format=%h", "--abbrev=7", "HEAD"], text=True - ).strip() - 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: - version_file_name = build_no + "_Test" -except (OSError, CalledProcessError): - print("WARNING: git not installed or not setup correctly") - for generator in generators: generator.execute(version, branch, build_no, build_sys, version_file_name) 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 --#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 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 - #include - #include --#include --#include -+#include - #include - #include - 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 @@ -1,58 +1,58 @@ %%CLIENT_GG%%bin/freeorion bin/freeorionca bin/freeoriond %%CLIENT_GG%%lib/freeorion/libGiGi.so 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 @dir %%DATADIR%%/default/data/art/stars/old_stars @dir %%DATADIR%%/default/data/art/species/preview @dir %%DATADIR%%/default/data/art/planets/rings @dir %%DATADIR%%/default/data/art/planets/overlays @dir %%DATADIR%%/default/data/art/planets/damage @dir %%DATADIR%%/default/data/art/planets/clouds @dir %%DATADIR%%/default/data/art/planets/citylights @dir %%DATADIR%%/default/data/art/planets/atmospheres @dir %%DATADIR%%/default/data/art/planets/asteroids @dir %%DATADIR%%/default/data/art/nebulae @dir %%DATADIR%%/default/data/art/misc/system_selection_tiny @dir %%DATADIR%%/default/data/art/misc/system_selection @dir %%DATADIR%%/default/data/art/icons/tech/unused @dir %%DATADIR%%/default/data/art/icons/tech/controls @dir %%DATADIR%%/default/data/art/icons/tech/categories @dir %%DATADIR%%/default/data/art/icons/species @dir %%DATADIR%%/default/data/art/icons/specials_tiny @dir %%DATADIR%%/default/data/art/icons/specials_large @dir %%DATADIR%%/default/data/art/icons/specials_huge @dir %%DATADIR%%/default/data/art/icons/sitrep @dir %%DATADIR%%/default/data/art/icons/ship_parts @dir %%DATADIR%%/default/data/art/icons/ship_hulls @dir %%DATADIR%%/default/data/art/icons/policies @dir %%DATADIR%%/default/data/art/icons/planet @dir %%DATADIR%%/default/data/art/icons/monsters @dir %%DATADIR%%/default/data/art/icons/meter @dir %%DATADIR%%/default/data/art/icons/focus @dir %%DATADIR%%/default/data/art/icons/fleet @dir %%DATADIR%%/default/data/art/icons/flags/field @dir %%DATADIR%%/default/data/art/icons/flags/emblem @dir %%DATADIR%%/default/data/art/icons/buttons @dir %%DATADIR%%/default/data/art/icons/building @dir %%DATADIR%%/default/data/art/hulls_design @dir %%DATADIR%%/default/data/art/galaxy_decoration/rust_set @dir %%DATADIR%%/default/data/art/galaxy_decoration/red_set @dir %%DATADIR%%/default/data/art/galaxy_decoration/obsidian_set @dir %%DATADIR%%/default/data/art/galaxy_decoration/haze_set @dir %%DATADIR%%/default/data/art/galaxy_decoration/grey_set @dir %%DATADIR%%/default/data/art/galaxy_decoration/blue_set @dir %%DATADIR%%/default/data/art/fields @dir %%DATADIR%%/default/data/art/encyclopedia/planet_environments @dir %%DATADIR%%/default/data/art/cursors