diff --git a/ports/grpc/00005-fix-uwp-error.patch b/ports/grpc/00005-fix-uwp-error.patch index b70b0967ab..23f885d48e 100644 --- a/ports/grpc/00005-fix-uwp-error.patch +++ b/ports/grpc/00005-fix-uwp-error.patch @@ -1,9 +1,9 @@ diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -index cb17759bba..a3c3598430 100644 +index b0d3a6465b..5c48f1aa30 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -@@ -1032,7 +1032,7 @@ class HPackParser::Parser { - +@@ -1037,7 +1037,7 @@ class HPackParser::Parser { + private: void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { - const char* type; @@ -12,10 +12,10 @@ index cb17759bba..a3c3598430 100644 case LogInfo::kHeaders: type = "HDR"; diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc -index 2e78b4de9e..77e88cab70 100644 +index 898a62823c..6b31cdc082 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc -@@ -181,6 +181,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, +@@ -188,6 +188,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, size_t len) { uint8_t* ptr = reinterpret_cast(p.get()); grpc_slice slice; @@ -23,9 +23,9 @@ index 2e78b4de9e..77e88cab70 100644 if (len <= sizeof(slice.data.inlined.bytes)) { slice.refcount = nullptr; slice.data.inlined.length = len; -@@ -199,7 +200,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { +@@ -206,7 +207,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { } - + grpc_slice grpc_slice_from_cpp_string(std::string str) { - grpc_slice slice; + grpc_slice slice = { 0 }; @@ -33,11 +33,11 @@ index 2e78b4de9e..77e88cab70 100644 slice.refcount = nullptr; slice.data.inlined.length = str.size(); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc -index 4c0220837e..bb5a367107 100644 +index 141b16e345..89d9d6dafd 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -902,7 +902,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + FailCall(cq_idx, rc, GRPC_ERROR_CREATE("Server Shutdown")); return GRPC_CALL_OK; } - RequestMatcherInterface* rm; diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index 9a5c8efc1b..1c2bda5b1b 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8498b6e435..4e2e9a6130 100644 +index 48019cce95..1eda700ae8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -21946,7 +21946,7 @@ generate_pkgconfig( +@@ -23186,7 +23186,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "gpr openssl absl_any_invocable absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional 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 openssl absl_any_invocable absl_base absl_bind_front absl_cleanup absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional 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" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" -+ "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_collections -lupb_extension_registry -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz" ++ "-lgrpc -laddress_sorting -lre2 -lupb_textformat -lupb_mini_table -lupb -lupb_collections -lupb_reflection -lupb_extension_registry -lupb_json -lupb_fastdecode -lupb_utf8_range -ldescriptor_upb_proto -lcares -lz" "" "grpc.pc") diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index b4060a043f..09c669e55e 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.50.1 - SHA512 7c90ec9fd073980218f69eda704dbfb526dbd2f7f864135bdc6bd064789d1d8889127a253493196e617b0b90dddf1204ca9344c5e585ab0f0ca5c2a2a0a22ef1 + REF v1.51.1 + SHA512 1bc8e7a5a15b2dca88527d111cde398b0dc1921bbc945c6df8225b4225b8ac0b43155bcf743230ce7b5962d1ab948e9363229c98a879b1befc7a939a290fb888 HEAD_REF master PATCHES 00001-fix-uwp.patch diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 014755eaba..8fff07a24c 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version-semver": "1.50.1", + "version-semver": "1.51.1", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ae9f4d90ae..d43a22347c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2817,7 +2817,7 @@ "port-version": 0 }, "grpc": { - "baseline": "1.50.1", + "baseline": "1.51.1", "port-version": 0 }, "grppi": { diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 6e49e7d047..cde4dede10 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c026ebb0835a3e342a5aad8e0c2674d3ec77a67", + "version-semver": "1.51.1", + "port-version": 0 + }, { "git-tree": "13420572b45b2b5a5a3fb41eb383d0c62f1d7c51", "version-semver": "1.50.1",