From nobody Sun Dec 8 15:32:11 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5prq2GFKz5gnyJ; Sun, 08 Dec 2024 15:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5prq1p2Zz52GF; Sun, 8 Dec 2024 15:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733671931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0KH4L+G77fxOO/ZBOt1taPUUAIf11B+rAWJQgdWZDo=; b=WYJXxhF1+5KCqgxzpKkbScqOspPJFFv2uNhxXUavVVWdJcyfN6Bktl0Rcyq54Z4uTK1cs7 n/adBEtquT6mgI5T5oQXtI2qHeKy5m6Mg5RI5Ut6NVtiGjycrU5Hoa3ClDoSkFPDm46Lbd UBAeb45YbIN0OGa9DCZKoyLBKlCNcG4ifXQMRyVnpg8VqDnuAZ2sXC2WsjsWcWiv8DiPUu 7REhgsn/FEBZvIfXN7cWyuoDYQti4K93Jt6oOSVwK+7hP5FDqC+BzMEBPo3MKp4ifZb+AJ yoZZ9a7hFinhOPrd9xIS5IdLyQ/o+RPTwUJL0z2WmaPVnBs6uoTYbjn6M1kIdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733671931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0KH4L+G77fxOO/ZBOt1taPUUAIf11B+rAWJQgdWZDo=; b=DKZtP9i11cdEm/gXL3arBNxAgoDH2631pM8yRzSBlF5EqAH2MoffOGsyafyu2oytzN/Q3i bqeHty5TSXykXFYi5iUNn22iCyh8P0Go/5rinWu0HnGaCIZ9V7ppEHwxnpsDEAfc8zqVWL bADlTHDKQA8gSSMTT3ohmuH6NxWkj8D3wL6Lh2SJ2zzz0+fAdWIOvDFqgoKhyHPc165hg9 nk9IAivzB+K8SU+WA3Cqb0ko9mRJ49RH84XxU+ROqBIy99R/Ud0BIUqrURXHPLNPZvW+KP JoQTQ9IS7S15RavN5kYnvYXRgSHqtDzim+s495gtNjS2geKAS09gqKbOCHJYwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733671931; a=rsa-sha256; cv=none; b=mQ0KXk7OJWjRV3U57NYnjvyRD3nJxBzD3LnPLI8Z6KtXxmjVXKgHR4JiM+aXLjp2KxxsPI RNGpeTek3ttgtbnRddXxTEUQgvYvrKK1SMiqYuGO6FqoGDscikjaGRR3DQ0Gf4xqKzUg3P jxkMmm1RCdU7qgKfeDv68JXXRqgVAMKBN4RIGlqOmD6TN7b85PvcsTI69kTsZEY4JWKLyO NszlajP6RTe+/R3BSWPA1RF4FJJxtzXVUwE9ZreycRQ9nuMIzXIHFDmZ5wlTKebjFL9HPr z77tNFQ/Y3xG0kuo0dkCnQPrpEM7tvEkSeX+1HrNEmMyS6DzEHa9RBCEJhjPPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5prq1NYszy8K; Sun, 8 Dec 2024 15:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8FWBp4061204; Sun, 8 Dec 2024 15:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8FWBwU061201; Sun, 8 Dec 2024 15:32:11 GMT (envelope-from git) Date: Sun, 8 Dec 2024 15:32:11 GMT Message-Id: <202412081532.4B8FWBwU061201@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 8ceb12848eb0 - main - games/vcmi: try to unbreak the port's build against new Boost List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ceb12848eb008962a5ed999c0e04d00fe6a011e Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ceb12848eb008962a5ed999c0e04d00fe6a011e commit 8ceb12848eb008962a5ed999c0e04d00fe6a011e Author: Alexey Dokuchaev AuthorDate: 2024-12-08 15:30:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-12-08 15:30:52 +0000 games/vcmi: try to unbreak the port's build against new Boost Obtained from: Arch Linux (AUR) and upstream GitHub --- games/vcmi/Makefile | 2 -- games/vcmi/files/patch-client_ServerRunner.cpp | 33 ++++++++++++++++++++++++++ games/vcmi/files/patch-client_ServerRunner.h | 20 ++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile index 39d236795744..8dc6ac1ef785 100644 --- a/games/vcmi/Makefile +++ b/games/vcmi/Makefile @@ -9,8 +9,6 @@ WWW= https://vcmi.eu/ 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 \ 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 ++#include ++#endif ++ + #include "ServerRunner.h" + + #include "../lib/VCMIDirs.h" + #include "../lib/CThreadHelper.h" + #include "../server/CVCMIServer.h" + +-#ifndef VCMI_MOBILE +-#include +-#include +-#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(serverPath, args, ec, boost::process::std_out > logPath); ++ child = std::make_unique(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 child; ++ std::unique_ptr child; + + public: + void start(uint16_t port, bool connectToLobby, std::shared_ptr startingInfo) override;