From c2f60ee6133621beb9914db37872d59ab3b844a9 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 7 Dec 2024 04:14:27 +0800 Subject: [PATCH] [folly related] update to 12.02 (#42572) --- ports/fbthrift/portfile.cmake | 2 +- ports/fbthrift/vcpkg.json | 2 +- ports/fizz/portfile.cmake | 2 +- ports/fizz/vcpkg.json | 2 +- .../disable-non-underscore-posix-names.patch | 34 ------------------- ports/folly/fix-absolute-dir.patch | 14 ++++++++ ports/folly/portfile.cmake | 4 +-- 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 +++ 21 files changed, 63 insertions(+), 53 deletions(-) delete mode 100644 ports/folly/disable-non-underscore-posix-names.patch create mode 100644 ports/folly/fix-absolute-dir.patch diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 513cfc78e9..dd719adb9c 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 94873a1b07a71d62ce91d30b247bc7c00e71c9da3a3346d4f749f24a54641c22feb7ae7927144fc10008b274ea7728f83532bc45fc583a8bc42b479232a7b6c5 + SHA512 5e442d57490bbfb1df797053105bcfa4dcae72fb034e52555afd8aa2afe4645445e639f76be4eaae42de0df589f30009fd731833c84dc72774cf66d38738ac91 HEAD_REF main PATCHES fix-deps.patch diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index a1e4d79e2a..db73f94d65 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.11.18.00", + "version-string": "2024.12.02.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 5f76913ac7..50f60bc23f 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 5168421ab92ac54c50c087c09ff4ae6e19917e73ff074595466ca09db297d1aaf8f6afabe349c65e1f29ce87e359a2ffc6155c568252090803a781d6af231a4c + SHA512 a8071be9254efb9ce933824e894663b219a90cbcee46fb4cd0568744cc1045b167c2776a7b15f026a70a42a0d309e0c74882ef4e7ce05ca95b23090abb2bb9d2 HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 7a64779c8a..09caabaee5 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.11.18.00", + "version-string": "2024.12.02.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/disable-non-underscore-posix-names.patch b/ports/folly/disable-non-underscore-posix-names.patch deleted file mode 100644 index ad36fad7ad..0000000000 --- a/ports/folly/disable-non-underscore-posix-names.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h -index 86fd0f9..ccad11e 100644 ---- a/folly/portability/Windows.h -+++ b/folly/portability/Windows.h -@@ -32,24 +32,17 @@ - // disabled to ensure all of the normal names get declared properly. - #include - --#ifndef __STDC__ --/* nolint */ --#define __STDC__ 1 - #pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES") - #ifdef _CRT_DECLARE_NONSTDC_NAMES - #undef _CRT_DECLARE_NONSTDC_NAMES - #endif -+ -+#include - #pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES") --#undef _CRT_INTERNAL_NONSTDC_NAMES --#include // @manual nolint --#include // @manual nolint --#undef __STDC__ -+#define _CRT_INTERNAL_NONSTDC_NAMES 0 -+#include -+#include - #pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES") --#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES") --#else --#include // @manual nolint --#include // @manual nolint --#endif - - #if defined(min) || defined(max) - #error Windows.h needs to be included by this header, or else NOMINMAX needs \ diff --git a/ports/folly/fix-absolute-dir.patch b/ports/folly/fix-absolute-dir.patch new file mode 100644 index 0000000000..fac930a188 --- /dev/null +++ b/ports/folly/fix-absolute-dir.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bc99ce3..d887a7e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -481,9 +481,6 @@ add_library(folly_test_util + ${FOLLY_DIR}/test/DeterministicSchedule.cpp + ${FOLLY_DIR}/json/JsonTestUtil.cpp + ) +-target_compile_definitions(folly_test_util PUBLIC +- FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs" +-) + set_property(TARGET folly_test_util PROPERTY VERSION ${PACKAGE_VERSION}) + target_link_libraries(folly_test_util + PUBLIC diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index f16cce5dcb..1ec5e25cdf 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,15 +9,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 3331320e0e82eb19329eddcf5cd15ab54470352d8ec45087bd4e32d568f77a2ef68161f98bf8ad5b16253380313f82591e73987f8060017ee45b2457ac2f8b44 + SHA512 afa430ed4a1d4b617614d5c6893af5fb893b3bbb696c833234842b05fc40c1ef942883029777893b4cf4b44eda189889adb555367740dbba2032912f4d518622 HEAD_REF main PATCHES - disable-non-underscore-posix-names.patch fix-windows-minmax.patch fix-deps.patch disable-uninitialized-resize-on-new-stl.patch fix-unistd-include.patch fix-libunwind.patch + fix-absolute-dir.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFastFloat.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 3d0cab9f06..7481693c1e 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.11.18.00", + "version-string": "2024.12.02.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 ba9b79856e..0e47807c69 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 662a86f4b1b1d60f05c9198687c668e334061d00109148d3cd4643fc10c38c7bf2810fbb6fa1d01a25847e36c54a6cc2f6fb9e1405923f6a376be50f44252b29 + SHA512 bc5c622d80ba4a3f9837eaa3a78dcb4fdcc8d4526f51f2e5bd92517f1617d2218f72d0a2dcbacceffc4c645b5e1f9e7ad982b1b3d24d51230b74939f29f38be8 HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index 5be14d9e24..c26c33d0e2 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.11.18.00", + "version-string": "2024.12.02.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 b9043bf6d8..7e168c7ab5 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 a8fad342016dea2cd2c2e83f474bd4928643de1207b819afb8bd67bbb83551afa437f87d90040f84a12191c553c09e5bb181a920016f60713883918372599c39 + SHA512 b1a2dc7473b451aee520af7b8b08c1a7a2108a9d56e827ae1956d3f889d4e8329187df60685a019a48445896e40daf9539735af2f6675ebd7cca82051cf30441 HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index c74b538702..0c785f99fd 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.11.18.00", + "version-string": "2024.12.02.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 d4e26295c0..24922cf98f 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 cb45ff0c5b384f98b976cff240e1077c00c392007507cbf2e321e0b1a39d6cedc273a4bf172d529967aedf0abd0de6a3861ea724f8b1f8f31a9344da9cf0374e + SHA512 d774f870b41d0d302ebcfeadba94b4add880065808680e570cc5c357cc688f3ced0bbe6dd99ab5f3fc7b877c41b9c8f863b2103da600d3fd4ef4287df4444681 HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index a6056c06f4..266c1f4db4 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.11.18.00", + "version-string": "2024.12.02.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 b0a1ddae42..1937fed53f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2741,7 +2741,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.11.18.00", + "baseline": "2024.12.02.00", "port-version": 0 }, "fcl": { @@ -2793,7 +2793,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.11.18.00", + "baseline": "2024.12.02.00", "port-version": 0 }, "flagpp": { @@ -2877,7 +2877,7 @@ "port-version": 1 }, "folly": { - "baseline": "2024.11.18.00", + "baseline": "2024.12.02.00", "port-version": 0 }, "font-chef": { @@ -6205,7 +6205,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.11.18.00", + "baseline": "2024.12.02.00", "port-version": 0 }, "mygui": { @@ -7245,7 +7245,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.11.18.00", + "baseline": "2024.12.02.00", "port-version": 0 }, "psimd": { @@ -9589,7 +9589,7 @@ "port-version": 6 }, "wangle": { - "baseline": "2024.11.18.00", + "baseline": "2024.12.02.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 6eb410a410..84d9b68387 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f253cd751103762e84215e92e3c22b8aa751c086", + "version-string": "2024.12.02.00", + "port-version": 0 + }, { "git-tree": "6a85b5e10e213e480d71912a236443ec0be07de4", "version-string": "2024.11.18.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index d6261c8f40..7a9d513ab3 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fa5de0d3461acecb7471fa0a0032b81ca17efd2", + "version-string": "2024.12.02.00", + "port-version": 0 + }, { "git-tree": "bcea99722328dbfc6f8b862c828e36a3cc85f677", "version-string": "2024.11.18.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 314a942328..1ce4236f4f 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "715b29f6d979ee8987b4b7e117e2072349d3e5e5", + "version-string": "2024.12.02.00", + "port-version": 0 + }, { "git-tree": "d818cb28a5c43346a41adcafe1646dc110b85f85", "version-string": "2024.11.18.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index f34f1c4f15..ec5d6a4025 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64b31767a70fe3e608198f543d72df478b34d2e8", + "version-string": "2024.12.02.00", + "port-version": 0 + }, { "git-tree": "7c74f72c1132fa28593555c7ae8b23874d3a891d", "version-string": "2024.11.18.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 98585c23d5..374617b067 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0219cef3523b60715de39c759c6a7d17c9fc795d", + "version-string": "2024.12.02.00", + "port-version": 0 + }, { "git-tree": "8b544728cb9b64a01240ebcff3d64e701db39da9", "version-string": "2024.11.18.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index a0aa7e2ddf..a30d46db29 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71cd319ef343bf23dc2906dedd74d42080079087", + "version-string": "2024.12.02.00", + "port-version": 0 + }, { "git-tree": "5d1e30f1c6de18d11efbd3c06864e80014707e30", "version-string": "2024.11.18.00",