[macOS] Bump qtbase to 6.10 for macOS 26.5

3rd-party/vcpkg-ports/grpc/00001-fix-uwp.patch

@@ -1,73 +1,73 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa5b2a0..45d6b78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -284,6 +284,9 @@ if(UNIX)
- endif()
- if(WIN32)
-   set(_gRPC_PLATFORM_WINDOWS ON)
-+  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+    set(_gRPC_PLATFORM_UWP ON)
-+  endif()
- endif()
-
- if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD)
-@@ -314,6 +317,9 @@ if(MSVC)
-   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
-   # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
-   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
-+  if(_gRPC_PLATFORM_UWP)
-+    add_definitions(-DGRPC_ARES=0)
-+  endif()
-   # Silences thousands of trucation warnings
-   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503")
-   # Tell MSVC to build grpc using utf-8
-@@ -546,6 +552,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
- #     ``.proto`` files
- #
- function(protobuf_generate_grpc_cpp)
-+  if(_gRPC_PLATFORM_UWP)
-+    return()
-+  endif()
-+
-   if(NOT ARGN)
-     message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
-     return()
-@@ -668,6 +678,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
-   list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
- endif ()
-
-+if(NOT _gRPC_PLATFORM_UWP)
- add_custom_target(plugins
-   DEPENDS ${_gRPC_PLUGIN_LIST}
- )
-@@ -683,6 +694,7 @@ add_custom_target(tools_cxx
- add_custom_target(tools
-   DEPENDS tools_c tools_cxx)
-
-+endif()
- protobuf_generate_grpc_cpp_with_import_path_correction(
-   src/core/ext/transport/chaotic_good/chaotic_good_frame.proto src/core/ext/transport/chaotic_good/chaotic_good_frame.proto
- )
-diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-index 462ba6b..06e1a0c 100644
---- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-@@ -38,6 +38,7 @@ bool check_bios_data(const char*) { return false; }
- bool check_windows_registry_product_name(HKEY root_key,
-                                          const char* reg_key_path,
-                                          const char* reg_key_name) {
-+  #if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
-   const size_t kProductNameBufferSize = 256;
-   char const expected_substr[] = "Google";
-
-@@ -70,6 +71,9 @@ bool check_windows_registry_product_name(HKEY root_key,
-   }
-
-   return strstr(buffer, expected_substr) != nullptr;
-+#else
-+  return false;
-+#endif
- }
-
- }  // namespace internal
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc86c00463..e675fb3e5e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -292,6 +292,9 @@ if(UNIX)
+ endif()
+ if(WIN32)
+   set(_gRPC_PLATFORM_WINDOWS ON)
++  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++    set(_gRPC_PLATFORM_UWP ON)
++  endif()
+ endif()
+ 
+ if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD)
+@@ -322,6 +325,9 @@ if(MSVC)
+   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
+   # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
+   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
++  if(_gRPC_PLATFORM_UWP)
++    add_definitions(-DGRPC_ARES=0)
++  endif()
+   # Silences thousands of trucation warnings
+   set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503")
+   # Tell MSVC to build grpc using utf-8
+@@ -563,6 +569,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
+ #     ``.proto`` files
+ #
+ function(protobuf_generate_grpc_cpp)
++  if(_gRPC_PLATFORM_UWP)
++    return()
++  endif()
++
+   if(NOT ARGN)
+     message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
+     return()
+@@ -685,6 +695,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
+   list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
+ endif ()
+ 
++if(NOT _gRPC_PLATFORM_UWP)
+ add_custom_target(plugins
+   DEPENDS ${_gRPC_PLUGIN_LIST}
+ )
+@@ -700,6 +711,7 @@ add_custom_target(tools_cxx
+ add_custom_target(tools
+   DEPENDS tools_c tools_cxx)
+ 
++endif()
+ protobuf_generate_grpc_cpp_with_import_path_correction(
+   src/core/ext/transport/chaotic_good/chaotic_good_frame.proto src/core/ext/transport/chaotic_good/chaotic_good_frame.proto
+ )
+diff --git a/src/core/credentials/transport/alts/check_gcp_environment_windows.cc b/src/core/credentials/transport/alts/check_gcp_environment_windows.cc
+index dfbd5ec396..3b08ef0692 100644
+--- a/src/core/credentials/transport/alts/check_gcp_environment_windows.cc
++++ b/src/core/credentials/transport/alts/check_gcp_environment_windows.cc
+@@ -40,6 +40,7 @@ bool check_bios_data(const char*) { return false; }
+ bool check_windows_registry_product_name(HKEY root_key,
+                                          const char* reg_key_path,
+                                          const char* reg_key_name) {
++  #if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
+   const size_t kProductNameBufferSize = 256;
+   char const expected_substr[] = "Google";
+ 
+@@ -72,6 +73,9 @@ bool check_windows_registry_product_name(HKEY root_key,
+   }
+ 
+   return strstr(buffer, expected_substr) != nullptr;
++#else
++  return false;
++#endif
+ }
+ 
+ }  // namespace internal

3rd-party/vcpkg-ports/grpc/00006-utf8-range.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d1af5ce7d..791b933345 100644
+index bc86c00463..6f98d5e4c1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -4348,7 +4348,7 @@ if(gRPC_INSTALL)
+@@ -4641,7 +4641,7 @@ if(gRPC_INSTALL)
    )
  endif()
 
