commit:     0fb4fd3e5ba0ba4414a93fab3bbe1651201245b1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 02:48:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 02:49:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb4fd3e

dev-ruby/grpc: fix modern C issue

Also, fix pkg_setup stub from testing.

Closes: https://bugs.gentoo.org/939544
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-ruby/grpc/files/grpc-1.66.0-c99.patch          | 22 ++++++++++++++++++++++
 ...grpc-1.66.0-r1.ebuild => grpc-1.66.0-r2.ebuild} |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dev-ruby/grpc/files/grpc-1.66.0-c99.patch 
b/dev-ruby/grpc/files/grpc-1.66.0-c99.patch
new file mode 100644
index 000000000000..63997a4070d3
--- /dev/null
+++ b/dev-ruby/grpc/files/grpc-1.66.0-c99.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/939544
+https://github.com/grpc/grpc/issues/37731
+https://github.com/grpc/grpc/pull/37741
+
+From 18a89be44d54e8c8bd614f1cee626d1db598a45a Mon Sep 17 00:00:00 2001
+From: alto-ruby <altoru...@gmail.com>
+Date: Mon, 16 Sep 2024 17:33:04 -0700
+Subject: [PATCH] fix incompatible pointer type of
+ grpc_compression_algorithm_name
+
+--- a/src/ruby/ext/grpc/rb_compression_options.c
++++ b/src/ruby/ext/grpc/rb_compression_options.c
+@@ -296,7 +296,7 @@ VALUE 
grpc_rb_compression_options_level_value_to_name_internal(
+  * Fails if the enum value is invalid. */
+ VALUE grpc_rb_compression_options_algorithm_value_to_name_internal(
+     grpc_compression_algorithm internal_value) {
+-  char* algorithm_name = NULL;
++  const char* algorithm_name = NULL;
+ 
+   if (!grpc_compression_algorithm_name(internal_value, &algorithm_name)) {
+     rb_raise(rb_eArgError, "Failed to convert algorithm value to name");
+

diff --git a/dev-ruby/grpc/grpc-1.66.0-r1.ebuild 
b/dev-ruby/grpc/grpc-1.66.0-r2.ebuild
similarity index 95%
rename from dev-ruby/grpc/grpc-1.66.0-r1.ebuild
rename to dev-ruby/grpc/grpc-1.66.0-r2.ebuild
index 5e078f3ffd57..ab8620dc1039 100644
--- a/dev-ruby/grpc/grpc-1.66.0-r1.ebuild
+++ b/dev-ruby/grpc/grpc-1.66.0-r2.ebuild
@@ -23,7 +23,9 @@ ruby_add_rdepend "
        >=dev-ruby/google-protobuf-3.24.4:0
 "
 
-pkg_setup() { :; }
+PATCHES=(
+       "${FILESDIR}"/${P}-c99.patch
+)
 
 each_ruby_configure() {
        export GRPC_RUBY_BUILD_PROCS="$(makeopts_jobs)"

Reply via email to