[grpc] Update to v1.32.0 - use correct port version (#14152)

* [grpc] grpc v1.32.0 - use correct port version

* [grpc] update 00001-fix-uwp.patch

* [grpc] update 00002-static-linking-in-linux.patch

* [grpc] update 00004-link-gdi32-on-windows.patch

* [grpc] update 00011-fix-csharp_plugin.patch

5 files changed, 13 insertions, 13 deletions

diff --git a/ports/grpc/00001-fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch
index a66f03f49..d47ccf026 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 a067308142..086d4c5837 100644
+index 4655d1e747..b8514d91a8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -153,6 +153,9 @@ if(UNIX)
+@@ -181,6 +181,9 @@ if(UNIX)
  endif()
  if(WIN32)
    set(_gRPC_PLATFORM_WINDOWS ON)
@@ -12,7 +12,7 @@ index a067308142..086d4c5837 100644
  endif()
  
   # Use C99 standard
-@@ -191,6 +194,9 @@ if(MSVC)
+@@ -219,6 +222,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")
@@ -22,7 +22,7 @@ index a067308142..086d4c5837 100644
  endif()
  if (MINGW)
    add_definitions(-D_WIN32_WINNT=0x600)
-@@ -258,6 +264,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
+@@ -286,6 +292,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
  #     ``.proto`` files
  #
  function(protobuf_generate_grpc_cpp)
@@ -33,7 +33,7 @@ index a067308142..086d4c5837 100644
    if(NOT ARGN)
      message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
      return()
-@@ -330,6 +340,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
+@@ -358,6 +368,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
    list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
  endif ()
  
@@ -41,7 +41,7 @@ index a067308142..086d4c5837 100644
  add_custom_target(plugins
    DEPENDS ${_gRPC_PLUGIN_LIST}
  )
-@@ -348,6 +359,7 @@ add_custom_target(tools_cxx
+@@ -376,6 +387,7 @@ add_custom_target(tools_cxx
  
  add_custom_target(tools
    DEPENDS tools_c tools_cxx)
diff --git a/ports/grpc/00002-static-linking-in-linux.patch b/ports/grpc/00002-static-linking-in-linux.patch
index 80ec441b3..2217333a6 100644
--- a/ports/grpc/00002-static-linking-in-linux.patch
+++ b/ports/grpc/00002-static-linking-in-linux.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 086d4c5837..e556a99b47 100644
+index b8514d91a8..d0e6cbeaf9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -183,6 +183,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
+@@ -211,6 +211,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
  endif()
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
  
diff --git a/ports/grpc/00004-link-gdi32-on-windows.patch b/ports/grpc/00004-link-gdi32-on-windows.patch
index 1e3e4cf5c..f1a5d6086 100644
--- a/ports/grpc/00004-link-gdi32-on-windows.patch
+++ b/ports/grpc/00004-link-gdi32-on-windows.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e556a99b47..a337149f1f 100644
+index d0e6cbeaf9..e3fe2990e0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -250,7 +250,7 @@ elseif(UNIX)
+@@ -278,7 +278,7 @@ elseif(UNIX)
  endif()
  
  if(WIN32)
diff --git a/ports/grpc/00011-fix-csharp_plugin.patch b/ports/grpc/00011-fix-csharp_plugin.patch
index d4d38f1f1..cb0d1a01e 100644
--- a/ports/grpc/00011-fix-csharp_plugin.patch
+++ b/ports/grpc/00011-fix-csharp_plugin.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index a23fdf3..df4128a 100644

+index a23fdf3dda..7eb8d5200a 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

 @@ -1940,10 +1940,14 @@ endif()

@@ -7,7 +7,7 @@ index a23fdf3..df4128a 100644
  if(gRPC_BUILD_CSHARP_EXT)

  

 -add_library(grpc_csharp_ext SHARED

-+add_library(grpc_csharp_ext 

++add_library(grpc_csharp_ext

    src/csharp/ext/grpc_csharp_ext.c

  )

  

diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index af0f6a32c..1f1fb1b21 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,5 +1,5 @@
 Source: grpc
-Version: 1.31.2
+Version: 1.32.0
 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2
 Homepage: https://github.com/grpc/grpc
 Description: An RPC library and framework