gobject-introspection 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49167989e84276d322d8ec6fc0e7a189924c62b5ff7daccfb76040284c75909d
-  data.tar.gz: 045e683e7f9ffef5731b9763cada4c841243fda0ac14622cff3612454dc72ae3
+  metadata.gz: d072b72b786e12f881fea9bde17a9eff9a4c71bedd25f4ecdd2b18267b8ba051
+  data.tar.gz: c9e9e78f5c492cb8fea24a1b54e05c2cedad2ec6ce877030cdb3782863340673
 SHA512:
-  metadata.gz: d8ca3007506eb8d0a91ba925678de9bbe3a1b3c2d295a968f47a1035efc031d6d8e254bb814c3638abfc415263cf991cbb9e60ff598585d2baa9b4ac02cb3ed8
-  data.tar.gz: eaf8f55fb4cf71eba636f840e8bcfea3850f127736fd9ae650fb6d8d981d31d7618a6c78e22f887d22e436f1c5fd6a897cf260281ab054b89fe560eac761db00
+  metadata.gz: a24acd65c6f1ddfe47665819bbb37c6121e2c154183c23f64512e4e6ad3b9ba52cde4f035d06754f45071afed0a3db82024efe2ceac596b3d45eeb2027d182d2
+  data.tar.gz: 1cdf78cd475b3401ecbd261b182b4271989600a2aef1f572e14c460fa25a84350c0c515edd301c4af7e27ad79943d9c33e24f21fa01c2d5634e7cbd9aec51d38

data/ext/gobject-introspection/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012-2019  Ruby-GNOME Project Team
+# Copyright (C) 2012-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -62,9 +62,6 @@ end
 # TODO: Remove this when we dropped support for GObject Introspection < 1.60
 make_version_header("GI", package_id, ".")
 
-gi_headers = ["girepository.h"]
-have_func("g_interface_info_find_signal", gi_headers)
-
 enum_type_prefix = "gobject-introspection-enum-types"
 include_paths = PKGConfig.cflags_only_I(package_id)
 headers = include_paths.split.inject([]) do |result, path|

data/ext/gobject-introspection/rb-gi-arguments-in.c

