From afb11ef2be4aa6bd8bd7712a1a1eae67294a9f46f2d8a21c0e6cabb59bef4108 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 28 Aug 2022 06:38:12 +0000 Subject: [PATCH] - Update to release 1.48.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=121 --- grpc-correct-pkgconfig-path.patch | 18 ----------- grpc-cxx17.patch | 36 --------------------- grpc-no-return-from-non-void-function.patch | 12 ------- grpc.changes | 9 ++++++ grpc.spec | 14 ++++---- v1.46.3.tar.gz | 3 -- v1.48.0.tar.gz | 3 ++ workarounds.diff | 16 +++++++++ 8 files changed, 35 insertions(+), 76 deletions(-) delete mode 100644 grpc-correct-pkgconfig-path.patch delete mode 100644 grpc-cxx17.patch delete mode 100644 grpc-no-return-from-non-void-function.patch delete mode 100644 v1.46.3.tar.gz create mode 100644 v1.48.0.tar.gz create mode 100644 workarounds.diff diff --git a/grpc-correct-pkgconfig-path.patch b/grpc-correct-pkgconfig-path.patch deleted file mode 100644 index 4f98e6c..0000000 --- a/grpc-correct-pkgconfig-path.patch +++ /dev/null @@ -1,18 +0,0 @@ -Date: Sun Oct 11 16:14:38 UTC 2020 -From: Atri Bhattacharya - -Make path for pkgconfig file installation consistent with gRPC_INSTALL_LIBDIR specification - -Index: grpc-1.45.0/CMakeLists.txt -=================================================================== ---- grpc-1.45.0.orig/CMakeLists.txt -+++ grpc-1.45.0/CMakeLists.txt -@@ -17363,7 +17363,7 @@ function(generate_pkgconfig name descrip - "${output_filepath}" - @ONLY) - install(FILES "${output_filepath}" -- DESTINATION "lib/pkgconfig/") -+ DESTINATION "${gRPC_INSTALL_LIBDIR}/pkgconfig/") - endfunction() - - # gpr .pc file diff --git a/grpc-cxx17.patch b/grpc-cxx17.patch deleted file mode 100644 index 129ca50..0000000 --- a/grpc-cxx17.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Jan Engelhardt -Date: 2021-06-03 01:08:48.201340252 +0200 - -absl changes behavior depending on -std=. It is built with the implied default -std=. -grpc must therefore do the sample (use standard -std=). - ---- - CMakeLists.txt | 15 --------------- - 1 file changed, 15 deletions(-) - -Index: grpc-1.45.0/CMakeLists.txt -=================================================================== ---- grpc-1.45.0.orig/CMakeLists.txt -+++ grpc-1.45.0/CMakeLists.txt -@@ -222,21 +222,6 @@ if (NOT DEFINED CMAKE_C_STANDARD) - set(CMAKE_C_STANDARD 99) - endif() - --# Add c++11 flags --if (NOT DEFINED CMAKE_CXX_STANDARD) -- set(CMAKE_CXX_STANDARD 11) --else() -- if (CMAKE_CXX_STANDARD LESS 11) -- message(FATAL_ERROR "CMAKE_CXX_STANDARD is less than 11, please specify at least SET(CMAKE_CXX_STANDARD 11)") -- endif() --endif() --if (NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED) -- set(CMAKE_CXX_STANDARD_REQUIRED ON) --endif() --if (NOT DEFINED CMAKE_CXX_EXTENSIONS) -- set(CMAKE_CXX_EXTENSIONS OFF) --endif() -- - if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) - endif() diff --git a/grpc-no-return-from-non-void-function.patch b/grpc-no-return-from-non-void-function.patch deleted file mode 100644 index f632749..0000000 --- a/grpc-no-return-from-non-void-function.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: grpc-1.45.0/src/core/lib/transport/metadata_batch.h -=================================================================== ---- grpc-1.45.0.orig/src/core/lib/transport/metadata_batch.h -+++ grpc-1.45.0/src/core/lib/transport/metadata_batch.h -@@ -530,6 +530,7 @@ struct GrpcStreamNetworkState { - case kNotSeenByServer: - return "not seen by server"; - } -+ return "none"; - } - }; - diff --git a/grpc.changes b/grpc.changes index 1225657..bb82c29 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Aug 27 12:02:47 UTC 2022 - Jan Engelhardt + +- Update to release 1.48.0 + * C++14 is now required + * xDS: Workaround to get gRPC clients working with istio +- Drop grpc-correct-pkgconfig-path.patch (merged) +- Drop grpc-cxx17.patch, grpc-no-return-from-non-void-function.patch + ------------------------------------------------------------------- Fri May 20 21:20:13 UTC 2022 - Michael Ströder diff --git a/grpc.spec b/grpc.spec index 8b15f88..d891803 100644 --- a/grpc.spec +++ b/grpc.spec @@ -16,11 +16,11 @@ # -%define lver 24 -%define lverp 1_46 +%define lver 26 +%define lverp 1_48 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.46.3 +Version: 1.48.0 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 @@ -28,13 +28,11 @@ Group: Development/Tools/Building URL: https://grpc.io/ Source: https://github.com/grpc/grpc/archive/v%version.tar.gz Source2: %name-rpmlintrc -Patch1: grpc-correct-pkgconfig-path.patch -Patch2: grpc-cxx17.patch -Patch3: grpc-no-return-from-non-void-function.patch BuildRequires: abseil-cpp-devel BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: opencensus-proto-source BuildRequires: pkg-config BuildRequires: zypper BuildRequires: pkgconfig(libcares) @@ -137,6 +135,7 @@ rm -Rf third_party/abseil-cpp/ # protoc is invoked strangely; make it happy with this dir or it will assert() mkdir -p third_party/protobuf/src +cp -a /usr/src/opencensus-proto third_party/ export CFLAGS="%optflags -Wno-error" export CXXFLAGS="$CFLAGS" %cmake -DgRPC_INSTALL=ON \ @@ -148,7 +147,8 @@ export CXXFLAGS="$CFLAGS" -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DZLIB_LIBRARY=%{_libdir}/libz.so \ - -DgRPC_ZLIB_PROVIDER=package + -DgRPC_ZLIB_PROVIDER=package \ + -DCMAKE_CXX_STANDARD=17 %cmake_build %install diff --git a/v1.46.3.tar.gz b/v1.46.3.tar.gz deleted file mode 100644 index 8343c25..0000000 --- a/v1.46.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6cbf22cb5007af71b61c6be316a79397469c58c82a942552a62e708bce60964 -size 8910711 diff --git a/v1.48.0.tar.gz b/v1.48.0.tar.gz new file mode 100644 index 0000000..80ef077 --- /dev/null +++ b/v1.48.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b1f348b15a7637f5191e4e673194549384f2eccf01fcef7cc1515864d71b424 +size 8244636 diff --git a/workarounds.diff b/workarounds.diff new file mode 100644 index 0000000..821bf3d --- /dev/null +++ b/workarounds.diff @@ -0,0 +1,16 @@ +--- + src/core/lib/gpr/log_linux.cc | 1 + + 1 file changed, 1 insertion(+) + +Index: grpc-1.48.0/src/core/lib/gpr/log_linux.cc +=================================================================== +--- grpc-1.48.0.orig/src/core/lib/gpr/log_linux.cc ++++ grpc-1.48.0/src/core/lib/gpr/log_linux.cc +@@ -24,6 +24,7 @@ + #define _GNU_SOURCE + #endif + ++#include + #include + + #ifdef GPR_LINUX_LOG