@@ -11,59 +11,59 @@ index 2d1af5ce7d..791b933345 100644
  add_library(utf8_range_lib
    third_party/utf8_range/utf8_range.c
  )
-@@ -4398,6 +4398,7 @@ if(gRPC_INSTALL)
+@@ -4691,6 +4691,7 @@ if(gRPC_INSTALL)
      ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
    )
  endif()
 +endif()
 
  if(gRPC_BUILD_TESTS)
 
-@@ -51142,9 +51143,9 @@ generate_pkgconfig(
+@@ -51977,9 +51978,9 @@ generate_pkgconfig(
    "high performance general RPC framework"
    "${gRPC_CORE_VERSION}"
-   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr"
+   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr"
 -  "libcares openssl re2 zlib"
 +  "libcares openssl re2 zlib utf8_range"
    "-lgrpc"
--  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
-+  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
+-  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
++  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
    "grpc.pc")
 
  # grpc_unsecure .pc file
-@@ -51153,9 +51154,9 @@ generate_pkgconfig(
+@@ -51988,9 +51989,9 @@ generate_pkgconfig(
    "high performance general RPC framework without SSL"
    "${gRPC_CORE_VERSION}"
-   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr"
+   "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr"
 -  "libcares zlib"
 +  "libcares zlib utf8_range"
    "-lgrpc_unsecure"
--  "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
-+  "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
+-  "-laddress_sorting -lupb_textformat_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
++  "-laddress_sorting -lupb_textformat_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
    "grpc_unsecure.pc")
 
  # grpc++ .pc file
-@@ -51164,9 +51165,9 @@ generate_pkgconfig(
+@@ -51999,9 +52000,9 @@ generate_pkgconfig(
    "C++ wrapper for gRPC"
    "${gRPC_CPP_VERSION}"
-   "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc"
+   "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc"
 -  "libcares openssl re2 zlib"
 +  "libcares openssl re2 zlib utf8_range"
    "-lgrpc++"
--  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
-+  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
+-  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
++  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
    "grpc++.pc")
 
  # grpc++_unsecure .pc file
-@@ -51175,18 +51176,20 @@ generate_pkgconfig(
+@@ -52010,18 +52011,20 @@ generate_pkgconfig(
    "C++ wrapper for gRPC without SSL"
    "${gRPC_CPP_VERSION}"
-   "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc_unsecure"
+   "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc_unsecure"
 -  "libcares zlib"
 +  "libcares zlib utf8_range"
    "-lgrpc++_unsecure"
--  "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
-+  "-laddress_sorting -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
+-  "-laddress_sorting -lupb_textformat_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
++  "-laddress_sorting -lupb_textformat_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
    "grpc++_unsecure.pc")
 
 +if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN)
@@ -72,12 +72,12 @@ index 2d1af5ce7d..791b933345 100644
    "gRPC++ OpenTelemetry Plugin"
    "OpenTelemetry Plugin for gRPC C++"
    "${gRPC_CPP_VERSION}"
-   "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr grpc grpc++ opentelemetry_api"
+   "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc grpc++ opentelemetry_api"
 -  "libcares openssl re2 zlib"
 +  "libcares openssl re2 zlib utf8_range"
    "-lgrpcpp_otel_plugin"
--  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
-+  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
+-  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
++  "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_reflection_lib -lupb_wire_lib -lupb_message_lib -lupb_mini_descriptor_lib -lupb_mini_table_lib -lupb_hash_lib -lupb_mem_lib -lupb_base_lib -lupb_lex_lib"
    "grpcpp_otel_plugin.pc")
 +endif()
 diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in

3rd-party/vcpkg-ports/grpc/00017-add-missing-include-file.patch

@@ -0,0 +1,39 @@
+diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h
+index 76bcbb2..f5c3d89 100644
+--- a/include/grpc/event_engine/memory_request.h
++++ b/include/grpc/event_engine/memory_request.h
+@@ -16,7 +16,7 @@
+
+ #include <grpc/support/port_platform.h>
+ #include <stddef.h>
+-
++#include <string>
+ #include "absl/strings/string_view.h"
+
+ namespace grpc_event_engine {
+diff --git a/src/core/channelz/v2tov1/property_list.cc b/src/core/channelz/v2tov1/property_list.cc
+index 64bbb63..dc3c9b0 100644
+--- a/src/core/channelz/v2tov1/property_list.cc
++++ b/src/core/channelz/v2tov1/property_list.cc
+@@ -17,7 +17,7 @@
+ #include <cstdint>
+ #include <optional>
+ #include <string>
+-
++#include <limits>
+ #include "absl/strings/string_view.h"
+ #include "google/protobuf/any.upb.h"
+ #include "google/protobuf/duration.upb.h"
+diff --git a/src/core/util/glob.cc b/src/core/util/glob.cc
+index 1b1c16e..d13138d 100644
+--- a/src/core/util/glob.cc
++++ b/src/core/util/glob.cc
+@@ -13,7 +13,7 @@
+ // limitations under the License.
+
+ #include "absl/strings/string_view.h"
+-
++#include <algorithm>
+ namespace grpc_core {
+
+ namespace {