@@ -682,7 +682,7 @@ rb_gi_arguments_in_init_arg_ruby_array_c_gtype(RBGIArguments *args,
     raw_array = ALLOC_N(GType, n_elements);
     for (i = 0; i < n_elements; i++) {
         VALUE rb_type = RARRAY_AREF(rb_array, i);
-        raw_array[i] = rbgobj_gtype_get(rb_type);
+        raw_array[i] = rbgobj_gtype_from_ruby(rb_type);
     }
 
     rb_gi_arguments_in_init_arg_ruby_array_c_generic(args,
@@ -1262,15 +1262,6 @@ rb_gi_arguments_in_init_arg_ruby_interface(RBGIArguments *args,
                  rb_gi_transfer_to_string(metadata->transfer));
         break;
       case GI_INFO_TYPE_STRUCT:
-        if (metadata->transfer != GI_TRANSFER_NOTHING) {
-            rb_raise(rb_eNotImpError,
-                     "TODO: [%s] %s Ruby -> GIArgument(interface)[%s][%s][%s]",
-                     metadata->name,
-                     rb_gi_direction_to_string(metadata->direction),
-                     g_info_type_to_string(metadata->type.interface_type),
-                     g_type_name(metadata->type.interface_gtype),
-                     rb_gi_transfer_to_string(metadata->transfer));
-        }
         metadata->free_func = rb_gi_arguments_in_free_interface_struct;
         if (metadata->type.interface_gtype == G_TYPE_VALUE) {
             GValue *gvalue;

data/ext/gobject-introspection/rb-gi-arguments-out.c

@@ -105,10 +105,11 @@ rb_gi_arguments_out_free_array_c_interface(RBGIArguments *args,
       case GI_TRANSFER_EVERYTHING:
       default:
         rb_raise(rb_eNotImpError,
-                 "TODO: [%s] %s free GIArgument(%s)[%s]",
+                 "TODO: [%s] %s free GIArgument(%s/%s)[%s]",
                  metadata->name,
                  rb_gi_direction_to_string(metadata->direction),
                  g_type_tag_to_string(metadata->type.tag),
+                 rb_gi_array_type_to_string(metadata->array_type),
                  rb_gi_transfer_to_string(metadata->transfer));
     }
     xfree(target);
@@ -120,17 +121,34 @@ rb_gi_arguments_out_free_array_array_interface_struct(RBGIArguments *args,
                                                       gpointer user_data)
 {
     GArray *target = metadata->out_arg->v_pointer;
+    GType gtype = metadata->element_type.interface_gtype;
     switch (metadata->transfer) {
       case GI_TRANSFER_NOTHING:
         break;
       case GI_TRANSFER_CONTAINER:
+        break;
       case GI_TRANSFER_EVERYTHING:
+        if (gtype == G_TYPE_NONE) {
+            /* If the target struct is raw (not GType-ed) struct, we
+             * can't know how to free fields in the target struct. We
+             * assume that the target struct doesn't allocate nothing
+             * for its fields.
+             *
+             * e.g.: The attributes out argument in
+             * vte_terminal_get_text_range():
+             * https://developer.gnome.org/vte/unstable/VteTerminal.html#vte-terminal-get-text-range
+             */
+            break;
+        }
       default:
         rb_raise(rb_eNotImpError,
-                 "TODO: [%s] %s free GIArgument(%s)[%s]",
+                 "TODO: [%s] %s free GIArgument(%s/%s)[interface(%s)](%s)[%s]",
                  metadata->name,
                  rb_gi_direction_to_string(metadata->direction),
                  g_type_tag_to_string(metadata->type.tag),
+                 rb_gi_array_type_to_string(metadata->array_type),
+                 g_info_type_to_string(metadata->element_type.interface_type),
+                 g_type_name(metadata->element_type.interface_gtype),
                  rb_gi_transfer_to_string(metadata->transfer));
     }
     g_array_free(target, TRUE);

data/ext/gobject-introspection/rb-gi-arguments.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2021  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -23,16 +23,7 @@
 static gboolean
 rb_gi_arg_info_may_be_null(GIArgInfo *arg_info)
 {
-#if GI_CHECK_VERSION(1, 42, 0)
     return g_arg_info_may_be_null(arg_info);
-#else
-    /*
-      GObject Introspection < 1.42 doesn't support "(nullable)" yet.
-      So, we assume that all argument may be NULL. It's danger but
-      convenient.
-    */
-    return TRUE;
-#endif
 }
 
 static gboolean

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2021  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -125,15 +125,9 @@ rg_get_signal(VALUE self, VALUE rb_n_or_name)
         n = NUM2INT(rb_n_or_name);
         signal_info = g_interface_info_get_signal(info, n);
     } else {
-#ifdef HAVE_G_INTERFACE_INFO_FIND_SIGNAL
         const char *name;
         name = RVAL2CSTR(rb_n_or_name);
         signal_info = g_interface_info_find_signal(info, name);
-#else
-        rb_raise(rb_eArgError,
-                 "g_interface_info_find_signal() is defined "
-                 "since GObjectIntrospection 1.34");
-#endif
     }
 
     return GI_BASE_INFO2RVAL_WITH_UNREF(signal_info);

data/ext/gobject-introspection/rb-gi-loader.c

@@ -39,7 +39,7 @@ rg_s_define_class(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
                      "size", &rb_size,
                      NULL);
 
-    gtype = NUM2ULONG(rb_to_int(rb_gtype));
+    gtype = rbgobj_gtype_from_ruby(rb_gtype);
     rb_class = G_DEF_CLASS_WITH_PARENT(gtype, RVAL2CSTR(rb_name),
                                        rb_module, rb_parent);
     if (!NIL_P(rb_size)) {
@@ -54,7 +54,7 @@ rg_s_define_interface(G_GNUC_UNUSED VALUE klass,
 {
     GType gtype;
 
-    gtype = rbgobj_gtype_get(rb_gtype);
+    gtype = rbgobj_gtype_from_ruby(rb_gtype);
     return G_DEF_INTERFACE(gtype, RVAL2CSTR(rb_name), rb_module);
 }
 
@@ -133,7 +133,7 @@ rg_s_define_error(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
     }
 
     if (!NIL_P(rb_gtype)) {
-        gtype = NUM2ULONG(rb_funcall(rb_gtype, rb_intern("to_i"), 0));
+        gtype = rbgobj_gtype_from_ruby(rb_gtype);
     }
 
     return G_DEF_ERROR(domain, name, rb_module, rb_parent, gtype);
@@ -173,12 +173,10 @@ rg_s_register_boxed_class_converter(VALUE klass, VALUE rb_gtype)
 {
     RGConvertTable table;
     BoxedInstance2RObjData *data;
-    ID id_to_i;
     VALUE boxed_class_converters;
 
     memset(&table, 0, sizeof(RGConvertTable));
-    CONST_ID(id_to_i, "to_i");
-    table.type = NUM2ULONG(rb_funcall(rb_gtype, id_to_i, 0));
+    table.type = rbgobj_gtype_from_ruby(rb_gtype);
     table.klass = Qnil;
     table.instance2robj = boxed_instance2robj;
 
@@ -243,12 +241,10 @@ rg_s_register_object_class_converter(VALUE klass, VALUE rb_gtype)
 {
     RGConvertTable table;
     ObjectInstance2RObjData *data;
-    ID id_to_i;
     VALUE object_class_converters;
 
     memset(&table, 0, sizeof(RGConvertTable));
-    CONST_ID(id_to_i, "to_i");
-    table.type = NUM2ULONG(rb_funcall(rb_gtype, id_to_i, 0));
+    table.type = rbgobj_gtype_from_ruby(rb_gtype);
     table.klass = Qnil;
     table.instance2robj = object_instance2robj;
 

data/ext/gobject-introspection/rb-gi-repository.c

@@ -228,7 +228,7 @@ rg_find(int argc, VALUE *argv, VALUE self)
         VALUE rb_gtype;
         GType gtype;
         rb_gtype = argv[0];
-        gtype = NUM2UINT(rb_gtype);
+        gtype = rbgobj_gtype_from_ruby(rb_gtype);
         info = g_irepository_find_by_gtype(SELF(self), gtype);
     } else {
         VALUE rb_namespace, rb_name;

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

@@ -84,7 +84,7 @@ rb_gi_struct_get_raw(VALUE rb_struct, GType gtype)
         if (rb_respond_to(rb_struct_class, rb_intern("gtype"))) {
             VALUE rb_gtype;
             rb_gtype = rb_funcall(rb_struct_class, rb_intern("gtype"), 0);
-            gtype = NUM2ULONG(rb_funcall(rb_gtype, rb_intern("to_i"), 0));
+            gtype = rbgobj_gtype_from_ruby(rb_gtype);
         }
     }
     if (gtype == G_TYPE_NONE) {
@@ -146,7 +146,7 @@ rb_gi_struct_info_to_ruby(GIStructInfo *info,
         GType gtype;
 
         rb_gtype = rb_funcall(rb_class, rb_intern("gtype"), 0);
-        gtype = NUM2ULONG(rb_funcall(rb_gtype, rb_intern("to_i"), 0));
+        gtype = rbgobj_gtype_from_ruby(rb_gtype);
         return BOXED2RVAL(object, gtype);
     }
 

data/test/gobject-introspection-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "test-unit"
+require "gobject-introspection"
 
 module GObjectIntrospectionTestUtils
   def require_version(major, minor, micro)

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012-2020  Ruby-GNOME Project Team
+# Copyright (C) 2012-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,31 +16,20 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-ruby_gnome_base = File.join(File.dirname(__FILE__), "..", "..")
-ruby_gnome_base = File.expand_path(ruby_gnome_base)
+require_relative "../../glib2/test/run-test"
 
-glib_base = File.join(ruby_gnome_base, "glib2")
-gobject_introspection_base = File.join(ruby_gnome_base, "gobject-introspection")
+run_test(__dir__,
+         [
+           "glib2",
+           "gobject-introspection",
+         ]) do |context|
+  require_relative "gobject-introspection-test-utils"
 
-modules = [
-  [glib_base, "glib2"],
-  [gobject_introspection_base, "gobject-introspection"]
-]
-modules.each do |target, module_name|
-  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
-    `make -C #{target.dump} > /dev/null` or exit(false)
+  begin
+    repository = GObjectIntrospection::Repository.default
+    repository.require("Gio")
+  rescue GObjectIntrospection::RepositoryError
+    puts("Omit because typelib file doesn't exist: #{$!.message}")
+    exit(true)
   end
-  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
-  $LOAD_PATH.unshift(File.join(target, "lib"))
 end
-
-$LOAD_PATH.unshift(File.join(glib_base, "test"))
-require "glib-test-init"
-
-$LOAD_PATH.unshift(File.join(gobject_introspection_base, "test"))
-require "gobject-introspection-test-utils"
-
-require "gobject-introspection"
-
-exit Test::Unit::AutoRunner.run(true,
-                                File.join(gobject_introspection_base, "test"))

data/test/test-callable-info.rb

@@ -32,7 +32,15 @@ class TestCallableInfo < Test::Unit::TestCase
   end
 
   def test_may_return_null?
-    assert_false(@info.may_return_null?)
+    if GObjectIntrospection::Version.or_later?(1, 67, 0)
+      assert do
+        @info.may_return_null?
+      end
+    else
+      assert do
+        not @info.may_return_null?
+      end
+    end
   end
 
   def test_n_args

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.4.4
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/GObjectIntrospection is a Ruby binding of GObject Introspection.