rpms
/
rubygem-glu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix C compatibility issues 

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
This commit is contained in:
Florian Weimer 2024-01-05 11:24:52 +01:00
parent f776bfeb89
commit 16fd200569
2 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
rubygem-glu-c99.patch Normal file
View File

@ -0,0 +1,63 @@
VALUE casts for rb_funcall arguments
The Ruby API expects VALUE types instead of void *, so add casts. This
avoids compilation errors with current compilers.
Submitted upstream: <https://github.com/larskanis/glu/pull/3>
diff -ur glu-8.3.0.orig/ext/glu/glu.c glu-8.3.0/ext/glu/glu.c
--- glu-8.3.0.orig/ext/glu/glu.c 2024-01-05 11:12:18.598561476 +0100
+++ glu-8.3.0/ext/glu/glu.c 2024-01-05 11:18:42.217732888 +0100
@@ -636,7 +636,7 @@
void* data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX), callId, 1, data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX), callId, 1, (VALUE) data);
}
static void CALLBACK
t_end()
@@ -657,7 +657,7 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_BEGIN_DATA), callId, 2, INT2NUM(type), user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_BEGIN_DATA), callId, 2, INT2NUM(type), (VALUE) user_data);
}
static void CALLBACK
t_edgeFlag_data(flag, user_data)
@@ -665,7 +665,7 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, GLBOOL2RUBY(flag), user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, GLBOOL2RUBY(flag), (VALUE) user_data);
}
static void CALLBACK
t_vertex_data(data, user_data)
@@ -673,14 +673,14 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX_DATA), callId, 2, data, user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX_DATA), callId, 2, (VALUE) data, (VALUE) user_data);
}
static void CALLBACK
t_end_data(user_data)
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_END_DATA), callId, 1, user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_END_DATA), callId, 1, (VALUE) user_data);
}
static void CALLBACK
t_error_data(errorno, user_data)
@@ -688,7 +688,7 @@
void* user_data;
{
TESS_CALLBACK_COMMON
- rb_funcall(rb_ary_entry(tdata->t_ref, TESS_ERROR_DATA), callId, 2, INT2NUM(errorno), user_data);
+ rb_funcall(rb_ary_entry(tdata->t_ref, TESS_ERROR_DATA), callId, 2, INT2NUM(errorno), (VALUE) user_data);
}
static void CALLBACK

8
rubygem-glu.spec
View File

@ -4,13 +4,14 @@
Name: rubygem-%{gem_name}
Version: 8.3.0
Release: 26%{?dist}
Release: 27%{?dist}
Summary: Glu bindings for the opengl gem
# SPDX confirmed
License: MIT
URL: https://github.com/larskanis/glu
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Patch1: rubygem-glu-c99.patch
BuildRequires: gcc
BuildRequires: rubygems-devel
@ -40,7 +41,7 @@ BuildArch: noarch
Documentation for %{name}.
%prep
%setup -q -n %{gem_name}-%{version}
%autosetup -p1 -n %{gem_name}-%{version}
mv ../%{gem_name}-%{version}.gemspec .
%build
@ -103,6 +104,9 @@ popd
%doc %{gem_docdir}
%changelog
* Fri Jan 05 2024 Florian Weimer <fweimer@redhat.com> - 8.3.0-27
- Fix C compatibility issues
* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.3.0-26
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3