git: 2b954c89e687 - main - games/violetland: unbreak build with Boost-1.87+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 01 May 2025 00:31:50 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b954c89e687a3bb930409f9c741a5e6b697fb47 commit 2b954c89e687a3bb930409f9c741a5e6b697fb47 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2025-04-30 23:35:04 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2025-05-01 00:31:46 +0000 games/violetland: unbreak build with Boost-1.87+ Switch CSTD to C++14, this is minimal requirement for updated type_traits usage Approved by: amdmi3 --- games/violetland/Makefile | 5 ++--- games/violetland/files/patch-src_game_Highscores.cpp | 11 +++++++++++ games/violetland/files/patch-src_windows_CharStatsWindow.cpp | 9 +++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/games/violetland/Makefile b/games/violetland/Makefile index 7c618cbb7f80..408b6e2dc693 100644 --- a/games/violetland/Makefile +++ b/games/violetland/Makefile @@ -12,17 +12,16 @@ LICENSE_COMB= multi #LICENSE_FILE_GPLv3= "${WRKSRC}/LICENSE (code)" # framework doesn't handle these properly #LICENSE_FILE_CC-BY-SA-3.0= "${WRKSRC}/LICENSE (content)" -BROKEN= fails to build with boost-1.85+ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= ooxi GH_TUPLE= jarro2783:CMake-Gettext:6ee6405:cmakegettext/lib/CMake-Gettext -USES= cmake compiler:c++11-lang gettext gl sdl +USES= cmake compiler:c++14-lang gettext gl sdl USE_SDL= sdl mixer image ttf USE_GL= gl glu -USE_CXXSTD= c++11 +USE_CXXSTD= c++14 CMAKE_ARGS= -DDATA_INSTALL_DIR="${DATADIR}" \ -DLOCALE_INSTALL_DIR="${PREFIX}/share/locale" diff --git a/games/violetland/files/patch-src_game_Highscores.cpp b/games/violetland/files/patch-src_game_Highscores.cpp new file mode 100644 index 000000000000..904fef23f286 --- /dev/null +++ b/games/violetland/files/patch-src_game_Highscores.cpp @@ -0,0 +1,11 @@ +--- src/game/Highscores.cpp.orig 2016-01-04 20:15:21 UTC ++++ src/game/Highscores.cpp +@@ -105,7 +105,7 @@ bool Highscores::add(HighscoresEntry entry) { + ofile.close(); + + boost::filesystem::copy_file(hsTempFile, hsFile, +- boost::filesystem::copy_option::overwrite_if_exists); ++ boost::filesystem::copy_options::overwrite_existing); + boost::filesystem::remove(hsTempFile); + + cout << "Scores was updated." << endl; diff --git a/games/violetland/files/patch-src_windows_CharStatsWindow.cpp b/games/violetland/files/patch-src_windows_CharStatsWindow.cpp new file mode 100644 index 000000000000..4b0992d2774c --- /dev/null +++ b/games/violetland/files/patch-src_windows_CharStatsWindow.cpp @@ -0,0 +1,9 @@ +--- src/windows/CharStatsWindow.cpp.orig 2016-01-04 20:15:21 UTC ++++ src/windows/CharStatsWindow.cpp +@@ -1,5 +1,6 @@ + #include <boost/format.hpp> + #include <boost/math/special_functions/round.hpp> ++#include <boost/type_traits/integral_constant.hpp> + #include <libintl.h> + #include <locale.h> + #include "CharStatsWindow.h"