From ae7d8f5056f717c0aac58e6bf24ef3911f33b7c5 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 27 Nov 2024 22:35:19 +0100 Subject: [PATCH] [grpc] update to 1.68.0 (#42340) --- ports/etcd-cpp-apiv3/portfile.cmake | 9 ++ ports/etcd-cpp-apiv3/vcpkg.json | 1 + ports/grpc/00006-utf8-range.patch | 46 +++--- ports/grpc/00009-use-system-upb.patch | 151 ------------------ .../grpc/00018-fix-windows-event-engine.patch | 2 +- ...generate-with-import-path-correction.patch | 14 ++ ports/grpc/portfile.cmake | 4 +- ports/grpc/vcpkg.json | 2 +- ports/utf8-range/portfile.cmake | 2 +- ports/utf8-range/vcpkg.json | 2 +- versions/baseline.json | 6 +- versions/e-/etcd-cpp-apiv3.json | 5 + versions/g-/grpc.json | 5 + versions/u-/utf8-range.json | 5 + 14 files changed, 72 insertions(+), 182 deletions(-) delete mode 100644 ports/grpc/00009-use-system-upb.patch create mode 100644 ports/grpc/00019-protobuf-generate-with-import-path-correction.patch diff --git a/ports/etcd-cpp-apiv3/portfile.cmake b/ports/etcd-cpp-apiv3/portfile.cmake index b4f416fe08..889acfe17a 100644 --- a/ports/etcd-cpp-apiv3/portfile.cmake +++ b/ports/etcd-cpp-apiv3/portfile.cmake @@ -1,9 +1,18 @@ +vcpkg_download_distfile( + GRPC_PATCH + URLS https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/commit/216b86f8d763acf88e4ed7265f983b57c12da2df.patch?full_index=1 + SHA512 5a2c843c41d6c1e84333773cbec9fd3e1c6501d325a053a2c02c8e3aa752422158a6239c1f47a1d8d7ac129a45f3385efce543ec7260b7309f8b76d2ea7a1ca2 + FILENAME 216b86f8d763acf88e4ed7265f983b57c12da2df.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO etcd-cpp-apiv3/etcd-cpp-apiv3 REF "v${VERSION}" SHA512 52f3cf14ad5594c04a086786d3459aee0986017a0314dfdf3fff1715677ff7a7ebedcc0afc28e1d7e75b8991ab6ede95eeded472d85ac1def84343cc1c54a30a HEAD_REF master + PATCHES + "${GRPC_PATCH}" ) file(WRITE "${SOURCE_PATH}/cmake/UploadPPA.cmake" "") diff --git a/ports/etcd-cpp-apiv3/vcpkg.json b/ports/etcd-cpp-apiv3/vcpkg.json index 6277692437..a85c372b16 100644 --- a/ports/etcd-cpp-apiv3/vcpkg.json +++ b/ports/etcd-cpp-apiv3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "etcd-cpp-apiv3", "version": "0.15.4", + "port-version": 1, "description": "The etcd-cpp-apiv3 is a C++ API for etcd's v3 client API, i.e., ETCDCTL_API=3.", "homepage": "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3", "license": "BSD-3-Clause", diff --git a/ports/grpc/00006-utf8-range.patch b/ports/grpc/00006-utf8-range.patch index 0f69b423a2..0ee1513a57 100644 --- a/ports/grpc/00006-utf8-range.patch +++ b/ports/grpc/00006-utf8-range.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2008859625..73462d8285 100644 +index fc4b6a40a5..3e657e7405 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -3931,7 +3931,7 @@ if(gRPC_INSTALL) +@@ -4447,7 +4447,7 @@ if(gRPC_INSTALL) ) endif() @@ -11,7 +11,7 @@ index 2008859625..73462d8285 100644 add_library(utf8_range_lib third_party/utf8_range/utf8_range.c ) -@@ -3981,6 +3981,7 @@ if(gRPC_INSTALL) +@@ -4497,6 +4497,7 @@ if(gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() @@ -19,51 +19,51 @@ index 2008859625..73462d8285 100644 if(gRPC_BUILD_TESTS) -@@ -37649,9 +37650,9 @@ generate_pkgconfig( +@@ -40772,9 +40773,9 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front 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 absl_variant gpr" + "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 absl_variant gpr" - "libcares openssl re2 zlib" + "libcares openssl re2 zlib utf8_range" "-lgrpc" -- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" +- "-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" "grpc.pc") # grpc_unsecure .pc file -@@ -37660,9 +37661,9 @@ generate_pkgconfig( +@@ -40783,9 +40784,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_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 absl_variant gpr" + "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 absl_variant gpr" - "libcares zlib" + "libcares zlib utf8_range" "-lgrpc_unsecure" -- "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib" +- "-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" "grpc_unsecure.pc") # grpc++ .pc file -@@ -37671,9 +37672,9 @@ generate_pkgconfig( +@@ -40794,9 +40795,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_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 absl_variant gpr grpc" + "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 absl_variant gpr grpc" - "libcares openssl re2 zlib" + "libcares openssl re2 zlib utf8_range" "-lgrpc++" -- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" +- "-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" "grpc++.pc") # grpc++_unsecure .pc file -@@ -37682,18 +37683,20 @@ generate_pkgconfig( +@@ -40805,18 +40806,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_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 absl_variant gpr grpc_unsecure" + "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 absl_variant gpr grpc_unsecure" - "libcares zlib" + "libcares zlib utf8_range" "-lgrpc++_unsecure" -- "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib" +- "-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" "grpc++_unsecure.pc") +if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) @@ -72,12 +72,12 @@ index 2008859625..73462d8285 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_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 absl_variant 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_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 absl_variant 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_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib" +- "-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" "grpcpp_otel_plugin.pc") +endif() diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in @@ -93,7 +93,7 @@ index d552e0bb4e..5751f503ba 100644 # Targets include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index 9156e5f48f..5323b5f10d 100644 +index 9156e5f48f..d3d9ee410e 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake @@ -14,7 +14,9 @@ diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch deleted file mode 100644 index d74b414121..0000000000 --- a/ports/grpc/00009-use-system-upb.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43fa8f6d97..8c28c3fc32 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3345,16 +3345,6 @@ add_library(grpc_unsecure - src/core/util/json/json_object_loader.cc - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc -- third_party/upb/upb/mini_descriptor/build_enum.c -- third_party/upb/upb/mini_descriptor/decode.c -- third_party/upb/upb/mini_descriptor/internal/base92.c -- third_party/upb/upb/mini_descriptor/internal/encode.c -- third_party/upb/upb/mini_descriptor/link.c -- third_party/upb/upb/wire/decode.c -- third_party/upb/upb/wire/encode.c -- third_party/upb/upb/wire/eps_copy_input_stream.c -- third_party/upb/upb/wire/internal/decode_fast.c -- third_party/upb/upb/wire/reader.c - ${gRPC_ADDITIONAL_DLL_SRC} - ) - -@@ -3593,7 +3583,7 @@ target_link_libraries(gtest - - - endif() -- -+if(0) - add_library(upb_base_lib - third_party/upb/upb/base/status.c - ) -@@ -3644,7 +3634,6 @@ if(gRPC_INSTALL) - ) - endif() - -- - add_library(upb_json_lib ${_gRPC_STATIC_WIN32} - third_party/upb/upb/json/decode.c - third_party/upb/upb/json/encode.c -@@ -3981,6 +3970,7 @@ if(gRPC_INSTALL) - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) - endif() -+endif() - - if(gRPC_BUILD_TESTS) - -@@ -5416,16 +5406,6 @@ add_library(grpc_authorization_provider - src/core/tsi/transport_security_grpc.cc - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc -- third_party/upb/upb/mini_descriptor/build_enum.c -- third_party/upb/upb/mini_descriptor/decode.c -- third_party/upb/upb/mini_descriptor/internal/base92.c -- third_party/upb/upb/mini_descriptor/internal/encode.c -- third_party/upb/upb/mini_descriptor/link.c -- third_party/upb/upb/wire/decode.c -- third_party/upb/upb/wire/encode.c -- third_party/upb/upb/wire/eps_copy_input_stream.c -- third_party/upb/upb/wire/internal/decode_fast.c -- third_party/upb/upb/wire/reader.c - ) - - target_compile_features(grpc_authorization_provider PUBLIC cxx_std_14) -@@ -37649,9 +37629,9 @@ generate_pkgconfig( - "high performance general RPC framework" - "${gRPC_CORE_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front 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 absl_variant gpr" -- "libcares openssl re2 zlib" -+ "libcares openssl re2 zlib utf8_range" - "-lgrpc" -- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb" - "grpc.pc") - - # grpc_unsecure .pc file -@@ -37660,9 +37640,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_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 absl_variant gpr" -- "libcares zlib" -+ "libcares zlib utf8_range" - "-lgrpc_unsecure" -- "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb" - "grpc_unsecure.pc") - - # grpc++ .pc file -@@ -37671,9 +37651,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_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 absl_variant gpr grpc" -- "libcares openssl re2 zlib" -+ "libcares openssl re2 zlib utf8_range" - "-lgrpc++" -- "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb" - "grpc++.pc") - - # grpc++_unsecure .pc file -@@ -37682,11 +37662,12 @@ 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_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 absl_variant gpr grpc_unsecure" -- "libcares zlib" -+ "libcares zlib utf8_range" - "-lgrpc++_unsecure" -- "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" -+ "-laddress_sorting -lupb" - "grpc++_unsecure.pc") - -+if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) - # grpcpp_otel_plugin .pc file - generate_pkgconfig( - "gRPC++ OpenTelemetry Plugin" -@@ -37697,3 +37678,4 @@ generate_pkgconfig( - "-lgrpcpp_otel_plugin" - "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" - "grpcpp_otel_plugin.pc") -+endif() -diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in -index d552e0bb4e..d40c07ce7a 100644 ---- a/cmake/gRPCConfig.cmake.in -+++ b/cmake/gRPCConfig.cmake.in -@@ -9,6 +9,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) - @_gRPC_FIND_ABSL@ - @_gRPC_FIND_RE2@ - @_gRPC_FIND_OPENTELEMETRY@ -+@_gRPC_FIND_UPB@ - - # Targets - include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) -diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index 9156e5f48f..3cc7ad4005 100644 ---- a/cmake/upb.cmake -+++ b/cmake/upb.cmake -@@ -14,7 +14,14 @@ - - set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb) - --set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range") -+set(_gRPC_UPB_INCLUDE_DIR "") - set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-gen" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-gen") - - set(_gRPC_UPB_LIBRARIES upb) -+ -+find_package(upb CONFIG REQUIRED) -+set(_gRPC_FIND_UPB "find_dependency(upb CONFIG)") -+add_library(upb_json_lib ALIAS upb::upb) -+add_library(upb_textformat_lib ALIAS upb::upb) -+add_library(upb_message_lib ALIAS upb::upb) -+add_library(utf8_range_lib ALIAS utf8_range::utf8_range) diff --git a/ports/grpc/00018-fix-windows-event-engine.patch b/ports/grpc/00018-fix-windows-event-engine.patch index dc0cffb117..41e5ed9d0f 100644 --- a/ports/grpc/00018-fix-windows-event-engine.patch +++ b/ports/grpc/00018-fix-windows-event-engine.patch @@ -1,5 +1,5 @@ diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc -index 37a8f85cc5..b319f17aaf 100644 +index 3bfd15537e..0d4dcd5579 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc @@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd { diff --git a/ports/grpc/00019-protobuf-generate-with-import-path-correction.patch b/ports/grpc/00019-protobuf-generate-with-import-path-correction.patch new file mode 100644 index 0000000000..92b6d2e8a9 --- /dev/null +++ b/ports/grpc/00019-protobuf-generate-with-import-path-correction.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f7102d3cc..646cd86dcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -580,6 +580,9 @@ function(protobuf_generate_grpc_cpp_with_import_path_correction FILE_LOCATION IM + message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") + return() + endif() ++ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${FILE_LOCATION}") ++ return() ++ endif() + + # Sets the include path for ProtoBuf files + set(_protobuf_include_path -I . -I ${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 7e7b1ca8e8..98a0a2262c 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc REF "v${VERSION}" - SHA512 a930bd9d8d0308f62fdda7ca215321b69a0cca8d8e0ce654b6938cd71dfd568fe63b5dd6ab0ee537e67751211e240b19cc23e07f5927dac318cf9be778d9fec2 + SHA512 498ddf8b5da5d2419aa778ee6b35f00e34339a3ba167887380d015d4a3b8b0fa457bfce6d13870621100b1f45d18d88f732bef90fbdcf55a58f0da0a16ad9759 HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -18,6 +18,7 @@ vcpkg_from_github( 00016-fix-plugin-targets.patch 00017-fix-NAN-on-Win11.patch 00018-fix-windows-event-engine.patch + 00019-protobuf-generate-with-import-path-correction.patch ) # Ensure de-vendoring file(REMOVE_RECURSE @@ -69,6 +70,7 @@ vcpkg_cmake_configure( "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" -DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=OFF + -DgRPC_DOWNLOAD_ARCHIVES=OFF MAYBE_UNUSED_VARIABLES gRPC_MSVC_STATIC_RUNTIME ) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 82474a3b03..68c4c40269 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version-semver": "1.65.5", + "version-semver": "1.68.0", "description": "gRPC is a modern, open source, high-performance remote procedure call (RPC) framework that can run anywhere. gRPC enables client and server applications to communicate transparently, and simplifies the building of connected systems.", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/ports/utf8-range/portfile.cmake b/ports/utf8-range/portfile.cmake index 3bf651c288..33d8956736 100644 --- a/ports/utf8-range/portfile.cmake +++ b/ports/utf8-range/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf REF "v${VERSION}" - SHA512 ce3eeb6d12c42157787bf97d265f34ac8e8af31070a2717b4c783e9158b6d7fbb5f239585fc38128a658315842cf7b6802cb9a80f4f391505bf806952e009da5 + SHA512 a188d109f317c0cff1d57c3d81b307ff46db816774af2eb4edc39b136725bb3ed70fafbcffcdf9465f6f948a1e7dfc0175f75b17acd414e5ae543939a510688a HEAD_REF main PATCHES fix-cmake.patch diff --git a/ports/utf8-range/vcpkg.json b/ports/utf8-range/vcpkg.json index 63aa07f1e8..4f01042005 100644 --- a/ports/utf8-range/vcpkg.json +++ b/ports/utf8-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "utf8-range", - "version": "5.26.1", + "version": "5.28.3", "description": "Fast UTF-8 validation with Range algorithm (NEON+SSE4+AVX2)", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4ec7800ee4..8fdc90a051 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2614,7 +2614,7 @@ }, "etcd-cpp-apiv3": { "baseline": "0.15.4", - "port-version": 0 + "port-version": 1 }, "etl": { "baseline": "20.39.4", @@ -3285,7 +3285,7 @@ "port-version": 0 }, "grpc": { - "baseline": "1.65.5", + "baseline": "1.68.0", "port-version": 0 }, "grppi": { @@ -9273,7 +9273,7 @@ "port-version": 4 }, "utf8-range": { - "baseline": "5.26.1", + "baseline": "5.28.3", "port-version": 0 }, "utf8h": { diff --git a/versions/e-/etcd-cpp-apiv3.json b/versions/e-/etcd-cpp-apiv3.json index 62d1e8c93e..f0ea573627 100644 --- a/versions/e-/etcd-cpp-apiv3.json +++ b/versions/e-/etcd-cpp-apiv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "791701d891fdeb2955f502e13c64abd9bb632e15", + "version": "0.15.4", + "port-version": 1 + }, { "git-tree": "aacdad15e8da4dc2ee4461860f30bc4c89d60aee", "version": "0.15.4", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index eb3dbb3cfd..b466e1e4e8 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cd4312a39e794cf750e3e14a380e0901c40709d", + "version-semver": "1.68.0", + "port-version": 0 + }, { "git-tree": "10af44d76c4c33d8229d128ca41520bd69420d34", "version-semver": "1.65.5", diff --git a/versions/u-/utf8-range.json b/versions/u-/utf8-range.json index 9be82173b7..b5bead92bb 100644 --- a/versions/u-/utf8-range.json +++ b/versions/u-/utf8-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fca368158ad02ea861065c11c195ca58d94206f", + "version": "5.28.3", + "port-version": 0 + }, { "git-tree": "8f1c516c43009f8aff54f87b0d9784f65bcb0012", "version": "5.26.1",