From 31bfcf89dc496f542878c6d1fc01cc6b8f5d4d59 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Nov 08 2022 06:49:27 +0000 Subject: Assign non-zero unique ID to each string, especially for ruby 3.2 --- diff --git a/rubygem-gtk2-3.4.3-assign-nonzero-ID-to-relative-callback.patch b/rubygem-gtk2-3.4.3-assign-nonzero-ID-to-relative-callback.patch new file mode 100644 index 0000000..3cd2849 --- /dev/null +++ b/rubygem-gtk2-3.4.3-assign-nonzero-ID-to-relative-callback.patch @@ -0,0 +1,10 @@ +--- gtk2-3.4.3/ext/gtk2/rbgtk.c.orig 2022-11-08 15:25:33.507083460 +0900 ++++ gtk2-3.4.3/ext/gtk2/rbgtk.c 2022-11-08 15:25:46.160087108 +0900 +@@ -539,6 +539,7 @@ rg_m_show_uri(G_GNUC_UNUSED VALUE self, + void + Init_gtk_gtk(void) + { ++ id_relative_callbacks = rb_intern("relative_callback"); + id_call = rb_intern("call"); + id__windows__ = rb_intern("__windows__"); + id__quit_callbacks__ = rb_intern("__quit_callbacks__"); diff --git a/rubygem-gtk2.spec b/rubygem-gtk2.spec index 7ab5720..6dda4ea 100644 --- a/rubygem-gtk2.spec +++ b/rubygem-gtk2.spec @@ -11,11 +11,14 @@ Summary: Ruby binding of GTK+-2.x Name: rubygem-%{gem_name} Version: 3.4.3 -Release: 10%{?dist} +Release: 11%{?dist} # from README License: LGPLv2 URL: http://ruby-gnome2.sourceforge.jp/ Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem +# Assign non-zero unique ID to each string (especially for id_relative_callbacks), +# especially for ruby 3.2 +Patch0: rubygem-gtk2-3.4.3-assign-nonzero-ID-to-relative-callback.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -95,6 +98,9 @@ mv ../%{gem_name}-%{version}.gemspec . sed -i -e 's|= 3\.4\.3|>= 3.4.3|' %{gem_name}-%{version}.gemspec # Patches and etc +%if 0%{?fedora} >= 38 +%patch0 -p1 -b .nonzero_id +%endif # Fix wrong dir grep -rl /usr/local/bin sample | \ @@ -162,9 +168,7 @@ sed -i test/run-test.rb \ # Adwaita themes broken on F-30?? Need investigating... xvfb-run \ ruby -Ilib:test:ext/%{gem_name} ./test/run-test.rb \ -%if 0%{?fedora} >= 38 - || true -%endif + || false # back mv test/test_gtk_icon_theme.rb{.skip,} @@ -200,6 +204,9 @@ mv test/test_gtk_icon_theme.rb{.skip,} %{gem_instdir}/test/ %changelog +* Tue Nov 8 2022 Mamoru TASAKA - 3.4.3-11 +- Assign non-zero unique ID to each string, especially for ruby 3.2 + * Thu Nov 1 2022 Mamoru TASAKA - 3.4.3-10 - Ignore test failure on ruby32 for now