diff --git a/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch b/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch deleted file mode 100644 index f189e8777f..0000000000 --- a/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5bd55f11e1b6cc2cb08a0001f9c77f56fb8ac649 Mon Sep 17 00:00:00 2001 -From: Kevin Lin -Date: Mon, 18 Apr 2022 12:17:40 -0700 -Subject: [PATCH] thrift/compiler/compiler.cc: Include fstream to fix - compatibility with Boost 1.79.0 (#494) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary: -This patch fixes fbthrift build compatibility with Boost 1.79.0. The symptom is the following compiler error: - -``` -/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc: In function ‘bool apache::thrift::compiler::{anonymous}::generate(const apache::thrift::compiler::{anonymous}::gen_params&, apache::thrift::compiler::t_program*, std::set >&)’: -/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc:331:19: error: aggregate ‘std::ofstream genfile’ has incomplete type and cannot be defined - 331 | std::ofstream genfile; - | ^~~~~~~ -make[2]: *** [thrift/compiler/CMakeFiles/thrift1.dir/build.make:76: thrift/compiler/CMakeFiles/thrift1.dir/compiler.cc.o] Error 1 -make[1]: *** [CMakeFiles/Makefile2:253: thrift/compiler/CMakeFiles/thrift1.dir/all] Error 2 -make: *** [Makefile:152: all] Error 2 -``` - -To reproduce, install the standard fbthrift dependencies, but with Boost 1.79.0 compiled from source, followed by: - -``` -$ mkdir build && cd build -$ cmake -DCMAKE_BUILD_TYPE=RELEASE CXXFLAGS="-fPIC" .. -$ make -j -``` - -Adding an include on `fstream` allows for the build to complete successfully. - -Pull Request resolved: https://github.com/facebook/fbthrift/pull/494 - -Reviewed By: iahs - -Differential Revision: D35709922 - -Pulled By: vitaut - -fbshipit-source-id: 96f0764c7b33047acb7b5ad26b21076757aaa5e7 ---- - thrift/compiler/compiler.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc -index 721ff7dbf3..da944c2950 100644 ---- a/thrift/compiler/compiler.cc -+++ b/thrift/compiler/compiler.cc -@@ -32,6 +32,7 @@ - #include - #endif - #include -+#include - - #include - #include --- -2.34.1.windows.1 - diff --git a/ports/fbthrift/0002-fix-dependency.patch b/ports/fbthrift/0002-fix-dependency.patch index b47de99540..d06d2d79d5 100644 --- a/ports/fbthrift/0002-fix-dependency.patch +++ b/ports/fbthrift/0002-fix-dependency.patch @@ -1,19 +1,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index beae7d7..0d03162 100644 +index d2b69ad..84b2bf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -100,7 +100,8 @@ endif () +@@ -96,22 +96,24 @@ endif () # Find required dependencies for thrift/lib - if(lib_only OR build_all) + if (THRIFT_LIB_ONLY OR build_all) - find_package(Gflags REQUIRED) + find_package(gflags CONFIG REQUIRED) + set(LIBGFLAGS_LIBRARY gflags::gflags) find_package(glog CONFIG REQUIRED) set (GLOG_LIBRARIES glog::glog) find_package(folly CONFIG REQUIRED) -@@ -108,16 +109,17 @@ if(lib_only OR build_all) - find_package(fmt CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) find_package(ZLIB REQUIRED) - find_package(Zstd REQUIRED) @@ -23,7 +22,6 @@ index beae7d7..0d03162 100644 + elseif(TARGET zstd::libzstd_static) + set(ZSTD_LIBRARIES zstd::libzstd_static) + endif() -+ # https://cmake.org/cmake/help/v3.9/module/FindThreads.html set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads) @@ -32,10 +30,9 @@ index beae7d7..0d03162 100644 - ${GLOG_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} - ${ZSTD_INCLUDE_DIRS} -- ${Boost_INCLUDE_DIRS} ) add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0") - if(lib_only) + if (THRIFT_LIB_ONLY) diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in index e1297ed..c7d9d59 100644 --- a/thrift/cmake/FBThriftConfig.cmake.in diff --git a/ports/fbthrift/fix-glog.patch b/ports/fbthrift/fix-glog.patch index 6429171b4a..362e1d1eed 100644 --- a/ports/fbthrift/fix-glog.patch +++ b/ports/fbthrift/fix-glog.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b248a0..beae7d7 100644 +index 7d9a1e7..d2b69ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -101,7 +101,8 @@ endif () +@@ -97,7 +97,8 @@ endif () # Find required dependencies for thrift/lib - if(lib_only OR build_all) + if (THRIFT_LIB_ONLY OR build_all) find_package(Gflags REQUIRED) - find_package(Glog REQUIRED) + find_package(glog CONFIG REQUIRED) + set (GLOG_LIBRARIES glog::glog) find_package(folly CONFIG REQUIRED) find_package(fizz CONFIG REQUIRED) - find_package(fmt CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 53a89d4b67..5c2b0411bb 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF v2022.03.21.00 - SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab + REF "v${VERSION}" + SHA512 b9f7bb7037cbc24ba18928cfad8673fd321ec095dec5fa6ca5b6c51b468873bbefde4326d39faa916747f4273b5a4003d60c0f6f755bfce095f9d3e8946bcb46 HEAD_REF master PATCHES - 0001-fix-compatibility-with-boost-1.79.0.patch fix-glog.patch 0002-fix-dependency.patch ) @@ -51,6 +50,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/gtest/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index ce5ab6c0eb..fe7f39aea1 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fbthrift", - "version-string": "2022.03.21.00", - "port-version": 3, + "version-string": "2023.05.15.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/fizz/0003-fix-deps.patch b/ports/fizz/0003-fix-deps.patch index 8518caeca1..0ef7605358 100644 --- a/ports/fizz/0003-fix-deps.patch +++ b/ports/fizz/0003-fix-deps.patch @@ -1,5 +1,5 @@ diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt -index 64bf93b..843b035 100644 +index 64eec10..6c5a934 100644 --- a/fizz/CMakeLists.txt +++ b/fizz/CMakeLists.txt @@ -50,10 +50,9 @@ find_package(folly CONFIG REQUIRED) @@ -57,11 +57,11 @@ index 64bf93b..843b035 100644 - list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) -endif() - set(FIZZ_HEADER_DIRS - client -@@ -237,30 +216,25 @@ target_include_directories( - PUBLIC + configure_file(fizz-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h DESTINATION ${INCLUDE_INSTALL_DIR}/fizz/) +@@ -243,30 +222,25 @@ target_include_directories( $ + $ $ - ${FOLLY_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} @@ -97,7 +97,7 @@ index 64bf93b..843b035 100644 ${CMAKE_DL_LIBS} ${LIBRT_LIBRARIES}) -@@ -317,8 +291,7 @@ ENDIF(CMAKE_CROSSCOMPILING) +@@ -323,8 +297,7 @@ ENDIF(CMAKE_CROSSCOMPILING) SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) if(BUILD_TESTS) @@ -107,7 +107,7 @@ index 64bf93b..843b035 100644 endif() add_library(fizz_test_support -@@ -331,21 +304,9 @@ add_library(fizz_test_support +@@ -337,21 +310,9 @@ add_library(fizz_test_support target_link_libraries(fizz_test_support PUBLIC fizz @@ -130,7 +130,7 @@ index 64bf93b..843b035 100644 # export fizz headers and targets for unit tests utils # since other projects such as mvfst and proxygen use them -@@ -369,14 +330,13 @@ macro(add_gtest test_source test_name) +@@ -375,14 +336,13 @@ macro(add_gtest test_source test_name) add_executable(${test_name} ${test_source} test/CMakeTestMain.cpp) set_property(TARGET ${test_name} PROPERTY ENABLE_EXPORTS true) diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 43823914e7..cd386f2ed5 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF 47948342be43ddb951e12a53770278be52d479e7 #v2022.10.31.00 - SHA512 b91fbbe008bbd6ee5e865a585cd51f1a1b69360eba32231f0b585b836e5591ee4cc9ffe1d747a82267f21736056fc97932b35212016e614928c13de7c5a64f55 + REF "v${VERSION}" + SHA512 6b057a0610e12e1bbfa668f0233d0daf0ce872247deaa9301bd8b842c7c01afd78812fe2170479b128852c4bf22dffd4a5d84b1970e59e4e82f35b0fb7e54e5e HEAD_REF master PATCHES 0001-fix-libsodium.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 97d0cd647f..35e5c5cf47 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fizz", - "version-string": "2022.10.31.00", - "port-version": 1, + "version-string": "2023.05.15.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/fix-build-with-gcc-13.patch b/ports/folly/fix-build-with-gcc-13.patch deleted file mode 100644 index 9b33c8b445..0000000000 --- a/ports/folly/fix-build-with-gcc-13.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 22 Jan 2023 05:06:16 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing includes) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so etc is no longer transitively included. - -Signed-off-by: Sam James ---- - folly/system/AtFork.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/folly/system/AtFork.cpp b/folly/system/AtFork.cpp -index e888e52858a..a5570330dc3 100644 ---- a/folly/system/AtFork.cpp -+++ b/folly/system/AtFork.cpp -@@ -14,6 +14,9 @@ - * limitations under the License. - */ - -+#include -+#include -+ - #include - - #include diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index bc7730c884..afb46e4ce4 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF d8ed9cd2869c74b00fa6f1a7603301183f5c2249 #v2022.10.31.00 - SHA512 55040dadb8a847f0d04c37a2dce920bb456a59decebc90920831998df9671feb33daf1f4235115adcce5eb9c469b97b9d96fa7a67a5914c434ebc1efc04f4770 + REF "v${VERSION}" + SHA512 311cc6dfebfdfb49bfdd54e66c5dffabb16090610a3b0f05286aadb0e9d6b8b5b27f4bf3400cf74ba35b88f97d6ed7a79a6f32c093c78b8667684d4cbd8baedb HEAD_REF main PATCHES reorder-glog-gflags.patch @@ -17,7 +17,6 @@ vcpkg_from_github( boost-1.70.patch fix-windows-minmax.patch fix-deps.patch - fix-build-with-gcc-13.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 592927b476..05b48346e2 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2022.10.31.00", - "port-version": 7, + "version-string": "2023.05.15.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/mvfst/fix_format.patch b/ports/mvfst/fix_format.patch new file mode 100644 index 0000000000..4bf12f2cd3 --- /dev/null +++ b/ports/mvfst/fix_format.patch @@ -0,0 +1,13 @@ +diff --git a/quic/server/QuicServerWorker.cpp b/quic/server/QuicServerWorker.cpp +index 744cb81..ff3e559 100644 +--- a/quic/server/QuicServerWorker.cpp ++++ b/quic/server/QuicServerWorker.cpp +@@ -692,7 +692,7 @@ PacketDropReason QuicServerWorker::isDstConnIdMisrouted( + "Dropping packet due to DCID parsing error={}, errorCode={}," + "routingInfo = {} ", + ex.what(), +- ex.errorCode(), ++ toString(ex.errorCode()), + logRoutingInfo(dstConnId)); + // TODO do we need to reset? + return PacketDropReason::PARSE_ERROR_DCID; diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index 8766d87c6f..96a8f316c9 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/mvfst - REF 28857570ac808c5493312144dc5af92d6f0a7381 #2022-11-03 - SHA512 3e413e8906ac83f48936871f24d06980bdeff8b7a659326498549afaa53321c047bcd843a7ed971bfed7ddb51e086a28c1ac5fb0f91aabd0a078dda6a75fe488 + REF aeee9b372827cea28697755ea1f68bfc5288548a #2023-05-18 + SHA512 feece3f05537b58270507d9423cc95fe577532997b857586aa49c2000516f3297c487696b659a35f194f0e970b8e84ff0c1a7446d4af7b400a2183704df995a2 HEAD_REF main + PATCHES + fix_format.patch ) vcpkg_cmake_configure( diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index 4082b77518..e28cc76b28 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,12 +1,19 @@ { "name": "mvfst", - "version-date": "2022-11-03", + "version-date": "2023-05-18", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebookincubator/mvfst", "license": "MIT", "supports": "!windows", "dependencies": [ - "boost", + "boost-context", + "boost-date-time", + "boost-filesystem", + "boost-iostreams", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", "fizz", "fmt", "folly", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index b715760ac2..24b7a7f144 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF 0c932f6c57095838494520ec4ce7243a7f0c1234 #v2022.07.11.00 - SHA512 496189c37be8f42821cb5357e501b02f013858f1917854000777ac5c0403d078837e89dc3eef5f66f30f83c7506e40316d730725d7f97070090ac6549e766093 + REF "v${VERSION}" + SHA512 b08110c4bb4d83a80786aa517edc88d2d9233934705a5deb3da70542251c737113500a11a4cd55d72928635be7c2833e806d1c5391892269a0dd1fe8d4e80187 HEAD_REF master PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 761d0d27a8..927729615c 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,7 +1,6 @@ { "name": "proxygen", - "version-string": "2022.07.11.00", - "port-version": 1, + "version-string": "2023.05.15.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", diff --git a/ports/rsocket/fix-rsockserver-build-error.patch b/ports/rsocket/fix-rsockserver-build-error.patch new file mode 100644 index 0000000000..080f8a3fcf --- /dev/null +++ b/ports/rsocket/fix-rsockserver-build-error.patch @@ -0,0 +1,153 @@ +diff --git a/rsocket/RSocketServer.cpp b/rsocket/RSocketServer.cpp +index 1e20281..3a9f6b2 100644 +--- a/rsocket/RSocketServer.cpp ++++ b/rsocket/RSocketServer.cpp +@@ -125,7 +125,7 @@ void RSocketServer::acceptConnection( + weakConSet = std::weak_ptr(connectionSet_), + scheduledResponder = useScheduledResponder_]( + std::unique_ptr conn, +- SetupParameters params) mutable { ++ SetupParameters params) mutable noexcept{ + if (auto connectionSet = weakConSet.lock()) { + RSocketServer::onRSocketSetup( + serviceHandler, +@@ -135,12 +135,15 @@ void RSocketServer::acceptConnection( + std::move(params)); + } + }, +- std::bind( +- &RSocketServer::onRSocketResume, +- this, +- serviceHandler, +- std::placeholders::_1, +- std::placeholders::_2)); ++ [this, serviceHandler=serviceHandler]( ++ std::unique_ptr connection, ++ ResumeParameters resumeParameters) mutable noexcept{ ++ this->onRSocketResume( ++ serviceHandler, ++ std::move(connection), ++ resumeParameters ++ ); ++ }); + } + + void RSocketServer::onRSocketSetup( +@@ -206,7 +209,7 @@ void RSocketServer::onRSocketSetup( + void RSocketServer::onRSocketResume( + std::shared_ptr serviceHandler, + std::unique_ptr connection, +- ResumeParameters resumeParams) { ++ ResumeParameters resumeParams) noexcept{ + auto result = serviceHandler->onResume(resumeParams.token); + if (result.hasError()) { + stats_->resumeFailedNoState(); +diff --git a/rsocket/RSocketServer.h b/rsocket/RSocketServer.h +index 39dae66..e2346ef 100644 +--- a/rsocket/RSocketServer.h ++++ b/rsocket/RSocketServer.h +@@ -118,7 +118,7 @@ class RSocketServer { + void onRSocketResume( + std::shared_ptr serviceHandler, + std::unique_ptr connection, +- rsocket::ResumeParameters setupPayload); ++ rsocket::ResumeParameters setupPayload)noexcept; + + const std::unique_ptr duplexConnectionAcceptor_; + bool started{false}; +diff --git a/yarpl/flowable/AsyncGeneratorShim.h b/yarpl/flowable/AsyncGeneratorShim.h +index 72d212c..79a09f1 100644 +--- a/yarpl/flowable/AsyncGeneratorShim.h ++++ b/yarpl/flowable/AsyncGeneratorShim.h +@@ -96,7 +96,7 @@ class AsyncGeneratorShim { + value.emplace(std::move(*item)); + } + } catch (const std::exception& ex) { +- value.emplaceException(std::current_exception(), ex); ++ value.emplaceException(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex); + } catch (...) { + value.emplaceException(std::current_exception()); + } +diff --git a/yarpl/flowable/Flowable.h b/yarpl/flowable/Flowable.h +index 9dff78b..bccd70d 100644 +--- a/yarpl/flowable/Flowable.h ++++ b/yarpl/flowable/Flowable.h +@@ -494,7 +494,7 @@ std::shared_ptr> Flowable::fromGenerator( + } + } catch (const std::exception& ex) { + subscriber.onError( +- folly::exception_wrapper(std::current_exception(), ex)); ++ folly::exception_wrapper(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex)); + } catch (...) { + subscriber.onError(std::runtime_error( + "Flowable::fromGenerator() threw from Subscriber:onNext()")); +diff --git a/yarpl/flowable/FlowableOperator.h b/yarpl/flowable/FlowableOperator.h +index 314ba7f..fe63504 100644 +--- a/yarpl/flowable/FlowableOperator.h ++++ b/yarpl/flowable/FlowableOperator.h +@@ -178,7 +178,7 @@ class MapOperator : public FlowableOperator { + this->subscriberOnNext(flowable->function_(std::move(value))); + } + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->terminateErr(std::move(ew)); + } + } +@@ -190,7 +190,7 @@ class MapOperator : public FlowableOperator { + } + } catch (const std::exception& exn) { + this->terminateErr( +- folly::exception_wrapper{std::current_exception(), exn}); ++ folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}); + } + } + +@@ -570,7 +570,7 @@ class FlatMapOperator : public FlowableOperator { + try { + mappedStream = flowable_->function_(std::move(value)); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + { + std::lock_guard g(onErrorExGuard_); + onErrorEx_ = ew; +diff --git a/yarpl/flowable/Subscriber.h b/yarpl/flowable/Subscriber.h +index d1dc3b5..582f9c4 100644 +--- a/yarpl/flowable/Subscriber.h ++++ b/yarpl/flowable/Subscriber.h +@@ -301,7 +301,7 @@ class Base : public LambdaSubscriber { + next_(std::move(value)); + } catch (const std::exception& exn) { + this->cancel(); +- auto ew = folly::exception_wrapper{std::current_exception(), exn}; ++ auto ew = folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + LOG(ERROR) << "'next' method should not throw: " << ew.what(); + onErrorImpl(ew); + return; +diff --git a/yarpl/observable/ObservableOperator.h b/yarpl/observable/ObservableOperator.h +index 451c6bd..0e60b48 100644 +--- a/yarpl/observable/ObservableOperator.h ++++ b/yarpl/observable/ObservableOperator.h +@@ -196,7 +196,7 @@ class MapOperator : public ObservableOperator { + try { + this->observerOnNext(observable_->function_(std::move(value))); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->terminateErr(std::move(ew)); + } + } +diff --git a/yarpl/single/SingleOperator.h b/yarpl/single/SingleOperator.h +index 0b3e739..4defd64 100644 +--- a/yarpl/single/SingleOperator.h ++++ b/yarpl/single/SingleOperator.h +@@ -197,7 +197,7 @@ class MapOperator : public SingleOperator { + auto map_operator = this->getOperator(); + this->observerOnSuccess(map_operator->function_(std::move(value))); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->observerOnError(std::move(ew)); + } + } diff --git a/ports/rsocket/portfile.cmake b/ports/rsocket/portfile.cmake index f6ec73c4aa..3ee27b265b 100644 --- a/ports/rsocket/portfile.cmake +++ b/ports/rsocket/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( fix-find-dependencies.patch use-cpp-17.patch fix-folly.patch + fix-rsockserver-build-error.patch ) vcpkg_cmake_configure( diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json index 018579f0bf..190c786aec 100644 --- a/ports/rsocket/vcpkg.json +++ b/ports/rsocket/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsocket", "version-string": "2021.08.30.00", - "port-version": 1, + "port-version": 2, "description": "C++ implementation of RSocket http://rsocket.io", "homepage": "https://github.com/rsocket/rsocket-cpp", "dependencies": [ diff --git a/ports/wangle/fix_dependency.patch b/ports/wangle/fix_dependency.patch index d8316073b7..f44d39fabc 100644 --- a/ports/wangle/fix_dependency.patch +++ b/ports/wangle/fix_dependency.patch @@ -1,5 +1,5 @@ diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt -index 977bbe4..155f9cc 100644 +index 85ae066..766d3d3 100644 --- a/wangle/CMakeLists.txt +++ b/wangle/CMakeLists.txt @@ -64,18 +64,23 @@ set(CMAKE_INSTALL_DIR lib/cmake/wangle CACHE STRING @@ -33,7 +33,7 @@ index 977bbe4..155f9cc 100644 find_package(Librt) @@ -166,6 +171,14 @@ target_include_directories( ${LIBEVENT_INCLUDE_DIR} - ${DOUBLE_CONVERSION_INCLUDE_DIRS} + ${DOUBLE_CONVERSION_INCLUDE_DIR} ) +set(Boost_LIBRARIES Boost::boost Boost::filesystem Boost::thread ) +set(FOLLY_LIBRARIES Folly::folly) diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 15bafaa769..378dfb90f2 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2022.03.21.00 - SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e + REF "v${VERSION}" + SHA512 aa87614f9630fd325e848bef38c520b85a57eaf0e3dd5cb3421a0bb55322fbdf9c22b153436d703eb30ac9f8c4d02bfb71b9313acd16c412609216eb0ca16109 HEAD_REF master PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index a7493e597e..46109a2a82 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wangle", - "version-string": "2022.03.21.00", - "port-version": 1, + "version-string": "2023.05.15.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3b78d5ca71..0c4d57e455 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2457,8 +2457,8 @@ "port-version": 0 }, "fbthrift": { - "baseline": "2022.03.21.00", - "port-version": 3 + "baseline": "2023.05.15.00", + "port-version": 0 }, "fcl": { "baseline": "0.7.0", @@ -2497,8 +2497,8 @@ "port-version": 0 }, "fizz": { - "baseline": "2022.10.31.00", - "port-version": 1 + "baseline": "2023.05.15.00", + "port-version": 0 }, "flann": { "baseline": "2019-04-07", @@ -2561,8 +2561,8 @@ "port-version": 0 }, "folly": { - "baseline": "2022.10.31.00", - "port-version": 7 + "baseline": "2023.05.15.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -5485,7 +5485,7 @@ "port-version": 6 }, "mvfst": { - "baseline": "2022-11-03", + "baseline": "2023-05-18", "port-version": 0 }, "mygui": { @@ -6441,8 +6441,8 @@ "port-version": 0 }, "proxygen": { - "baseline": "2022.07.11.00", - "port-version": 1 + "baseline": "2023.05.15.00", + "port-version": 0 }, "psimd": { "baseline": "2021-02-21", @@ -7178,7 +7178,7 @@ }, "rsocket": { "baseline": "2021.08.30.00", - "port-version": 1 + "port-version": 2 }, "rtabmap": { "baseline": "0.21.0", @@ -8521,8 +8521,8 @@ "port-version": 4 }, "wangle": { - "baseline": "2022.03.21.00", - "port-version": 1 + "baseline": "2023.05.15.00", + "port-version": 0 }, "wasmedge": { "baseline": "0.12.1", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index e858ddbc1b..287b0be4cf 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ad62e4d34a61f43fee3a61b14aae377ed73249a", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "74805d5c9147b3255703cdce511d9082cdfee016", "version-string": "2022.03.21.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 8d11ac3659..b3dc373275 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81e1764f1bcde018ea8a73fc36c4f4d14b03e978", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "df45ebd305a5416215667058e31729d6f28f7b64", "version-string": "2022.10.31.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 7e6326416b..0f7897a64c 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "691eb72c1ad244629c0993986a9f33240afa4710", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "003ae8b1bc9dc0a460b5c6f6cacda76fa5931cf8", "version-string": "2022.10.31.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 4b7412e2af..8bc751dc5c 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "345723d54eef6854daed66dedae0b9d4ead2f9a4", + "version-date": "2023-05-18", + "port-version": 0 + }, { "git-tree": "6187a6048afe0846ffb243d00981f0da0666aa38", "version-date": "2022-11-03", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index ce9986a15b..687773730a 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b7e41b105fbb8e30443037e04098621d31a4fb2", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "e66bcd352675efbaf2ff458ae1709c165ed26696", "version-string": "2022.07.11.00", diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json index 9b4d581a30..eb7a6e82ad 100644 --- a/versions/r-/rsocket.json +++ b/versions/r-/rsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1d02b39aaa70e97e3ec2551d1cfc6ae1a163199", + "version-string": "2021.08.30.00", + "port-version": 2 + }, { "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c", "version-string": "2021.08.30.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 399ed59dc8..f3e570fa2b 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05744fe658f891ca87fd5cdad73a382ace640bed", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "e79739dcf42e3dd4d0e32c595b27ece48c762bdd", "version-string": "2022.03.21.00",