From cd8f320b8da4abea716382293e847cb658a21211 Mon Sep 17 00:00:00 2001 From: Jozef Izso Date: Thu, 3 Oct 2019 18:41:24 +0200 Subject: [PATCH] [grpc] Update grpc to 1.23.1 (#8438) --- ports/grpc/00001-fix-uwp.patch | 52 +++++++++++++++++----------------- ports/grpc/CONTROL | 2 +- ports/grpc/portfile.cmake | 4 +-- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ports/grpc/00001-fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch index 6f7f2d90f..6b5d15490 100644 --- a/ports/grpc/00001-fix-uwp.patch +++ b/ports/grpc/00001-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ba68c4a13..258a1609f6 100644 +index 48a0261825..2ba7077c4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -90,6 +90,9 @@ if(UNIX) +@@ -92,6 +92,9 @@ if(UNIX) endif() if(WIN32) set(_gRPC_PLATFORM_WINDOWS ON) @@ -12,7 +12,7 @@ index 8ba68c4a13..258a1609f6 100644 endif() set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -@@ -107,6 +110,9 @@ if (MSVC) +@@ -109,6 +112,9 @@ if (MSVC) add_definitions(/wd4267) # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619) @@ -22,7 +22,7 @@ index 8ba68c4a13..258a1609f6 100644 endif() if (gRPC_USE_PROTO_LITE) -@@ -177,6 +183,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) +@@ -179,6 +185,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) # ``.proto`` files # function(protobuf_generate_grpc_cpp) @@ -33,7 +33,7 @@ index 8ba68c4a13..258a1609f6 100644 if(NOT ARGN) message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") return() -@@ -218,6 +228,7 @@ function(protobuf_generate_grpc_cpp) +@@ -220,6 +230,7 @@ function(protobuf_generate_grpc_cpp) endforeach() endfunction() @@ -41,7 +41,7 @@ index 8ba68c4a13..258a1609f6 100644 add_custom_target(plugins DEPENDS grpc_cpp_plugin -@@ -247,6 +258,8 @@ add_custom_target(tools_cxx +@@ -249,6 +260,8 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -50,7 +50,7 @@ index 8ba68c4a13..258a1609f6 100644 if (gRPC_BUILD_TESTS) add_custom_target(buildtests_c) add_dependencies(buildtests_c algorithm_test) -@@ -4029,7 +4042,6 @@ foreach(_hdr +@@ -3532,7 +3545,6 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() @@ -58,7 +58,7 @@ index 8ba68c4a13..258a1609f6 100644 if (gRPC_BUILD_CODEGEN) -@@ -4040,6 +4052,7 @@ if (gRPC_INSTALL) +@@ -3543,6 +3555,7 @@ if (gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() @@ -66,7 +66,23 @@ index 8ba68c4a13..258a1609f6 100644 endif (gRPC_BUILD_CODEGEN) if (gRPC_BUILD_TESTS) -@@ -4163,7 +4176,7 @@ foreach(_hdr +@@ -3666,7 +3679,6 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_CODEGEN) + +@@ -3677,6 +3689,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + endif (gRPC_BUILD_CODEGEN) + if (gRPC_BUILD_TESTS) +@@ -4729,7 +4742,7 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() @@ -75,23 +91,7 @@ index 8ba68c4a13..258a1609f6 100644 if (gRPC_BUILD_CODEGEN) -@@ -4174,6 +4187,7 @@ if (gRPC_INSTALL) - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) - endif() -+endif (gRPC_BUILD_CODEGEN) - - endif (gRPC_BUILD_CODEGEN) - if (gRPC_BUILD_TESTS) -@@ -5196,7 +5210,6 @@ foreach(_hdr - DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" - ) - endforeach() --endif (gRPC_BUILD_CODEGEN) - - if (gRPC_BUILD_CODEGEN) - -@@ -5207,6 +5220,7 @@ if (gRPC_INSTALL) +@@ -4740,6 +4753,7 @@ if (gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 5e117e2d2..ce9c7c04e 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,5 +1,5 @@ Source: grpc -Version: 1.23.0 +Version: 1.23.1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Homepage: https://github.com/grpc/grpc Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index a9efb2b70..effb80cd5 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -13,8 +13,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.23.0 - SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0 + REF v1.23.1 + SHA512 c39a07554645402c36cb79eddfda7165dc26ce5f7f09cae7ee6f7bedcc2aca8873117ea401d40ce2e3246e3e5888bcce12d4746cba7ed75068ff145046754981 HEAD_REF master PATCHES 00001-fix-uwp.patch