From 560dba4383f571928e75cc52b2735c219ca80b78 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Feb 17 2019 06:59:48 +0000 Subject: 3.3.2 --- diff --git a/.gitignore b/.gitignore index 87c25e3..a67af48 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /gobject-introspection-3.2.9.gem /gobject-introspection-3.3.0.gem /gobject-introspection-3.3.1.gem +/gobject-introspection-3.3.2.gem diff --git a/0003-gi-fix-wrong-nil-check.patch b/0003-gi-fix-wrong-nil-check.patch deleted file mode 100644 index 6249e32..0000000 --- a/0003-gi-fix-wrong-nil-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 413333c5412162e2e57266322ee8d05b11c87d0a Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Fri, 1 Feb 2019 05:56:50 +0900 -Subject: [PATCH 3/5] gi: fix wrong nil check - -GitHub: #1270 - -Patch by moveccr. Thanks!!! ---- - .../ext/gobject-introspection/rb-gi-function-info.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c b/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c -index fcbd558d2..04559bc82 100644 ---- a/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c -+++ b/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c -@@ -339,7 +339,7 @@ rb_gi_callback_data_free(RBGICallbackData *callback_data) - rbgobj_object_remove_relative(rb_owner, callback_data->rb_callback); - } - } -- if (callback_data->rb_owner) { -+ if (!NIL_P(callback_data->rb_owner)) { - rbgobj_remove_relative(callback_data->rb_owner, - (ID)0, - callback_data->rb_callback); --- -2.20.1 - diff --git a/0005-gi-fix-a-memory-leak-for-module-function-with-callba.patch b/0005-gi-fix-a-memory-leak-for-module-function-with-callba.patch deleted file mode 100644 index 417ee48..0000000 --- a/0005-gi-fix-a-memory-leak-for-module-function-with-callba.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8b99c971ec7451068f8dece57ff31f1c629ffdaa Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Fri, 1 Feb 2019 06:22:35 +0900 -Subject: [PATCH 5/5] gi: fix a memory leak for module function with callback - case - -We can assume that the pango_cairo_context_set_shape_renderer()'s -first argument (Pango::Context) is suitable for owner of the callback. - -GitHub: fix #1270 - -Reported by Izumi Tsutsui. Thanks!!! ---- - .../ext/gobject-introspection/rb-gi-function-info.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c b/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c -index 33cee6644..0a0bc917b 100644 ---- a/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c -+++ b/gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c -@@ -1174,6 +1174,16 @@ in_callback_argument_from_ruby(RBGIArgMetadata *metadata, - if (NIL_P(mGLibObject)) { - mGLibObject = rb_const_get(mGLib, rb_intern("Object")); - } -+ if (NIL_P(rb_owner)) { -+ /* Module function case. */ -+ VALUE rb_first_argument = rb_ary_entry(rb_arguments, 0); -+ if (rb_obj_is_kind_of(rb_first_argument, mGLibObject)) { -+ /* If the first argument of the module function call is -+ GObject, it's suitable for owner. -+ For example: pango_cairo_context_set_shape_renderer() */ -+ rb_owner = rb_first_argument; -+ } -+ } - if (rb_obj_is_kind_of(rb_owner, mGLibObject)) { - rbgobj_object_add_relative(rb_owner, callback_data->rb_callback); - callback_data->owner = RVAL2GOBJ(rb_owner); --- -2.20.1 - diff --git a/rubygem-gobject-introspection.spec b/rubygem-gobject-introspection.spec index 53c2134..f18e9df 100644 --- a/rubygem-gobject-introspection.spec +++ b/rubygem-gobject-introspection.spec @@ -9,16 +9,13 @@ Summary: Ruby binding of GObjectIntrospection Name: rubygem-%{gem_name} -Version: 3.3.1 +Version: 3.3.2 Release: 1%{?dist} # lib/gobject-introspection.rb and so on License: LGPLv2+ URL: http://ruby-gnome2.sourceforge.jp/ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -# Upstream patches -Patch3: 0003-gi-fix-wrong-nil-check.patch -Patch5: 0005-gi-fix-a-memory-leak-for-module-function-with-callba.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -65,15 +62,13 @@ gem unpack %{SOURCE0} cd %{gem_name}-%{version} # Patches -%patch3 -p2 -%patch5 -p2 # Permission find . -name \*.rb -print0 | xargs --null chmod 0644 gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec # Allow ruby-gnome2 no less than ones -sed -i -e 's|= 3\.3\.1|>= 3.3.1|' %{gem_name}.gemspec +sed -i -e 's|= 3\.3\.2|>= 3.3.2|' %{gem_name}.gemspec gem build %{gem_name}.gemspec mv %{gem_name}-%{version}.gem $TOPDIR @@ -156,6 +151,9 @@ popd %exclude %{gem_instdir}/test/ %changelog +* Sun Feb 17 2019 Mamoru TASAKA - 3.3.2-1 +- 3.3.2 + * Fri Feb 1 2019 Mamoru TASAKA - 3.3.1-1 - 3.3.1 diff --git a/sources b/sources index 2002fb1..70345d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gobject-introspection-3.3.1.gem) = 6906b2300405494602ee17cddc3dc2d9297d6be7aedda256d5ffa999063e49dd113c29a539b2e95fc6489ac37541c3d96d04fb9e35e95b4dbd9b8c2e23a3859a +SHA512 (gobject-introspection-3.3.2.gem) = 712a4409dfb371b35864881d0e78ea4976bca3c768379f9823135e8e94a2e59c37f95b11e81df33595651472fff0dd27c16368ecdc7b8806b5a03e558d501320