From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 4 Mar 2021 22:35:45 +0000 (+0100)
Subject: - rediff patches
X-Git-Tag: auto/th/grpc-1.32.0-4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=824ee0e246135d831a5713b7cacc21d06c09aba6;p=packages%2Fgrpc.git

- rediff patches
- rel 4
---

diff --git a/grpc-libdir.patch b/grpc-libdir.patch
index b77ed27..4854aef 100644
--- a/grpc-libdir.patch
+++ b/grpc-libdir.patch
@@ -1,6 +1,7 @@
---- grpc-1.30.0/CMakeLists.txt.orig	2020-06-22 23:04:32.000000000 +0200
-+++ grpc-1.30.0/CMakeLists.txt	2020-07-04 20:25:44.272040524 +0200
-@@ -15111,7 +15111,7 @@
+diff -urNp -x '*.orig' grpc-1.32.0.org/CMakeLists.txt grpc-1.32.0/CMakeLists.txt
+--- grpc-1.32.0.org/CMakeLists.txt	2020-09-08 23:00:06.000000000 +0200
++++ grpc-1.32.0/CMakeLists.txt	2021-03-04 23:29:28.754072089 +0100
+@@ -15666,7 +15666,7 @@ function(generate_pkgconfig name descrip
      "${output_filepath}"
      @ONLY)
    install(FILES "${output_filepath}"
diff --git a/grpc-sphinx.patch b/grpc-sphinx.patch
index 82d45ef..3f0907f 100644
--- a/grpc-sphinx.patch
+++ b/grpc-sphinx.patch
@@ -1,7 +1,8 @@
---- grpc-1.30.0/setup.py.orig	2020-07-03 19:40:19.151045702 +0200
-+++ grpc-1.30.0/setup.py	2020-07-03 20:39:55.781669431 +0200
-@@ -363,7 +363,7 @@
- )
+diff -urNp -x '*.orig' grpc-1.32.0.org/setup.py grpc-1.32.0/setup.py
+--- grpc-1.32.0.org/setup.py	2021-03-04 23:29:27.074067442 +0100
++++ grpc-1.32.0/setup.py	2021-03-04 23:29:27.300734736 +0100
+@@ -415,7 +415,7 @@ EXTRAS_REQUIRES = {
+ }
  
  SETUP_REQUIRES = INSTALL_REQUIRES + (
 -    'Sphinx~=1.8.1',
diff --git a/grpc-system-absl.patch b/grpc-system-absl.patch
index f1e34db..c06a4dc 100644
--- a/grpc-system-absl.patch
+++ b/grpc-system-absl.patch
@@ -1,6 +1,7 @@
---- grpc-1.30.0/setup.py.orig	2020-06-22 23:04:32.000000000 +0200
-+++ grpc-1.30.0/setup.py	2020-06-28 21:44:21.517738390 +0200
-@@ -116,6 +116,8 @@
+diff -urNp -x '*.orig' grpc-1.32.0.org/setup.py grpc-1.32.0/setup.py
+--- grpc-1.32.0.org/setup.py	2020-09-08 23:00:06.000000000 +0200
++++ grpc-1.32.0/setup.py	2021-03-04 23:29:26.600732792 +0100
+@@ -132,6 +132,8 @@ BUILD_WITH_SYSTEM_ZLIB = os.environ.get(
  BUILD_WITH_SYSTEM_CARES = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_CARES',
                                           False)
  
@@ -9,7 +10,7 @@
  # For local development use only: This skips building gRPC Core and its
  # dependencies, including protobuf and boringssl. This allows "incremental"
  # compilation by first building gRPC Core using make, then building only the
-@@ -230,6 +232,10 @@
+@@ -246,6 +248,10 @@ if BUILD_WITH_SYSTEM_CARES:
      CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
      CARES_INCLUDE = (os.path.join('/usr', 'include'),)
  
@@ -19,8 +20,8 @@
 +
  EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE +
                                   ADDRESS_SORTING_INCLUDE + CARES_INCLUDE +
-                                  SSL_INCLUDE + UPB_INCLUDE +
-@@ -285,6 +285,16 @@
+                                  RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
+@@ -272,6 +278,16 @@ if BUILD_WITH_SYSTEM_ZLIB:
      EXTENSION_LIBRARIES += ('z',)
  if BUILD_WITH_SYSTEM_CARES:
      EXTENSION_LIBRARIES += ('cares',)
diff --git a/grpc-system-openssl.patch b/grpc-system-openssl.patch
index 994e5da..13409ec 100644
--- a/grpc-system-openssl.patch
+++ b/grpc-system-openssl.patch
@@ -1,8 +1,7 @@
-GRPC_BUILD_WITH_BORING_SSL_ASM=0 evaluates to True either, so use False as default.
-
---- grpc-1.32.0/setup.py.orig	2020-09-27 11:25:35.950847530 +0200
-+++ grpc-1.32.0/setup.py	2020-09-27 11:42:59.758936675 +0200
-@@ -106,7 +106,7 @@
+diff -urNp -x '*.orig' grpc-1.32.0.org/setup.py grpc-1.32.0/setup.py
+--- grpc-1.32.0.org/setup.py	2021-03-04 23:29:29.994075500 +0100
++++ grpc-1.32.0/setup.py	2021-03-04 23:29:30.220742787 +0100
+@@ -106,7 +106,7 @@ CLASSIFIERS = [
  ]
  
  BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM',
diff --git a/grpc-system-re2.patch b/grpc-system-re2.patch
index 38fdb47..859e42e 100644
--- a/grpc-system-re2.patch
+++ b/grpc-system-re2.patch
@@ -1,6 +1,7 @@
---- grpc-1.32.0/setup.py.orig	2020-09-26 16:22:20.927767970 +0200
-+++ grpc-1.32.0/setup.py	2020-09-26 16:42:32.857869048 +0200
-@@ -134,6 +134,8 @@
+diff -urNp -x '*.orig' grpc-1.32.0.org/setup.py grpc-1.32.0/setup.py
+--- grpc-1.32.0.org/setup.py	2021-03-04 23:29:29.267406836 +0100
++++ grpc-1.32.0/setup.py	2021-03-04 23:29:29.490740783 +0100
+@@ -134,6 +134,8 @@ BUILD_WITH_SYSTEM_CARES = os.environ.get
  
  BUILD_WITH_SYSTEM_ABSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ABSL', False)
  
@@ -9,7 +10,7 @@
  # For local development use only: This skips building gRPC Core and its
  # dependencies, including protobuf and boringssl. This allows "incremental"
  # compilation by first building gRPC Core using make, then building only the
-@@ -252,6 +254,10 @@
+@@ -252,6 +254,10 @@ if BUILD_WITH_SYSTEM_ABSL:
      CORE_C_FILES = filter(lambda x: 'third_party/abseil-cpp' not in x, CORE_C_FILES)
      ABSL_INCLUDE = (os.path.join('/usr', 'include'),)
  
@@ -20,7 +21,7 @@
  EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE +
                                   ADDRESS_SORTING_INCLUDE + CARES_INCLUDE +
                                   RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
-@@ -295,6 +295,8 @@
+@@ -288,6 +294,8 @@ if BUILD_WITH_SYSTEM_ABSL:
                              'absl_str_format_internal', 'absl_synchronization', 'absl_time',
                              'absl_civil_time', 'absl_time_zone', 'absl_bad_optional_access',
                              'absl_bad_variant_access')
