From ed6f9d83d964d420ed2c279157486b44fba54aeb Mon Sep 17 00:00:00 2001 From: c8ef Date: Wed, 21 Aug 2024 03:33:19 +0800 Subject: [PATCH] [folly related] update to 08.19 (#40545) --- ports/fbthrift/portfile.cmake | 3 ++- ports/fbthrift/vcpkg.json | 2 +- ports/fizz/fix-build-error-with-fmt11.patch | 13 ------------- ports/fizz/portfile.cmake | 3 +-- ports/fizz/vcpkg.json | 2 +- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 2 +- 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 | 12 ++++++------ 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, 49 insertions(+), 32 deletions(-) delete mode 100644 ports/fizz/fix-build-error-with-fmt11.patch diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index f36e1b1417..151836e808 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 d83a13844ac6d899784c6d684f0e52ed267f25e97e66b5f5e2b05be90364e4e0af7be13bcb2c20b1b10cce790a1a37a54c2c167b2151a98191ed9494f003a4dc + SHA512 274bae094c848234c4613da8c607524958af90f4b3b60450d3f4168e007c6bb7471a6306f8eace741317dd9f77669d5baa34fb721e523b261f1616c111129733 HEAD_REF main PATCHES fix-glog.patch @@ -34,6 +34,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/folly_dynamic/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/detail/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/runtime/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 4939a7dd3e..c24ee3dc79 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.08.05.00", + "version-string": "2024.08.19.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/fix-build-error-with-fmt11.patch b/ports/fizz/fix-build-error-with-fmt11.patch deleted file mode 100644 index 4dead667d0..0000000000 --- a/ports/fizz/fix-build-error-with-fmt11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fizz/record/Types.h b/fizz/record/Types.h -index 2cb449a..f1a370b 100644 ---- a/fizz/record/Types.h -+++ b/fizz/record/Types.h -@@ -454,7 +454,7 @@ struct hash { - - template <> - struct fmt::formatter : formatter { -- auto format(fizz::ExtensionType t, format_context& ctx) { -+ auto format(fizz::ExtensionType t, format_context& ctx) const { - return formatter::format(folly::to_underlying(t), ctx); - } - }; diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index e0570024d7..1ccf037509 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 6e98a53ee1ec5cc3b5e0e964ef69acbf70df2d0532ca888d2ac149e8c5200e4a5fb25120a45d012fdb5526644b0aad0eddf8dd1e85bbc5aa2ea48b86ef19902c + SHA512 7cee44f21be77cf7d02b92d9eb1332bc96d94d3d4e5cecb2201525d593c7917ce6b2a736f45d0964423689fa105a0b00ae7283b21f8ade5861906afc59092b5b HEAD_REF main PATCHES fix-build.patch - fix-build-error-with-fmt11.patch ) # Prefer installed config files diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 8d184714cb..ceec1eabed 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.08.05.00", + "version-string": "2024.08.19.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 5c15adbebe..39e11323af 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 32633ffdc8f200e4c36c7583b53102400104ac036a0c1c5ab2d6effa19a3cdf2559bb8aac3fecbd816bc4061e9c2572625b4dedfe59225b4395196790230bee2 + SHA512 1637fe98a16b44d2be68357b1b07b3d95f7950dbc807158ac82ec935c79d8423e6ed24ebaeb99cc6a8505f301819d3c77a04ba818528d2df84e92c42309fd5f5 HEAD_REF main PATCHES disable-non-underscore-posix-names.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 81d94442b3..2cc19d5b55 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.08.12.00", + "version-string": "2024.08.19.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 9558392a06..04ad0df957 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 82fee3468ee77d4d0b5c74184568f2236e2c5eb0a68bbbbf4208afbf8273ec013c165ce5d46e57aef6292463c5a29e2b6877f335ef2cbaaced13d326bed5e498 + SHA512 186326bed7a396b490ebd2e829ede9f28300d65b0567ada8c9d02a323cc658b6a6ddfea7044579ce122af6161c8f4cb915b29753faf833b359be9f26217cf45e HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index 8ce3d0fca2..4598c2bce3 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.08.05.00", + "version-string": "2024.08.19.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 185f462477..97ed968d37 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 faef86bb3829f5ee38b4037a245a1f65406b65a416d393bf4aab91af4689a728dc54fc1e00aab7f4048e706d2940e31c6e7eb0f3c09ad52be1f5988a3a30620d + SHA512 0743b783fe4c76e8f75c451dfc580263b5a24453fb9561a9d39847a205533f3b0ed522a1b880f23e6a75560d734cb8725704cf3df521eb498d278aa3f83b23a4 HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index f994601bd1..a28622d2de 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.08.05.00", + "version-string": "2024.08.19.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 d7f51cf4d9..b041df986a 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 fbbcb02832c85c03e90fc8ddb0395e0afefedecf2909ef8c15ffe7f3bb76f63320724903288a1f1fd850ed23a08999c3371c28b542eb6a098d497f7b5a1e305f + SHA512 3a48aad4a3bc862ebb3c00db3099164d3c4c47e7dc1822ece1c07700e7b8c2d673d9d470cc7d8d4fc599e2299c2c1fd068e82e1dbd942c04ca8a6c3fc3be82ee HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index c11b0b5112..04fa2f2771 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.08.05.00", + "version-string": "2024.08.19.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 609b302e19..448424203b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2689,7 +2689,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.08.05.00", + "baseline": "2024.08.19.00", "port-version": 0 }, "fcl": { @@ -2733,7 +2733,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.08.05.00", + "baseline": "2024.08.19.00", "port-version": 0 }, "flagpp": { @@ -2817,7 +2817,7 @@ "port-version": 0 }, "folly": { - "baseline": "2024.08.12.00", + "baseline": "2024.08.19.00", "port-version": 0 }, "font-chef": { @@ -6069,7 +6069,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.08.05.00", + "baseline": "2024.08.19.00", "port-version": 0 }, "mygui": { @@ -7113,7 +7113,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.08.05.00", + "baseline": "2024.08.19.00", "port-version": 0 }, "psimd": { @@ -9413,7 +9413,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2024.08.05.00", + "baseline": "2024.08.19.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index b0776065b4..fc05a30567 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e84bd684e7afa47716e6694df17e9a2ee1e94b6", + "version-string": "2024.08.19.00", + "port-version": 0 + }, { "git-tree": "12d1d69679fafa77c9e4446df7020a419c828c5a", "version-string": "2024.08.05.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index d66b1d95a9..5094711118 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c80a57ab6fc316f8ae556324579868170e0b6c3", + "version-string": "2024.08.19.00", + "port-version": 0 + }, { "git-tree": "d70e5cc1bb1d1bda39150c654e606b7db4d1cdcc", "version-string": "2024.08.05.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 018fe5f717..bcb91f455d 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b62f12fba0a611b89e8b5ffcbb74b11d3fa3e9a", + "version-string": "2024.08.19.00", + "port-version": 0 + }, { "git-tree": "c7154490b97a5dd38fdd977ee601bae786a37c6e", "version-string": "2024.08.12.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index a6f0b2aedc..1ccadca492 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2780ce3e9a7d00f93b698dd5305e55ab916d2bf8", + "version-string": "2024.08.19.00", + "port-version": 0 + }, { "git-tree": "868196c1251f53fb06cb6cc8d7391ff18820c7d9", "version-string": "2024.08.05.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index fcc1990897..783cf465ec 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa9c26451502226920951aea6d240fbffa92d7bc", + "version-string": "2024.08.19.00", + "port-version": 0 + }, { "git-tree": "fa926c98e20d85f29e4018e77f2dd22a91672fa6", "version-string": "2024.08.05.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 39a927ab3e..bd87ffad36 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cd95b2c9cb709a70438dd4e91bd3778ec0e8aae", + "version-string": "2024.08.19.00", + "port-version": 0 + }, { "git-tree": "5b6429dededc1cd1531f8cbcf2b75d2d27e8d40f", "version-string": "2024.08.05.00",