From c5d71b85c18b797e1c74de7ce3f02bc112808e7cbc63d4fc47f7d863bb39962a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 16 Jan 2026 15:30:32 +0100 Subject: [PATCH 1/2] fix build with newer abseil-cpp --- grpc.changes | 7 +++++++ grpc.spec | 2 ++ grpc_missing_string_include.patch | 11 +++++++++++ 3 files changed, 20 insertions(+) create mode 100644 grpc_missing_string_include.patch diff --git a/grpc.changes b/grpc.changes index 85c3aeb..f994c03 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 16 14:28:23 UTC 2026 - Fridrich Strba + +- Added patch: + * grpc_missing_string_include.patch + + fix missing include with newer abseil-cpp + ------------------------------------------------------------------- Sat Nov 8 17:08:46 UTC 2025 - Atri Bhattacharya diff --git a/grpc.spec b/grpc.spec index 29c35ea..5a2fec4 100644 --- a/grpc.spec +++ b/grpc.spec @@ -34,6 +34,7 @@ Patch3: return-values.patch Patch4: telemetry.patch Patch14: ARM-Unaligned-access-fixes.patch Patch15: Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch +Patch16: grpc_missing_string_include.patch BuildRequires: abseil-cpp-devel >= 20240722 BuildRequires: cmake BuildRequires: fdupes @@ -131,6 +132,7 @@ This subpackage contains source code of the gRPC reference implementation. %prep %autosetup -p1 + find "." -type f -exec grep -l '/usr/bin/python' {} + | xargs -r perl -i -lpe \ 's{#! ?/usr/bin/python\S*}{#!/usr/bin/python3}g;' diff --git a/grpc_missing_string_include.patch b/grpc_missing_string_include.patch new file mode 100644 index 0000000..688068d --- /dev/null +++ b/grpc_missing_string_include.patch @@ -0,0 +1,11 @@ +--- grpc-1.76.0/include/grpc/event_engine/memory_request.h 2026-01-16 15:12:38.339265864 +0100 ++++ grpc-1.76.0/include/grpc/event_engine/memory_request.h 2026-01-16 15:13:00.838065461 +0100 +@@ -17,6 +17,8 @@ + #include + #include + ++#include ++ + #include "absl/strings/string_view.h" + + namespace grpc_event_engine { -- 2.51.1 From 60c65188b3cac0c2be6723fb2e13b57a58e1281c67821db8a1677f0485370139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 16 Jan 2026 18:17:57 +0100 Subject: [PATCH 2/2] more complete patch --- grpc.changes | 4 ++-- grpc.spec | 2 +- grpc_missing_includes.patch | 33 +++++++++++++++++++++++++++++++ grpc_missing_string_include.patch | 11 ----------- 4 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 grpc_missing_includes.patch delete mode 100644 grpc_missing_string_include.patch diff --git a/grpc.changes b/grpc.changes index f994c03..52bdce1 100644 --- a/grpc.changes +++ b/grpc.changes @@ -2,8 +2,8 @@ Fri Jan 16 14:28:23 UTC 2026 - Fridrich Strba - Added patch: - * grpc_missing_string_include.patch - + fix missing include with newer abseil-cpp + * grpc_missing_includes.patch + + fix missing includes with newer abseil-cpp ------------------------------------------------------------------- Sat Nov 8 17:08:46 UTC 2025 - Atri Bhattacharya diff --git a/grpc.spec b/grpc.spec index 5a2fec4..83e4ac1 100644 --- a/grpc.spec +++ b/grpc.spec @@ -34,7 +34,7 @@ Patch3: return-values.patch Patch4: telemetry.patch Patch14: ARM-Unaligned-access-fixes.patch Patch15: Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch -Patch16: grpc_missing_string_include.patch +Patch16: grpc_missing_includes.patch BuildRequires: abseil-cpp-devel >= 20240722 BuildRequires: cmake BuildRequires: fdupes diff --git a/grpc_missing_includes.patch b/grpc_missing_includes.patch new file mode 100644 index 0000000..2ec25f3 --- /dev/null +++ b/grpc_missing_includes.patch @@ -0,0 +1,33 @@ +--- grpc-1.76.0/include/grpc/event_engine/memory_request.h 2026-01-16 16:08:49.306769226 +0100 ++++ grpc-1.76.0/include/grpc/event_engine/memory_request.h 2026-01-16 16:09:25.308460657 +0100 +@@ -17,6 +17,8 @@ + #include + #include + ++#include ++ + #include "absl/strings/string_view.h" + + namespace grpc_event_engine { +--- grpc-1.76.0/src/core/channelz/v2tov1/property_list.cc 2026-01-16 16:08:49.318359694 +0100 ++++ grpc-1.76.0/src/core/channelz/v2tov1/property_list.cc 2026-01-16 16:36:07.696439170 +0100 +@@ -14,6 +14,8 @@ + + #include "src/core/channelz/v2tov1/property_list.h" + ++#include ++#include + #include + #include + #include +--- grpc-1.76.0/src/core/util/glob.cc 2026-01-16 16:08:49.411203729 +0100 ++++ grpc-1.76.0/src/core/util/glob.cc 2026-01-16 16:10:43.618327606 +0100 +@@ -14,6 +14,8 @@ + + #include "absl/strings/string_view.h" + ++#include ++ + namespace grpc_core { + + namespace { diff --git a/grpc_missing_string_include.patch b/grpc_missing_string_include.patch deleted file mode 100644 index 688068d..0000000 --- a/grpc_missing_string_include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- grpc-1.76.0/include/grpc/event_engine/memory_request.h 2026-01-16 15:12:38.339265864 +0100 -+++ grpc-1.76.0/include/grpc/event_engine/memory_request.h 2026-01-16 15:13:00.838065461 +0100 -@@ -17,6 +17,8 @@ - #include - #include - -+#include -+ - #include "absl/strings/string_view.h" - - namespace grpc_event_engine { -- 2.51.1