diff --git a/grpc-x32.patch b/grpc-x32.patch
index 596ed24..ba61c57 100644
--- a/grpc-x32.patch
+++ b/grpc-x32.patch
@@ -1,5 +1,6 @@
---- grpc-1.30.0/src/core/lib/gpr/wrap_memcpy.cc.orig	2020-06-22 23:04:32.000000000 +0200
-+++ grpc-1.30.0/src/core/lib/gpr/wrap_memcpy.cc	2020-07-04 18:41:46.960053131 +0200
+diff -urNp -x '*.orig' grpc-1.32.0.org/src/core/lib/gpr/wrap_memcpy.cc grpc-1.32.0/src/core/lib/gpr/wrap_memcpy.cc
+--- grpc-1.32.0.org/src/core/lib/gpr/wrap_memcpy.cc	2020-09-08 23:00:06.000000000 +0200
++++ grpc-1.32.0/src/core/lib/gpr/wrap_memcpy.cc	2021-03-04 23:29:28.027403417 +0100
 @@ -28,7 +28,7 @@
  
  extern "C" {
diff --git a/grpc.spec b/grpc.spec
index 310413e..49288b6 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -11,7 +11,7 @@ Summary:	RPC library and framework
 Summary(pl.UTF-8):	Biblioteka i szkielet RPC
 Name:		grpc
 Version:	1.32.0
-Release:	3
+Release:	4
 License:	Apache v2.0
 Group:		Libraries
 #Source0Download: https://github.com/grpc/grpc/releases