File project.diff of Package rubygem-grpc
--- gcc14.patch.orig
+++ gcc14.patch
@@ -1,8 +1,8 @@
-Index: grpc-1.70.1/src/ruby/ext/grpc/extconf.rb
+Index: grpc-1.74.1/src/ruby/ext/grpc/extconf.rb
===================================================================
---- grpc-1.70.1.orig/src/ruby/ext/grpc/extconf.rb
-+++ grpc-1.70.1/src/ruby/ext/grpc/extconf.rb
-@@ -209,6 +209,7 @@ $CFLAGS << ' -std=c11 '
+--- grpc-1.74.1.orig/src/ruby/ext/grpc/extconf.rb
++++ grpc-1.74.1/src/ruby/ext/grpc/extconf.rb
+@@ -211,6 +211,7 @@ $CFLAGS << ' -std=c11 '
$CFLAGS << ' -Wall '
$CFLAGS << ' -Wextra '
$CFLAGS << ' -pedantic '
--- gem2rpm.yml.orig
+++ gem2rpm.yml
@@ -24,7 +24,6 @@
# Requires: foobar
# ## used by gem2rpm
:patches:
- 0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch: -p1
use_system_libs.patch: -p1
gcc14.patch: -p1
use_system_certs.patch: -p1
--- rubygem-grpc.changes.orig
+++ rubygem-grpc.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Aug 20 10:42:52 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- update 1.74.1
+
+-------------------------------------------------------------------
Fri Jun 20 00:10:06 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- update to 1.72.0
--- rubygem-grpc.spec.orig
+++ rubygem-grpc.spec
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-grpc
#
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-grpc
-Version: 1.72.0
+Version: 1.74.1
Release: 0
%define mod_name grpc
%define mod_full_name %{mod_name}-%{version}
@@ -36,7 +36,7 @@ BuildRequires: grpc-devel >= 1.70.0
BuildRequires: pkgconfig
# /MANUAL
BuildRequires: ruby-macros >= 5
-BuildRequires: %{rubydevel >= 3.0}
+BuildRequires: %{rubydevel >= 3.1}
BuildRequires: %{rubygem gem2rpm}
URL: https://github.com/google/grpc/tree/master/src/ruby
Source: https://rubygems.org/gems/%{mod_full_name}.gem
@@ -44,10 +44,9 @@ Source1: rubygem-grpc.rpmlintrc
Source2: series
Source3: gem2rpm.yml
# MANUAL
-Patch0: 0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch
-Patch1: use_system_libs.patch
-Patch2: gcc14.patch
-Patch3: use_system_certs.patch
+Patch0: use_system_libs.patch
+Patch1: gcc14.patch
+Patch2: use_system_certs.patch
# /MANUAL
Summary: GRPC system in Ruby
License: Apache-2.0
@@ -60,7 +59,6 @@ Send RPCs from Ruby using GRPC.
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
-%patch -P 3 -p1
find -type f -print0 | xargs -0 touch -r %{S:0}
%gem_build
--- series.orig
+++ series
@@ -1,4 +1,3 @@
-0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch
use_system_libs.patch
gcc14.patch
use_system_certs.patch
--- use_system_certs.patch.orig
+++ use_system_certs.patch
@@ -1,7 +1,7 @@
-Index: grpc-1.70.1/src/ruby/lib/grpc.rb
+Index: grpc-1.74.1/src/ruby/lib/grpc.rb
===================================================================
---- grpc-1.70.1.orig/src/ruby/lib/grpc.rb
-+++ grpc-1.70.1/src/ruby/lib/grpc.rb
+--- grpc-1.74.1.orig/src/ruby/lib/grpc.rb
++++ grpc-1.74.1/src/ruby/lib/grpc.rb
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
--- use_system_libs.patch.orig
+++ use_system_libs.patch
@@ -1,7 +1,7 @@
-Index: grpc-1.72.0/src/ruby/ext/grpc/extconf.rb
+Index: grpc-1.74.1/src/ruby/ext/grpc/extconf.rb
===================================================================
---- grpc-1.72.0.orig/src/ruby/ext/grpc/extconf.rb
-+++ grpc-1.72.0/src/ruby/ext/grpc/extconf.rb
+--- grpc-1.74.1.orig/src/ruby/ext/grpc/extconf.rb
++++ grpc-1.74.1/src/ruby/ext/grpc/extconf.rb
@@ -16,6 +16,7 @@ require 'etc'
require 'mkmf'
require_relative '../../lib/grpc/version.rb'
@@ -34,15 +34,15 @@ Index: grpc-1.72.0/src/ruby/ext/grpc/ext
env_append 'CPPFLAGS', '-DGRPC_XDS_USER_AGENT_NAME_SUFFIX="\"RUBY\""'
-@@ -116,6 +120,7 @@ env_append 'CPPFLAGS', '-DGRPC_XDS_USER_
- env_append 'CPPFLAGS', '-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1'
+@@ -118,6 +122,7 @@ env_append 'CPPFLAGS', '-DGRPC_ENABLE_FO
+ env_append 'CPPFLAGS', '-DGRPC_ENABLE_FORK_SUPPORT_DEFAULT=false'
output_dir = File.expand_path(RbConfig::CONFIG['topdir'])
+=begin
grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
ENV['BUILDDIR'] = output_dir
-@@ -145,6 +150,7 @@ $DLDFLAGS = maybe_remove_strip_all_linke
+@@ -147,6 +152,7 @@ $DLDFLAGS = maybe_remove_strip_all_linke
$CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt
$CFLAGS << ' -I' + File.join(grpc_root, 'include')
$CFLAGS << ' -g'
@@ -50,7 +50,7 @@ Index: grpc-1.72.0/src/ruby/ext/grpc/ext
def have_ruby_abi_version()
return true if RUBY_ENGINE == 'truffleruby'
-@@ -174,6 +180,7 @@ def ext_export_filename()
+@@ -176,6 +182,7 @@ def ext_export_filename()
name
end
@@ -58,7 +58,7 @@ Index: grpc-1.72.0/src/ruby/ext/grpc/ext
ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', ext_export_filename())
$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux
if apple_toolchain
-@@ -196,11 +203,13 @@ if linux && RUBY_ENGINE != 'truffleruby'
+@@ -198,11 +205,13 @@ if linux && RUBY_ENGINE != 'truffleruby'
$LDFLAGS << ' -static-libgcc -static-libstdc++'
end
$LDFLAGS << ' -static' if windows
@@ -72,7 +72,7 @@ Index: grpc-1.72.0/src/ruby/ext/grpc/ext
output = File.join('grpc', 'grpc_c')
puts "extconf.rb $LDFLAGS: #{$LDFLAGS}"
-@@ -209,6 +218,7 @@ puts "extconf.rb $CFLAGS: #{$CFLAGS}"
+@@ -211,6 +220,7 @@ puts "extconf.rb $CFLAGS: #{$CFLAGS}"
puts 'Generating Makefile for ' + output
create_makefile(output)
@@ -80,7 +80,7 @@ Index: grpc-1.72.0/src/ruby/ext/grpc/ext
ruby_major_minor = /(\d+\.\d+)/.match(RUBY_VERSION).to_s
debug_symbols = "grpc-#{GRPC::VERSION}-#{RUBY_PLATFORM}-ruby-#{ruby_major_minor}.dbg"
-@@ -265,3 +275,4 @@ if ENV['GRPC_RUBY_TEST_ONLY_WORKAROUND_M
+@@ -267,3 +277,4 @@ if ENV['GRPC_RUBY_TEST_ONLY_WORKAROUND_M
end
File.rename('Makefile.new', 'Makefile')
end
