Date: Sun, 13 Oct 2024 18:46:14 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: ab7556d9ef10 - 2024Q4 - devel/RStudio: Fix build after recent boost update Message-ID: <202410131846.49DIkExI055564@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2024Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab7556d9ef10b1f7ba67647550ef2ef49704ee03 commit ab7556d9ef10b1f7ba67647550ef2ef49704ee03 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-10-10 07:33:06 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-10-13 18:46:12 +0000 devel/RStudio: Fix build after recent boost update (cherry picked from commit 1cd0e68f7b9bf4b98be27e62f8385efcda1eff8d) --- devel/RStudio/files/patch-src_cpp_core_json_JsonRpc.cpp | 11 +++++++++++ .../RStudio/files/patch-src_cpp_shared__core_FilePath.cpp | 15 +++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/devel/RStudio/files/patch-src_cpp_core_json_JsonRpc.cpp b/devel/RStudio/files/patch-src_cpp_core_json_JsonRpc.cpp new file mode 100644 index 000000000000..cd3dc8918d13 --- /dev/null +++ b/devel/RStudio/files/patch-src_cpp_core_json_JsonRpc.cpp @@ -0,0 +1,11 @@ +--- src/cpp/core/json/JsonRpc.cpp.orig 2024-10-10 06:06:47 UTC ++++ src/cpp/core/json/JsonRpc.cpp +@@ -193,7 +193,7 @@ bool JsonRpcResponse::hasAfterResponse() const + + bool JsonRpcResponse::hasAfterResponse() const + { +- return afterResponse_; ++ return (bool)afterResponse_; + } + + diff --git a/devel/RStudio/files/patch-src_cpp_shared__core_FilePath.cpp b/devel/RStudio/files/patch-src_cpp_shared__core_FilePath.cpp new file mode 100644 index 000000000000..12bac571df74 --- /dev/null +++ b/devel/RStudio/files/patch-src_cpp_shared__core_FilePath.cpp @@ -0,0 +1,15 @@ +--- src/cpp/shared_core/FilePath.cpp.orig 2024-10-10 05:51:04 UTC ++++ src/cpp/shared_core/FilePath.cpp +@@ -805,9 +805,9 @@ Error FilePath::copy(const FilePath& in_targetPath, bo + { + try + { +- boost::filesystem::copy_option::enum_type option = overwrite +- ? boost::filesystem::copy_option::overwrite_if_exists +- : boost::filesystem::copy_option::fail_if_exists; ++ boost::filesystem::copy_options option = overwrite ++ ? boost::filesystem::copy_options::overwrite_existing ++ : boost::filesystem::copy_options::none; + boost::filesystem::copy_file(m_impl->Path, in_targetPath.m_impl->Path, option); + return Success(); + }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410131846.49DIkExI055564>