diff --git a/ports/fbthrift/fix-annotation.patch b/ports/fbthrift/fix-annotation.patch new file mode 100644 index 00000000000..cd78095bcb2 --- /dev/null +++ b/ports/fbthrift/fix-annotation.patch @@ -0,0 +1,20 @@ +diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc +index 55d8fcaff7..97b0db790b 100644 +--- a/thrift/compiler/compiler.cc ++++ b/thrift/compiler/compiler.cc +@@ -735,6 +735,7 @@ std::unique_ptr parse_and_mutate( + const parsing_params& pparams, + const gen_params& gparams) { + auto found_or_error = source_manager::path_or_error(); ++#ifndef THRIFT_OSS + if (bundle_annotations()) { + const std::string scope_path = "thrift/annotation/scope.thrift"; + found_or_error = +@@ -747,6 +748,7 @@ std::unique_ptr parse_and_mutate( + scope_path, std::string(content.data(), content.size())); + } + } ++#endif + + // Parse it! + std::unique_ptr program_bundle = parse_ast( diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 302f0183159..f2299a2410e 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 1e8c6b0c3f592b03a5b405d749771107fafdb267f274f892461d691add9201c147eca052e948b8a206cbe0bd94596ae5fd274030a4faaf42e6f626fb6a7c22b7 + SHA512 b2175eac20ef9b4f15b5d9002583db7339549f660d03a1ced34289009cd99a4308a9ce340b9a37b9771a32340e80b7877b7c5498619241819cf0664e1e395bf7 HEAD_REF main PATCHES fix-deps.patch + fix-annotation.patch ) file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake") @@ -55,6 +56,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/client/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/compression/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/framing/parser/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/payload/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/server/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 3e9e8785305..c9452e80961 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.10.28.00", + "version-string": "2024.11.04.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/portfile.cmake b/ports/fizz/portfile.cmake index a4d30cf9620..7838c7cbd40 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 3faf5400287f34ca8f531bedeb299064c2a3c8ed4ca93029abc4789c58249e3ed071fb3ff815f29405a212bba060d8a4d08c0bab9d9d6e39f73b8f2cec304305 + SHA512 004665bca243ac835be3628e2196450fee30852e414b068ae98555193c3e9788800536a6280e218614df89061c3f05e501dfd89f08f3c5ba3942c3e9d476bf2c HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 53c38dcd38a..262285e5e6f 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.10.28.00", + "version-string": "2024.11.04.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 6ee74fc9c1c..a8d5b55ca6c 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 fb37eeb47466d596b5b4479e2113de1b91a83749771cb90dcd5fa68d9c9f2dfa6cae6b4bdb70f64c0c0bf1a7c2f35c4228751a6d3fa98ca5d3cfd8737bc5d425 + SHA512 e81e9862682e75703d7a5bf55e423386879503e4bed96d332a0844b87147e55976c980a602366b4aeade8911eba1f1db243293666ef005832e89d7f37a494b1e HEAD_REF main PATCHES disable-non-underscore-posix-names.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 8b59053f611..0887d44efb8 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.10.28.00", + "version-string": "2024.11.04.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/portfile.cmake b/ports/mvfst/portfile.cmake index a7ebecf70ca..983717d43bb 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/mvfst REF "v${VERSION}" - SHA512 6625ffeb3edfbf1e3a9078c74a75ce60296e89a845ab15b31f7e22daf51be0a7fd49a6965c73cef1d3d634caee3f99d4765ea998001cddf00204c10a030cf90f + SHA512 4a000583884777fa876f3bfc52a3420c9cf8818f943c07898ac3b313837092fc173d8db497fd59027ef405d8fa5e3114a53b3bc5cf3fef398ca712c06a1da3e0 HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index c81508b84f8..c59b1d44838 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.10.28.00", + "version-string": "2024.11.04.00", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebook/mvfst", "license": "MIT", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 3d098faed6c..a0de5baeb14 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen REF "v${VERSION}" - SHA512 764900c1c0a6effc5f5d865af7be6b393393508e2a8d1c9fdbba8ca59228f6a7b4150e8f927dbc695357a8560720205ecfeaa999b3f9c139575a77b0cf14eb25 + SHA512 4698f97dfa7190ffa3a3d4a5ab8b6708932b97594292569e30ee5d65073086b9874763336ebebb0a284607eb1859c858351104ac03895f3d5f2e3541c786229b HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 06cd9bd0e0f..8cf729a0bd9 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.10.28.00", + "version-string": "2024.11.04.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/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 8196a2e32a6..bd4a3f53dc5 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle REF "v${VERSION}" - SHA512 90618543ea9d2a05aae2f0a5c836ff5a5135d1cbae820e26c954d2ce14a094aa261255eaff97b2254b85ce497da7ed802108c532523033374b219e19294c1d8c + SHA512 d44f3553b04f378935c2a6cf072d6b4a911be3bb71f3480ccdbb269f83c0f62dce4451bcb2edb365d9b398f719c7162269690d07aab07054dafaa55b5b38e0ad HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index 201dc7923bb..f02b409a3ee 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.10.28.00", + "version-string": "2024.11.04.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 548ff057c40..da76b6ba968 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2721,7 +2721,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.10.28.00", + "baseline": "2024.11.04.00", "port-version": 0 }, "fcl": { @@ -2773,7 +2773,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.10.28.00", + "baseline": "2024.11.04.00", "port-version": 0 }, "flagpp": { @@ -2857,7 +2857,7 @@ "port-version": 1 }, "folly": { - "baseline": "2024.10.28.00", + "baseline": "2024.11.04.00", "port-version": 0 }, "font-chef": { @@ -6177,7 +6177,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.10.28.00", + "baseline": "2024.11.04.00", "port-version": 0 }, "mygui": { @@ -7217,7 +7217,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.10.28.00", + "baseline": "2024.11.04.00", "port-version": 0 }, "psimd": { @@ -9541,7 +9541,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2024.10.28.00", + "baseline": "2024.11.04.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 2942db93108..9492560e166 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec4aa5deb09787160f763dd0199a7505c7eb68fb", + "version-string": "2024.11.04.00", + "port-version": 0 + }, { "git-tree": "cbc002e503ff2807591c74acbfda182aaca0bba3", "version-string": "2024.10.28.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 39836b238b4..6780b4cff16 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a57dd398152dbc084ca5fde05b108ee3dd75903", + "version-string": "2024.11.04.00", + "port-version": 0 + }, { "git-tree": "c4effe7fdf2e7f2b303ae14a09c9976715c99455", "version-string": "2024.10.28.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 5188eafb7b6..35dd93a49e5 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "399b1bcab72dccdda31bd83e2873b9cc2cf292bf", + "version-string": "2024.11.04.00", + "port-version": 0 + }, { "git-tree": "9e610aa85d661f166a3cef3a74002f890fec4679", "version-string": "2024.10.28.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index c76c1cd7672..9820592e496 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26e88902a283c48ded934d1a2a986e1c65c4b73d", + "version-string": "2024.11.04.00", + "port-version": 0 + }, { "git-tree": "37b51e3cae87b4e88d5a03d511a8fb04a476e97a", "version-string": "2024.10.28.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 2540c8bbe58..6a27bf9fe74 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59b10462cfa7dd7a7c0acbd539f620c39a66733e", + "version-string": "2024.11.04.00", + "port-version": 0 + }, { "git-tree": "7c032a7339f3a41ca83b66ee8a4673c5141ea781", "version-string": "2024.10.28.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index d876f470832..1c783f0a8c3 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6d929dae4453cfa7e65250eebea67d2b481a74f", + "version-string": "2024.11.04.00", + "port-version": 0 + }, { "git-tree": "61456e6252285306ec84c85226f09e4449a41311", "version-string": "2024.10.28.00",