From 22ed401a0007f2123a67fb8b7125197c00ba62c0 Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 19 Nov 2024 13:32:01 +0800 Subject: [PATCH] [folly related] update to 11.11 (#42178) --- ports/fbthrift/fix-annotation.patch | 19 ++++++------------- ports/fbthrift/portfile.cmake | 2 +- ports/fbthrift/vcpkg.json | 2 +- ports/fizz/portfile.cmake | 2 +- ports/fizz/vcpkg.json | 2 +- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 3 +-- ports/mvfst/portfile.cmake | 2 +- ports/mvfst/vcpkg.json | 2 +- ports/proxygen/portfile.cmake | 2 +- ports/proxygen/vcpkg.json | 2 +- ports/wangle/portfile.cmake | 2 +- ports/wangle/vcpkg.json | 2 +- versions/baseline.json | 14 +++++++------- versions/f-/fbthrift.json | 5 +++++ versions/f-/fizz.json | 5 +++++ versions/f-/folly.json | 5 +++++ versions/m-/mvfst.json | 5 +++++ versions/p-/proxygen.json | 5 +++++ versions/w-/wangle.json | 5 +++++ 20 files changed, 55 insertions(+), 33 deletions(-) diff --git a/ports/fbthrift/fix-annotation.patch b/ports/fbthrift/fix-annotation.patch index cd78095bcb..fba656c89d 100644 --- a/ports/fbthrift/fix-annotation.patch +++ b/ports/fbthrift/fix-annotation.patch @@ -1,20 +1,13 @@ diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc -index 55d8fcaff7..97b0db790b 100644 +index 5e24fd6853f..8c7985e3c11 100644 --- a/thrift/compiler/compiler.cc +++ b/thrift/compiler/compiler.cc -@@ -735,6 +735,7 @@ std::unique_ptr parse_and_mutate( +@@ -734,7 +734,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()) { +- if (bundle_annotations()) { ++ if constexpr (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( + found_or_error = source_mgr.find_include_file( + scope_path, input_filename, pparams.incl_searchpath); diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index f2299a2410..c3a679570d 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 b2175eac20ef9b4f15b5d9002583db7339549f660d03a1ced34289009cd99a4308a9ce340b9a37b9771a32340e80b7877b7c5498619241819cf0664e1e395bf7 + SHA512 4d97e58534e29b9a9cd9c4331d1d1a4a47a58ccd6de75514a010ac7b01696d37dc09c022b10d7d939312cca9c87f1d3586b58355e5ae41812e7f147240594303 HEAD_REF main PATCHES fix-deps.patch diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index c9452e8096..d35d8eed1b 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.11.04.00", + "version-string": "2024.11.11.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 7838c7cbd4..ae850e76fe 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 004665bca243ac835be3628e2196450fee30852e414b068ae98555193c3e9788800536a6280e218614df89061c3f05e501dfd89f08f3c5ba3942c3e9d476bf2c + SHA512 fbfad920a1bef043409e0d76232f8dbaf6b2e8e3272fd05237dbca36549f966c11693e6b46ca3195eebd852009b43c9534ef03331bdce580db5fd1d6a5637e20 HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 262285e5e6..bac8967ced 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.11.04.00", + "version-string": "2024.11.11.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 5b9a6be60f..0fc3332fa7 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 e81e9862682e75703d7a5bf55e423386879503e4bed96d332a0844b87147e55976c980a602366b4aeade8911eba1f1db243293666ef005832e89d7f37a494b1e + SHA512 c57a1e7ea1a40180f2ec4b56a8312621e14b73fddd13c71d6e3fa1164156c1a4a9f151adae8a502949891192f306ee9dad56f9790082679aa82d101f8a0ddc9d HEAD_REF main PATCHES disable-non-underscore-posix-names.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 06333a603f..a7438da0f0 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2024.11.04.00", - "port-version": 1, + "version-string": "2024.11.11.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 983717d43b..eb77db8745 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 4a000583884777fa876f3bfc52a3420c9cf8818f943c07898ac3b313837092fc173d8db497fd59027ef405d8fa5e3114a53b3bc5cf3fef398ca712c06a1da3e0 + SHA512 f64620cb874bc6e3587e14905ac306f273a20b95424dd61420c159671cfb4df45553ed9ef33e19a7bc74e015b9c69b668d458c825d60d3cf5fce39fef1b6ba45 HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index c59b1d4483..7b08bc811e 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.11.04.00", + "version-string": "2024.11.11.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 a0de5baeb1..199a379943 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 4698f97dfa7190ffa3a3d4a5ab8b6708932b97594292569e30ee5d65073086b9874763336ebebb0a284607eb1859c858351104ac03895f3d5f2e3541c786229b + SHA512 9a9850cda195d1968c900abeec8e191e65406276ec81f10cdb0d39942a609440a4ecefaa9fc38e5575ee8d0b5d338a53996c6b76bd38d0a812ac2b22e0eb2077 HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 8cf729a0bd..2258aaa345 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.11.04.00", + "version-string": "2024.11.11.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 bd4a3f53dc..7d2006c93a 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 d44f3553b04f378935c2a6cf072d6b4a911be3bb71f3480ccdbb269f83c0f62dce4451bcb2edb365d9b398f719c7162269690d07aab07054dafaa55b5b38e0ad + SHA512 62151bc1894e0fab4c43135587612d3fcbd0b0f299640eb3c36be728fd7469c950fa71f20d4754208acb86d817142437abd79ba043cfafd13cf9e5a414e9c0d4 HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index f02b409a3e..3974775ac2 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.11.04.00", + "version-string": "2024.11.11.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 1d68ef47eb..87308b442c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2737,7 +2737,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.11.04.00", + "baseline": "2024.11.11.00", "port-version": 0 }, "fcl": { @@ -2789,7 +2789,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.11.04.00", + "baseline": "2024.11.11.00", "port-version": 0 }, "flagpp": { @@ -2873,8 +2873,8 @@ "port-version": 1 }, "folly": { - "baseline": "2024.11.04.00", - "port-version": 1 + "baseline": "2024.11.11.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -6201,7 +6201,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.11.04.00", + "baseline": "2024.11.11.00", "port-version": 0 }, "mygui": { @@ -7241,7 +7241,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.11.04.00", + "baseline": "2024.11.11.00", "port-version": 0 }, "psimd": { @@ -9577,7 +9577,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2024.11.04.00", + "baseline": "2024.11.11.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 9492560e16..18f67b9145 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82e7be9f4ae312bce9371f323e0b72c6423e80c1", + "version-string": "2024.11.11.00", + "port-version": 0 + }, { "git-tree": "ec4aa5deb09787160f763dd0199a7505c7eb68fb", "version-string": "2024.11.04.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 6780b4cff1..b910e7836a 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a0c3a2ac5d3a5a474ae9620665b38bc46751a3a", + "version-string": "2024.11.11.00", + "port-version": 0 + }, { "git-tree": "5a57dd398152dbc084ca5fde05b108ee3dd75903", "version-string": "2024.11.04.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index a8201d2247..a4208fb16f 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a189d29fa63323f9d159f93e5d121c608b7bc79a", + "version-string": "2024.11.11.00", + "port-version": 0 + }, { "git-tree": "9ca09c920d702b4156f710daf3b17ebb439bc8ba", "version-string": "2024.11.04.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 9820592e49..5bb54c65a4 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d9c29cbf191688e2c21a1a753ab9009c966bb3f", + "version-string": "2024.11.11.00", + "port-version": 0 + }, { "git-tree": "26e88902a283c48ded934d1a2a986e1c65c4b73d", "version-string": "2024.11.04.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 6a27bf9fe7..b6ea564092 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25ddd2355bb9e07e9e5d743c3d4215b2e67ecbf9", + "version-string": "2024.11.11.00", + "port-version": 0 + }, { "git-tree": "59b10462cfa7dd7a7c0acbd539f620c39a66733e", "version-string": "2024.11.04.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 1c783f0a8c..510871c907 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fce5e17f6ccc1162fc06273308167a9b3df3bec8", + "version-string": "2024.11.11.00", + "port-version": 0 + }, { "git-tree": "d6d929dae4453cfa7e65250eebea67d2b481a74f", "version-string": "2024.11.04.00",