[packages/grpc] - cleanup old patches, rel 1
baggins
baggins at pld-linux.org
Mon Sep 22 21:58:06 CEST 2025
commit f431d4494649a72ad1831314bcad379b0f7f64f0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Sep 22 23:57:48 2025 +0200
- cleanup old patches, rel 1
abseil.patch | 10 ---
cython3.patch | 181 ----------------------------------------------
grpc-format.patch | 74 -------------------
grpc-sphinx.patch | 12 ---
grpc-system-openssl.patch | 12 ---
grpc-x32.patch | 12 ---
grpc.spec | 18 +----
7 files changed, 3 insertions(+), 316 deletions(-)
---
diff --git a/grpc.spec b/grpc.spec
index 8c80854..27caa93 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.75.0
-Release: 0.1
+Release: 1
License: Apache v2.0
Group: Libraries
#Source0Download: https://github.com/grpc/grpc/releases
@@ -19,13 +19,7 @@ Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar
# Source0-md5: 0b6c7ec8b62e9a71107b5f5bd12ef1a6
Source1: https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0/opencensus-proto-0.3.0.tar.gz
# Source1-md5: 0b208800a68548cbf2d4bff763c050a2
-Patch0: %{name}-format.patch
-Patch1: %{name}-sphinx.patch
-Patch2: %{name}-x32.patch
-Patch5: %{name}-system-openssl.patch
-Patch6: cython3.patch
-Patch7: abseil.patch
-Patch8: python-deps.patch
+Patch0: python-deps.patch
URL: https://grpc.io/
BuildRequires: abseil-cpp-devel >= 20220623
BuildRequires: c-ares-devel >= 1.13.0
@@ -133,13 +127,7 @@ Dokumentacja API biblioteki Pythona gRPC.
%prep
%setup -q
-#patch -P 0 -p1
-#patch -P 1 -p1
-#patch -P 2 -p1
-#patch -P 5 -p1
-#patch -P 6 -p1
-#patch -P 7 -p1
-%patch -P8 -p1
+%patch -P0 -p1
%{__rm} doc/.gitignore
diff --git a/abseil.patch b/abseil.patch
deleted file mode 100644
index d6f2ca6..0000000
--- a/abseil.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- grpc-1.50.2/src/core/lib/iomgr/tcp_posix.cc~ 2023-02-15 01:23:37.000000000 +0100
-+++ grpc-1.50.2/src/core/lib/iomgr/tcp_posix.cc 2025-09-03 01:59:30.939996773 +0200
-@@ -40,6 +40,7 @@
- #include <algorithm>
- #include <unordered_map>
-
-+#include <absl/strings/str_cat.h>
- #include <grpc/slice.h>
- #include <grpc/support/alloc.h>
- #include <grpc/support/log.h>
diff --git a/cython3.patch b/cython3.patch
deleted file mode 100644
index a15cea5..0000000
--- a/cython3.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 4bea12353c2f0f5a52746821f1e3f961592c7ca0 Mon Sep 17 00:00:00 2001
-From: Atri Bhattacharya <A.Bhattacharya at uliege.be>
-Date: Tue, 2 Apr 2024 10:05:04 -0700
-Subject: [PATCH] [python] Cython 3 compatibility: declare functions noexcept.
- (#35995)
-
-In Cython 3, cdef functions that really will not raise exceptions must be declared as `noexcept`. Fixed by this commit.
-
-Update requirements to `cython >= 3.0` in requirements*.txt and setup.py.
-
-Fixes issue #33918.
-
-<!--
-
-If you know who should review your pull request, please assign it to that
-person, otherwise the pull request would get assigned randomly.
-
-If your pull request is for a specific language, please add the appropriate
-lang label.
-
--->
-
-Closes #35995
-
-COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35995 from badshah400:master b3277bac1585ddee88a170b0a95c260d909cce9c
-PiperOrigin-RevId: 621214091
----
- requirements.bazel.txt | 2 +-
- requirements.txt | 2 +-
- setup.py | 2 +-
- .../grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi | 2 +-
- .../grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi | 2 +-
- src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi | 2 +-
- src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi | 6 +++---
- src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi | 6 +++---
- src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi | 6 +++---
- 9 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index 05390850559f1..56169434b1b78 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,6 +1,6 @@
- # GRPC Python setup requirements
- coverage>=4.0
--cython>=0.29.8
-+cython>=3.0.0
- protobuf>=4.21.3,<5.0dev
- six>=1.10
- wheel>=0.29
-diff --git a/setup.py b/setup.py
-index 93138a2d11aba..19544ce89d832 100644
---- a/setup.py
-+++ b/setup.py
-@@ -545,7 +545,7 @@ def cython_extensions_and_necessity():
- elif need_cython:
- sys.stderr.write(
- 'We could not find Cython. Setup may take 10-20 minutes.\n')
-- SETUP_REQUIRES += ('cython>=0.23',)
-+ SETUP_REQUIRES += ('cython>=3.0.0',)
-
- COMMAND_CLASS = {
- 'doc': commands.SphinxDocumentation,
-diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
-index e54e5107547c1..26edbdb917b10 100644
---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
-@@ -48,7 +48,7 @@ cdef class CallbackWrapper:
- @staticmethod
- cdef void functor_run(
- grpc_completion_queue_functor* functor,
-- int succeed)
-+ int succeed) noexcept
-
- cdef grpc_completion_queue_functor *c_functor(self)
-
-diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
-index 14a0098fc2041..2b0df0e5ce7f7 100644
---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
-@@ -50,7 +50,7 @@ cdef class CallbackWrapper:
- @staticmethod
- cdef void functor_run(
- grpc_completion_queue_functor* functor,
-- int success):
-+ int success) noexcept:
- cdef CallbackContext *context = <CallbackContext *>functor
- cdef object waiter = <object>context.waiter
- if not waiter.cancelled():
-diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
-index 74a3f16d72dbb..600c0f304e067 100644
---- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
-@@ -316,7 +316,7 @@ def server_credentials_ssl_dynamic_cert_config(initial_cert_config,
- return credentials
-
- cdef grpc_ssl_certificate_config_reload_status _server_cert_config_fetcher_wrapper(
-- void* user_data, grpc_ssl_server_certificate_config **config) with gil:
-+ void* user_data, grpc_ssl_server_certificate_config **config) noexcept with gil:
- # This is a credentials.ServerCertificateConfig
- cdef ServerCertificateConfig cert_config = None
- if not user_data:
-diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
-index 565f483b2ae00..d901cfddf4321 100644
---- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
-@@ -35,7 +35,7 @@ _GRPC_ENABLE_FORK_SUPPORT = (
-
- _fork_handler_failed = False
-
--cdef void __prefork() nogil:
-+cdef void __prefork() noexcept nogil:
- with gil:
- global _fork_handler_failed
- _fork_handler_failed = False
-@@ -49,14 +49,14 @@ cdef void __prefork() nogil:
- _fork_handler_failed = True
-
-
--cdef void __postfork_parent() nogil:
-+cdef void __postfork_parent() noexcept nogil:
- with gil:
- with _fork_state.fork_in_progress_condition:
- _fork_state.fork_in_progress = False
- _fork_state.fork_in_progress_condition.notify_all()
-
-
--cdef void __postfork_child() nogil:
-+cdef void __postfork_child() noexcept nogil:
- with gil:
- try:
- if _fork_handler_failed:
-diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
-index da4b81bd97e65..f59410073b736 100644
---- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
-+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
-@@ -13,16 +13,16 @@
- # limitations under the License.
-
- # TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
--cdef void* _copy_pointer(void* pointer):
-+cdef void* _copy_pointer(void* pointer) noexcept:
- return pointer
-
-
- # TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
--cdef void _destroy_pointer(void* pointer):
-+cdef void _destroy_pointer(void* pointer) noexcept:
- pass
-
-
--cdef int _compare_pointer(void* first_pointer, void* second_pointer):
-+cdef int _compare_pointer(void* first_pointer, void* second_pointer) noexcept:
- if first_pointer < second_pointer:
- return -1
- elif first_pointer > second_pointer:
---- grpc-1.50.2/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi.orig 2025-03-19 19:23:03.248118406 +0100
-+++ grpc-1.50.2/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi 2025-03-19 19:27:46.116368426 +0100
-@@ -15,15 +15,15 @@
-
- cdef extern from "pthread.h" nogil:
- int pthread_atfork(
-- void (*prepare)() nogil,
-- void (*parent)() nogil,
-- void (*child)() nogil)
-+ void (*prepare)() noexcept nogil,
-+ void (*parent)() noexcept nogil,
-+ void (*child)() noexcept nogil)
-
-
--cdef void __prefork() nogil
-+cdef void __prefork() noexcept nogil
-
-
--cdef void __postfork_parent() nogil
-+cdef void __postfork_parent() noexcept nogil
-
-
--cdef void __postfork_child() nogil
-\ No newline at end of file
-+cdef void __postfork_child() noexcept nogil
diff --git a/grpc-format.patch b/grpc-format.patch
deleted file mode 100644
index 38167a0..0000000
--- a/grpc-format.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- grpc-1.50.2/src/core/ext/transport/binder/transport/binder_transport.cc.orig 2023-02-15 01:23:37.000000000 +0100
-+++ grpc-1.50.2/src/core/ext/transport/binder/transport/binder_transport.cc 2023-04-06 17:07:42.199546237 +0200
-@@ -129,7 +129,7 @@ static void set_pollset(grpc_transport*
- }
-
- static void set_pollset_set(grpc_transport*, grpc_stream*, grpc_pollset_set*) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
- }
-
- static void AssignMetadata(grpc_metadata_batch* mb,
-@@ -621,7 +621,7 @@ static void perform_transport_op_locked(
- }
-
- static void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
- grpc_binder_transport* gbt = reinterpret_cast<grpc_binder_transport*>(gt);
- op->handler_private.extra_arg = gbt;
- GRPC_BINDER_REF_TRANSPORT(gbt, "perform_transport_op");
-@@ -643,7 +643,7 @@ static void destroy_stream_locked(void*
-
- static void destroy_stream(grpc_transport* /*gt*/, grpc_stream* gs,
- grpc_closure* then_schedule_closure) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
- grpc_binder_stream* gbs = reinterpret_cast<grpc_binder_stream*>(gs);
- gbs->destroy_stream_then_closure = then_schedule_closure;
- gbs->t->combiner->Run(GRPC_CLOSURE_INIT(&gbs->destroy_stream,
-@@ -662,7 +662,7 @@ static void destroy_transport_locked(voi
- }
-
- static void destroy_transport(grpc_transport* gt) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
- grpc_binder_transport* gbt = reinterpret_cast<grpc_binder_transport*>(gt);
- gbt->combiner->Run(
- GRPC_CLOSURE_CREATE(destroy_transport_locked, gbt, nullptr),
-@@ -670,7 +670,7 @@ static void destroy_transport(grpc_trans
- }
-
- static grpc_endpoint* get_endpoint(grpc_transport*) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
- return nullptr;
- }
-
-@@ -706,7 +706,7 @@ grpc_binder_transport::grpc_binder_trans
- is_client ? "binder_transport_client" : "binder_transport_server",
- GRPC_CHANNEL_READY),
- refs(1, nullptr) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
- base.vtable = get_vtable();
- transport_stream_receiver =
- std::make_shared<grpc_binder::TransportStreamReceiverImpl>(
-@@ -736,7 +736,7 @@ grpc_transport* grpc_create_binder_trans
- std::unique_ptr<grpc_binder::Binder> endpoint_binder,
- std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
- security_policy) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
-
- GPR_ASSERT(endpoint_binder != nullptr);
- GPR_ASSERT(security_policy != nullptr);
-@@ -751,7 +751,7 @@ grpc_transport* grpc_create_binder_trans
- std::unique_ptr<grpc_binder::Binder> client_binder,
- std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
- security_policy) {
-- gpr_log(GPR_INFO, __func__);
-+ gpr_log(GPR_INFO, "%s", __func__);
-
- GPR_ASSERT(client_binder != nullptr);
- GPR_ASSERT(security_policy != nullptr);
diff --git a/grpc-sphinx.patch b/grpc-sphinx.patch
deleted file mode 100644
index 3f0907f..0000000
--- a/grpc-sphinx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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',
-+ 'Sphinx>=1.8.1',
- 'six>=1.10',
- ) if ENABLE_DOCUMENTATION_BUILD else ()
-
diff --git a/grpc-system-openssl.patch b/grpc-system-openssl.patch
deleted file mode 100644
index d9f122b..0000000
--- a/grpc-system-openssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 = _env_bool_value('GRPC_BUILD_WITH_BORING_SSL_ASM',
-- 'True')
-+ 'False')
-
- # Export this environment variable to override the platform variant that will
- # be chosen for boringssl assembly optimizations. This option is useful when
diff --git a/grpc-x32.patch b/grpc-x32.patch
deleted file mode 100644
index cb3cbde..0000000
--- a/grpc-x32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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" {
- #ifdef __linux__
--#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && \
-+#if defined(__x86_64__) && !defined(__ILP32__) && !defined(GPR_MUSL_LIBC_COMPAT) && \
- !defined(__ANDROID__)
- __asm__(".symver memcpy,memcpy at GLIBC_2.2.5");
- void* __wrap_memcpy(void* destination, const void* source, size_t num) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grpc.git/commitdiff/f431d4494649a72ad1831314bcad379b0f7f64f0
More information about the pld-cvs-commit
mailing list