[folly related] update to 09.02 (#40828)

2024-11-27 19:19:01 +08:00 · 2024-09-09 02:31:25 +08:00 · 2024-09-09 02:31:25 +08:00 · 5d4fbf376d
commit 5d4fbf376d
parent 46185edbb7
20 changed files with 49 additions and 62 deletions
--- 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 576beaa5a2c2b310b5aed3afc9bb3223a94fcd2c99a510cfcdaf932a5db6d4ea880a96252cf7a035a0ea9681712eab53852bf1695b26a6a4912cf33338daca42
+    SHA512 8ad405815257d670d143c83ae06591f1c97f05c0a07100d8b2e1e8a3ed4b8665659a01fc9f0eed53e57d32515d048308431151b7d00c2fc33c4be8e808ddb1bb
    HEAD_REF main
    PATCHES 
        fix-glog.patch
--- a/ports/fbthrift/vcpkg.json
+++ b/ports/fbthrift/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "fbthrift",
-  "version-string": "2024.08.26.00",
+  "version-string": "2024.09.02.00",
  "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
  "homepage": "https://github.com/facebook/fbthrift",
  "license": "Apache-2.0",
--- 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 9ed71cc4ec6ffd364dadf43c0f5b076731ba86c10c642e991e3021baab1cb96b990ab0356c6416d85e951daf074df26acb46ce85f399879af2978bbc0627ac5e
+    SHA512 68efc3709a72eff2e2a8528a1c57e3980319a812730de9ce88c70b33a19abf8f28fbb8ef4c10264fe8232fca48a0ce24e40d66a0fce0b9f234d5625daf0dbf55
    HEAD_REF main
    PATCHES
        fix-build.patch
--- a/ports/fizz/vcpkg.json
+++ b/ports/fizz/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "fizz",
-  "version-string": "2024.08.26.00",
+  "version-string": "2024.09.02.00",
  "description": "a TLS 1.3 implementation by Facebook",
  "homepage": "https://github.com/facebookincubator/fizz",
  "license": "BSD-3-Clause",
--- a/ports/folly/fix-character-in-folder.patch
+++ b/ports/folly/fix-character-in-folder.patch
@ -1,41 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c58dedc..c9561c1 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,6 +113,8 @@ set(
-   FOLLY_DIR_PREFIXES
-   "${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_BINARY_DIR}"
- )
-+# https://gitlab.kitware.com/cmake/cmake/-/issues/18580#note_1405108
-+string(REGEX REPLACE "(.)" "\\\\\\1" FOLLY_DIR_REGEX_ESCAPED "${FOLLY_DIR}")
- 
- include(GNUInstallDirs)
- 
-@@ -163,12 +165,12 @@ auto_sources(hfiles "*.h" "RECURSE" "${FOLLY_DIR}")
- # library sources.  Test sources are listed separately below.
- REMOVE_MATCHES_FROM_LISTS(files hfiles
-   MATCHES
-    "^${FOLLY_DIR}/build/"
-    "^${FOLLY_DIR}/docs/examples/"
-    "^${FOLLY_DIR}/logging/example/"
-    "^${FOLLY_DIR}/(.*/)?test/"
-    "^${FOLLY_DIR}/(.*/)?tool/"
-    "^${FOLLY_DIR}/facebook/"
-+    "^${FOLLY_DIR_REGEX_ESCAPED}/build/"
-+    "^${FOLLY_DIR_REGEX_ESCAPED}/docs/examples/"
-+    "^${FOLLY_DIR_REGEX_ESCAPED}/logging/example/"
-+    "^${FOLLY_DIR_REGEX_ESCAPED}/(.*/)?test/"
-+    "^${FOLLY_DIR_REGEX_ESCAPED}/(.*/)?tool/"
-+    "^${FOLLY_DIR_REGEX_ESCAPED}/facebook/"
-     "Benchmark.cpp$"
-     "Test.cpp$"
- )
-@@ -177,7 +179,7 @@ REMOVE_MATCHES_FROM_LISTS(files hfiles
- if (${FOLLY_NO_EXCEPTION_TRACER})
-   REMOVE_MATCHES_FROM_LISTS(files hfiles
-     MATCHES
-      "^${FOLLY_DIR}/debugging/exception_tracer/"
-+      "^${FOLLY_DIR_REGEX_ESCAPED}/debugging/exception_tracer/"
-   )
- endif()
- 
--- 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 4e73e6f1acbd4f04ca4e97c5b7b562c33fdbf320a57af672a3ce777688aaedcaba9102e93822855d8053b323c3074da4a2e279d710b3c706825ca37d3c99462e
+    SHA512 0d27bc460de66c7bf975c33fa7bbd572324b0aa49427a53cd04610ccdcb72874abb10778de256fb136164133d90589b6b1bffa2aa8aa9dc4046ac97473064591
    HEAD_REF main
    PATCHES
        disable-non-underscore-posix-names.patch
@ -18,7 +18,6 @@ vcpkg_from_github(
        disable-uninitialized-resize-on-new-stl.patch
        fix-unistd-include.patch
        fix-fmt11-cmake.patch
-        fix-character-in-folder.patch # https://github.com/facebook/folly/commit/0f698c382d34a2e139d5b2c071151ab33e1ffbd3
 )

 file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
--- a/ports/folly/vcpkg.json
+++ b/ports/folly/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "folly",
-  "version-string": "2024.08.26.00",
-  "port-version": 1,
+  "version-string": "2024.09.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",
--- 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 5bae7b25e7b3454a1f1d8be28f201dc5865f452257198ccd0ddd6ec642c1b6ba6e6c8010db470ef13acef51cbf11574cd53e7b7d34ac44690b12bfba8c38e3a0
+    SHA512 288ebb0419910b668cdbd493512516e4e9c34770fc009442d2658651f5bc584bf9c968304b59ed82067746d8eff225bc6bd2f61fa1fd42e8cf052e0d6df51130
    HEAD_REF main
 )

--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "mvfst",
-  "version-string": "2024.08.26.00",
+  "version-string": "2024.09.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",
--- 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 b1140e235de2cfa610c59d22cd9085f4a0e117e3fb902293f1a05556c47dd276030e4bb067f7e10c1fd2bdf3fd20842fd317e4dc0a88a0f95932645fde07d227
+    SHA512 598e4e170398c6a95ef4ab4f8826b716b74177f59f047d85427a53d2e51608c92d8130876c50cd51110f35a6fb4ad8b2969ee0ce64e94bcac808cec3ae0fc88f
    HEAD_REF main
    PATCHES
        remove-register.patch
--- a/ports/proxygen/vcpkg.json
+++ b/ports/proxygen/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "proxygen",
-  "version-string": "2024.08.26.00",
+  "version-string": "2024.09.02.00",
  "description": "It comprises the core C++ HTTP abstractions used at Facebook.",
  "homepage": "https://github.com/facebook/proxygen",
  "license": "BSD-3-Clause",
--- 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 ace2d0bbfc9e168289cb70ac6bc6d44a3bfc6343f9034146396b34b5813f549e5c10150620a2289ca065b4950937dd9a855f3455c2bd0485c5c59cdca0e7813e
+    SHA512 5dbe55570144feade8e731b7a8c7c3d72bcc017545362efd69a9c96918f970a729bcc9893088e028d4d412a24f45c076dd62e53b5b6d6da06c22716ea216c2fe
    HEAD_REF main
    PATCHES
        fix-config-cmake.patch
--- a/ports/wangle/vcpkg.json
+++ b/ports/wangle/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "wangle",
-  "version-string": "2024.08.26.00",
+  "version-string": "2024.09.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",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2693,7 +2693,7 @@
      "port-version": 1
    },
    "fbthrift": {
-      "baseline": "2024.08.26.00",
+      "baseline": "2024.09.02.00",
      "port-version": 0
    },
    "fcl": {
@ -2741,7 +2741,7 @@
      "port-version": 0
    },
    "fizz": {
-      "baseline": "2024.08.26.00",
+      "baseline": "2024.09.02.00",
      "port-version": 0
    },
    "flagpp": {
@ -2825,8 +2825,8 @@
      "port-version": 0
    },
    "folly": {
-      "baseline": "2024.08.26.00",
-      "port-version": 1
+      "baseline": "2024.09.02.00",
+      "port-version": 0
    },
    "font-chef": {
      "baseline": "1.1.0",
@ -6097,7 +6097,7 @@
      "port-version": 7
    },
    "mvfst": {
-      "baseline": "2024.08.26.00",
+      "baseline": "2024.09.02.00",
      "port-version": 0
    },
    "mygui": {
@ -7145,7 +7145,7 @@
      "port-version": 0
    },
    "proxygen": {
-      "baseline": "2024.08.26.00",
+      "baseline": "2024.09.02.00",
      "port-version": 0
    },
    "psimd": {
@ -9453,7 +9453,7 @@
      "port-version": 5
    },
    "wangle": {
-      "baseline": "2024.08.26.00",
+      "baseline": "2024.09.02.00",
      "port-version": 0
    },
    "wasmedge": {
--- a/versions/f-/fbthrift.json
+++ b/versions/f-/fbthrift.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "fbab3b045b008e9db45462ed1cdfb45c097ed659",
+      "version-string": "2024.09.02.00",
+      "port-version": 0
+    },
    {
      "git-tree": "abd041da61c46ef62adef9782d95dcc6ab3c91fd",
      "version-string": "2024.08.26.00",
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "bab275f847642bc0057f4f176df9ac11b440ef91",
+      "version-string": "2024.09.02.00",
+      "port-version": 0
+    },
    {
      "git-tree": "e1f06cb87426fecaa4093e8be00025d456d59725",
      "version-string": "2024.08.26.00",
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "fd1f6b565af8aa31c33469136f82beebe0e60dc5",
+      "version-string": "2024.09.02.00",
+      "port-version": 0
+    },
    {
      "git-tree": "3853e408c3b7432b3db7080a38252eb07cbe31d8",
      "version-string": "2024.08.26.00",
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "1a3749554e863acb8b58a27c5528f9ceb08fe059",
+      "version-string": "2024.09.02.00",
+      "port-version": 0
+    },
    {
      "git-tree": "d5f5105e2b00e2568cf79c75a6d4639109f5cf2a",
      "version-string": "2024.08.26.00",
--- a/versions/p-/proxygen.json
+++ b/versions/p-/proxygen.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "fe9fba5e78442c50e32bf3c65f07b712b8e94a7f",
+      "version-string": "2024.09.02.00",
+      "port-version": 0
+    },
    {
      "git-tree": "7e094f8674547f0d9c35ef187dcb919a0e5074f9",
      "version-string": "2024.08.26.00",
--- a/versions/w-/wangle.json
+++ b/versions/w-/wangle.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "24b95da00b642b65da6a4a35ddda85867d146362",
+      "version-string": "2024.09.02.00",
+      "port-version": 0
+    },
    {
      "git-tree": "f430127a29771f8dbe2456d084d405f44ee57259",
      "version-string": "2024.08.26.00",