gobject-introspection 3.2.7-x64-mingw32 → 3.2.8-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837dbcbac9977014f0fce13d9cd423c86ae89cff8c6ee3783b81872bd7d14c45
-  data.tar.gz: ed3ef8ccb5ee9a40dd8b0178527be5bee18e85d859ca6ca01b0258a813917514
+  metadata.gz: 4e8430828ae7122a3ee211ebc6495036f8dc9642fa64f468fc5290db8c09ba54
+  data.tar.gz: 43f1353c8b157765bcf115dfe29b1ad56474c6c7cef8c2f3f27d7a019155fec3
 SHA512:
-  metadata.gz: 3828adfb987b923385db59e584df0d0f114e022b61cb9863f1665118da2386dbd3979887e19eb503ac61156936876714909715181539a5c2dc901903a5e3a1a5
-  data.tar.gz: 553a49dc697acc1a8f52a81aaa44b82db0638bff15ecac19a224e6109b5807289910065b3c19490ddefb112a283e6a831737d7364d4a17bf2e3f503dbfcaeeb5
+  metadata.gz: f9863a25171d97d4946b1019f636ed7c00001a9458b90dcfb2e168e35d3bcd9c5bac2cd9b498e50959b41cb3f10a0f47aeb66bb73971f248b18c2c5c8dc6e131
+  data.tar.gz: 79e0cf1e28ad9e2170907aa10585a775dcec2aba9da7864af8948e6d56609731ff2d10b4d10abf5171460cbc6ed6929d38be6364ccf1f9450a7c52f9470e99d9

data/ext/gobject-introspection/rb-gi-constant-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2018  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -49,7 +49,7 @@ rg_value(VALUE self)
 {
     GIConstantInfo *info;
     GIArgument value;
-    gint value_size;
+    G_GNUC_UNUSED gint value_size;
     GITypeInfo *type_info;
     VALUE rb_value;
 

data/ext/gobject-introspection/rb-gi-function-info.c

@@ -46,6 +46,7 @@ struct RBGICallbackData_ {
     RBGICallback *callback;
     RBGIArgMetadata *metadata;
     VALUE rb_callback;
+    GObject *owner;
 };
 
 static VALUE RG_TARGET_NAMESPACE;
@@ -303,18 +304,6 @@ fill_metadata(GPtrArray *args_metadata, GICallableInfo *info)
     fill_metadata_rb_arg_index(args_metadata);
 }
 
-static void
-callback_data_guard_from_gc(RBGICallbackData *callback_data)
-{
-    rbg_gc_guard(callback_data, callback_data->rb_callback);
-}
-
-static void
-callback_data_unguard_from_gc(RBGICallbackData *callback_data)
-{
-    rbg_gc_unguard(callback_data);
-}
-
 static void
 rb_gi_callback_free(RBGICallback *callback)
 {
@@ -325,13 +314,30 @@ rb_gi_callback_free(RBGICallback *callback)
     xfree(callback);
 }
 
+static void
+rb_gi_callback_data_weak_notify(gpointer data, GObject* where_the_object_was)
+{
+    RBGICallbackData *callback_data = data;
+    callback_data->owner = NULL;
+}
+
 void
 rb_gi_callback_data_free(RBGICallbackData *callback_data)
 {
     if (callback_data->callback) {
         rb_gi_callback_free(callback_data->callback);
     }
-    callback_data_unguard_from_gc(callback_data);
+    if (callback_data->owner) {
+        VALUE rb_owner;
+        g_object_weak_unref(callback_data->owner,
+                            rb_gi_callback_data_weak_notify,
+                            callback_data);
+        rb_owner = rbgobj_ruby_object_from_instance2(callback_data->owner,
+                                                     FALSE);
+        if (!NIL_P(rb_owner)) {
+            rbgobj_object_remove_relative(rb_owner, callback_data->rb_callback);
+        }
+    }
     xfree(callback_data->metadata);
     xfree(callback_data);
 }
@@ -349,7 +355,7 @@ rb_gi_callback_data_get_rb_callback(RBGICallbackData *callback_data)
 }
 
 static void
-destroy_notify(gpointer data)
+rb_gi_callback_data_destroy_notify(gpointer data)
 {
     RBGICallbackData *callback_data = data;
     rb_gi_callback_data_free(callback_data);
@@ -1087,7 +1093,10 @@ ffi_closure_callback(G_GNUC_UNUSED ffi_cif *cif,
 }
 
 static void
-in_callback_argument_from_ruby(RBGIArgMetadata *metadata, GArray *in_args)
+in_callback_argument_from_ruby(RBGIArgMetadata *metadata,
+                               GArray *in_args,
+                               VALUE self,
+                               VALUE rb_arguments)
 {
     gpointer callback_function;
     GIArgInfo *arg_info;
@@ -1140,17 +1149,27 @@ in_callback_argument_from_ruby(RBGIArgMetadata *metadata, GArray *in_args)
 
     if (closure_argument) {
         RBGICallbackData *callback_data;
+        VALUE rb_owner;
 
         callback_data = ALLOC(RBGICallbackData);
         callback_data->callback = callback;
         callback_data->metadata = metadata;
         callback_data->rb_callback = rb_block_proc();
-        callback_data_guard_from_gc(callback_data);
+        if (NIL_P(self)) {
+            rb_owner = rb_ary_entry(rb_arguments, 0);
+        } else {
+            rb_owner = self;
+        }
+        rbgobj_object_add_relative(rb_owner, callback_data->rb_callback);
+        callback_data->owner = RVAL2GOBJ(rb_owner);
+        g_object_weak_ref(callback_data->owner,
+                          rb_gi_callback_data_weak_notify,
+                          callback_data);
         closure_argument->v_pointer = callback_data;
     }
 
     if (destroy_argument) {
-        destroy_argument->v_pointer = destroy_notify;
+        destroy_argument->v_pointer = rb_gi_callback_data_destroy_notify;
     }
 }
 
@@ -1163,7 +1182,7 @@ in_argument_from_ruby(GICallableInfo *callable_info,
                       VALUE self)
 {
     if (metadata->callback_p && !metadata->destroy_p) {
-        in_callback_argument_from_ruby(metadata, in_args);
+        in_callback_argument_from_ruby(metadata, in_args, self, rb_arguments);
         return;
     }
 

data/gobject-introspection.gemspec

@@ -47,4 +47,6 @@ Gem::Specification.new do |s|
   s.files += Dir.glob("test/**/*")
 
   s.add_runtime_dependency("glib2", "= #{s.version}")
+
+  s.metadata["msys2_mingw_dependencies"] = "gobject-introspection"
 end

data/lib/gobject-introspection/loader.rb

@@ -596,7 +596,7 @@ module GObjectIntrospection
     end
 
     def define_equal_style_setter(info, klass, method_name)
-      if /\Aset_/ =~ method_name and info.n_args == 1
+      if /\Aset_/ =~ method_name and info.n_in_args == 1
         setter_method_name = "#{$POSTMATCH}="
         remove_existing_method(klass, setter_method_name)
         klass.__send__(:alias_method, setter_method_name, method_name)

data/vendor/local/lib/libgirepository-1.0.la

@@ -17,7 +17,7 @@ old_library='libgirepository-1.0.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gobject-introspection/vendor/local/lib -L/home/vagrant/ruby-gnome2/rcairo/vendor/local/lib /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libffi.la'
+dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib -L/home/vagrant/ruby-gnome2/gobject-introspection/vendor/local/lib /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgio-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgmodule-2.0.la -ldnsapi -liphlpapi -lz /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libffi.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
 platform: x64-mingw32
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.8
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries