[thrift] bump to 0.22.0 (#46278)

ports/thrift/correct-paths.patch

@@ -1,15 +0,0 @@
-diff --git a/build/cmake/GenerateConfigModule.cmake b/build/cmake/GenerateConfigModule.cmake
-index 9533c82..d074a1b 100644
---- a/build/cmake/GenerateConfigModule.cmake
-+++ b/build/cmake/GenerateConfigModule.cmake
-@@ -19,8 +19,8 @@
- 
- include(CMakePackageConfigHelpers)
- set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}/thrift")
--set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}/thrift")
--set(PACKAGE_BIN_INSTALL_DIR "${exec_prefix}")
-+set(PACKAGE_CMAKE_INSTALL_DIR "${prefix}/share/thrift")
-+set(PACKAGE_BIN_INSTALL_DIR "${prefix}/tools/thrift")
- 
- # In CYGWIN enviroment below commands does not work properly
- if (NOT CYGWIN)

ports/thrift/fix_missing_quotes_in_config_and_bin_path.patch

@@ -0,0 +1,51 @@
+diff --git a/build/cmake/ThriftConfig.cmake.in b/build/cmake/ThriftConfig.cmake.in
+index f52480104..616dbeda6 100644
+--- a/build/cmake/ThriftConfig.cmake.in
++++ b/build/cmake/ThriftConfig.cmake.in
+@@ -25,8 +25,8 @@ set_and_check(THRIFT_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+ 
+ set_and_check(THRIFT_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@/thrift")
+ 
+-if(@BUILD_COMPILER@)
+-    set_and_check(THRIFT_BIN_DIR "@PACKAGE_BIN_INSTALL_DIR@")
++if("@BUILD_COMPILER@")
++    set_and_check(THRIFT_BIN_DIR "@PACKAGE_BIN_INSTALL_DIR@/../tools/thrift")
+     if(NOT DEFINED THRIFT_COMPILER)
+         set(THRIFT_COMPILER "${THRIFT_BIN_DIR}/thrift@CMAKE_EXECUTABLE_SUFFIX@")
+     endif()
+@@ -37,14 +37,14 @@ if (NOT TARGET thrift::thrift)
+ endif()
+ set(THRIFT_LIBRARIES thrift::thrift)
+ 
+-if(@ZLIB_FOUND@ AND @WITH_ZLIB@)
++if("@ZLIB_FOUND@" AND "@WITH_ZLIB@")
+     if (NOT TARGET thriftz::thriftz)
+         include("${THRIFT_CMAKE_DIR}/thriftzTargets.cmake")
+     endif()
+     set(THRIFT_LIBRARIES thriftz::thriftz)
+ endif()
+ 
+-if(@Qt5_FOUND@ AND @WITH_QT5@)
++if("@Qt5_FOUND@" AND "@WITH_QT5@")
+     if (NOT TARGET thriftqt5::thriftqt5)
+         include("${THRIFT_CMAKE_DIR}/thriftqt5Targets.cmake")
+     endif()
+@@ -61,15 +61,15 @@ endif()
+ 
+ include(CMakeFindDependencyMacro)
+ 
+-if(@ZLIB_FOUND@ AND @WITH_ZLIB@)
++if("@ZLIB_FOUND@" AND "@WITH_ZLIB@")
+     find_dependency(ZLIB)
+ endif()
+ 
+-if(@OPENSSL_FOUND@ AND @WITH_OPENSSL@)
++if("@OPENSSL_FOUND@" AND "@WITH_OPENSSL@")
+     find_dependency(OpenSSL)
+ endif()
+ 
+-if(@Libevent_FOUND@ AND @WITH_LIBEVENT@)
++if("@Libevent_FOUND@" AND "@WITH_LIBEVENT@")
+     if(DEFINED CMAKE_MODULE_PATH)
+         set(THRIFT_CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
+     else()

ports/thrift/portfile.cmake

@@ -13,11 +13,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/thrift
     REF "v${VERSION}"
-    SHA512 5e4ee9870b30fe5ba484d39781c435716f7f3903793dc8aae96594ca813b1a5a73363b84719038ca8fa3ab8ef0a419a28410d936ff7b3bbadf36fc085a6883ae
+    SHA512 6dedcf48a8900e3a1dabfa73a4577a4d2482527b45ad8b77fec3fa7fdd8ea21b9249b3602c1e3e54bcee98143a9bb325b59e345423dc6dd8c9365889095615e2
     HEAD_REF master
     PATCHES
-      "correct-paths.patch"
       "pc-suffix.patch"
+      "fix_missing_quotes_in_config_and_bin_path.patch"
 )
 
 if (VCPKG_TARGET_IS_OSX)

ports/thrift/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "thrift",
-  "version": "0.20.0",
-  "port-version": 1,
+  "version": "0.22.0",
   "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.",
   "homepage": "https://github.com/apache/thrift",
   "license": "Apache-2.0",
@@ -11,6 +10,7 @@
     "boost-range",
     "boost-scope-exit",
     "boost-smart-ptr",
+    "boost-uuid",
     "libevent",
     "openssl",
     {

versions/baseline.json

@@ -9425,8 +9425,8 @@
       "port-version": 4
     },
     "thrift": {
-      "baseline": "0.20.0",
-      "port-version": 1
+      "baseline": "0.22.0",
+      "port-version": 0
     },
     "tidy-html5": {
       "baseline": "5.8.0",

versions/t-/thrift.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c4faad4f1e351534a8114aa84d5ab1dee2e025f",
+      "version": "0.22.0",
+      "port-version": 0
+    },
     {
       "git-tree": "13757a6b05741cf3c9c39e3a1dcc5e5cd685e025",
       "version": "0.20.0",