gobject-introspection 3.3.9 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63b8621d7aa520ba998438e4930c7d6e69398c520e589adafea823aa7597790b
-  data.tar.gz: 4b3b7409538ab5cdbcf237a1e107d25b276eaa61f4ca56cf771764e3a1343aa3
+  metadata.gz: d072b72b786e12f881fea9bde17a9eff9a4c71bedd25f4ecdd2b18267b8ba051
+  data.tar.gz: c9e9e78f5c492cb8fea24a1b54e05c2cedad2ec6ce877030cdb3782863340673
 SHA512:
-  metadata.gz: ddce980ec3e2abf3a95c16ceb6e48489af7cddd03d59e135485c1adfbe61263b6349ee4d0b53025df9d5ec0f6140721c2ec61604bf6dd2f9304446069e0482e1
-  data.tar.gz: dec6cddf5c698e47b511913e0f827f29fac841fffee0d3566bdda09f98aab2fd24d84534d695cf2ea6da767402afcc56b789bb9b937f49d6f345755e985b9f6f
+  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

@@ -120,7 +120,7 @@ rb_gi_ffi_closure_callback(G_GNUC_UNUSED ffi_cif *cif,
             i = args.metadata->len - 1;
             metadata = g_ptr_array_index(args.metadata, i);
             if (metadata->type.tag == GI_TYPE_TAG_VOID &&
-                metadata->pointer_p &&
+                metadata->type.pointer_p &&
                 strcmp(metadata->name, "data") == 0) {
                 callback_data = *((RBGICallbackData **)(raw_args[i]));
             }
@@ -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,
@@ -721,26 +721,50 @@ rb_gi_arguments_in_init_arg_ruby_array_c_interface_struct(RBGIArguments *args,
 {
     GIStructInfo *struct_info =
         (GIStructInfo *)(metadata->element_type.interface_info);
-    guint8 *raw_array;
-    gsize struct_size;
     long i, n_elements;
 
     n_elements = RARRAY_LEN(rb_array);
-    struct_size = g_struct_info_get_size(struct_info);
-    raw_array = ALLOC_N(guint8, struct_size * n_elements);
-    for (i = 0; i < n_elements; i++) {
-        VALUE rb_element = RARRAY_AREF(rb_array, i);
-        gpointer element;
-        element = rb_gi_struct_info_from_ruby(struct_info, rb_element);
-        memcpy(raw_array + (struct_size * i),
-               element,
-               struct_size);
+    if (metadata->element_type.pointer_p) {
+        if (metadata->transfer != GI_TRANSFER_NOTHING) {
+            rb_raise(rb_eNotImpError,
+                     "TODO: [%s::%s] %s "
+                     "Ruby -> GIArgument(array/%s)[interface(%s)](%s)[%s]",
+                     args->name,
+                     metadata->name,
+                     rb_gi_direction_to_string(metadata->direction),
+                     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));
+        }
+        gpointer *raw_array = ALLOC_N(gpointer, n_elements);
+        for (i = 0; i < n_elements; i++) {
+            VALUE rb_element = RARRAY_AREF(rb_array, i);
+            gpointer element;
+            element = rb_gi_struct_info_from_ruby(struct_info, rb_element);
+            raw_array[i] = element;
+        }
+        rb_gi_arguments_in_init_arg_ruby_array_c_generic(args,
+                                                         metadata,
+                                                         rb_array,
+                                                         raw_array);
+    } else {
+        gsize struct_size = g_struct_info_get_size(struct_info);
+        guint8 *raw_array = ALLOC_N(guint8, struct_size * n_elements);
+        for (i = 0; i < n_elements; i++) {
+            VALUE rb_element = RARRAY_AREF(rb_array, i);
+            gpointer element;
+            element = rb_gi_struct_info_from_ruby(struct_info, rb_element);
+            memcpy(raw_array + (struct_size * i),
+                   element,
+                   struct_size);
+        }
+        rb_gi_arguments_in_init_arg_ruby_array_c_generic(args,
+                                                         metadata,
+                                                         rb_array,
+                                                         raw_array);
     }
 
-    rb_gi_arguments_in_init_arg_ruby_array_c_generic(args,
-                                                     metadata,
-                                                     rb_array,
-                                                     raw_array);
     metadata->free_func = rb_gi_arguments_in_free_array_c_interface_struct;
 }
 
@@ -980,7 +1004,15 @@ rb_gi_arguments_in_init_arg_ruby_array_c(RBGIArguments *args,
                                                        rb_arg);
         break;
       case GI_TYPE_TAG_UTF8:
-        {
+        /* Workaround for rsvg_handle_set_stylesheet():
+           https://gitlab.gnome.org/GNOME/librsvg/-/issues/596 */
+        if (strcmp(metadata->name, "css") == 0) {
+            metadata->in_arg->v_pointer = RVAL2CSTR(rb_arg);
+            rb_gi_arguments_in_init_arg_ruby_array_set_length(args,
+                                                              metadata,
+                                                              RSTRING_LEN(rb_arg));
+            metadata->free_func = NULL;
+        } else {
             GIArgument *array_argument = metadata->in_arg;
             gchar **raw_array;
             long length;
@@ -1230,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;
@@ -1645,7 +1668,15 @@ rb_gi_arguments_in_init_arg_ruby_ghash_body(VALUE value_data)
       case GI_TYPE_TAG_FLOAT:
       case GI_TYPE_TAG_DOUBLE:
       case GI_TYPE_TAG_GTYPE:
+        rb_raise(rb_eNotImpError,
+                 "TODO: Ruby -> GIArgument(GHash)[value][%s]",
+                 g_type_tag_to_string(metadata->value_type.tag));
+        break;
       case GI_TYPE_TAG_UTF8:
+        value_destroy_func = g_free;
+        value_ruby_to_c_func = ruby_to_c_utf8;
+        value_ruby_to_c_data.context = "Ruby -> GIArgument(GHash)[value][utf8]";
+        break;
       case GI_TYPE_TAG_FILENAME:
       case GI_TYPE_TAG_ARRAY:
         rb_raise(rb_eNotImpError,

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);
@@ -505,16 +523,18 @@ rb_gi_arguments_out_init_arg_interface(RBGIArguments *args,
                  g_info_type_to_string(metadata->type.interface_type));
         break;
       case GI_INFO_TYPE_STRUCT:
-        {
-            gsize struct_size;
-
-            /* Should we care gtype?
-               Related: rb_gi_arguments_out_arg_clear_interface() */
-            struct_size = g_struct_info_get_size(metadata->type.interface_info);
+        /* Should we care gtype? */
+        if (metadata->type.pointer_p) {
+            gpointer *struct_location = RB_ALLOC(gpointer);
+            *struct_location = NULL;
+            argument->v_pointer = struct_location;
+        } else {
+            gsize struct_size =
+                g_struct_info_get_size(metadata->type.interface_info);
             argument->v_pointer = xmalloc(struct_size);
             memset(argument->v_pointer, 0, struct_size);
-            metadata->free_func = rb_gi_arguments_out_free_interface_struct;
         }
+        metadata->free_func = rb_gi_arguments_out_free_interface_struct;
         break;
       case GI_INFO_TYPE_BOXED:
         rb_raise(rb_eNotImpError,
@@ -584,7 +604,7 @@ rb_gi_arguments_out_init_arg(RBGIArguments *args,
     memset(argument, 0, sizeof(GIArgument));
     switch (metadata->type.tag) {
       case GI_TYPE_TAG_VOID:
-        if (metadata->pointer_p) {
+        if (metadata->type.pointer_p) {
             gpointer *pointer = ALLOC(gpointer);
             *pointer = NULL;
             argument->v_pointer = pointer;
@@ -800,7 +820,7 @@ rb_gi_arguments_out_to_ruby_arg(RBGIArguments *args,
     memset(&normalized_argument, 0, sizeof(GIArgument));
     switch (metadata->type.tag) {
       case GI_TYPE_TAG_VOID:
-        if (metadata->pointer_p) {
+        if (metadata->type.pointer_p) {
             normalized_argument.v_pointer = *((gpointer *)(argument->v_pointer));
         }
         break;

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
@@ -57,12 +48,14 @@ rb_gi_arg_metadata_type_init(RBGIArgMetadataType *type,
                              GITypeInfo *type_info)
 {
     type->info = type_info;
+    type->pointer_p = FALSE;
     type->tag = GI_TYPE_TAG_VOID;
     type->interface_info = NULL;
     type->interface_type = GI_INFO_TYPE_INVALID;
     type->interface_gtype = G_TYPE_INVALID;
 
     if (type->info) {
+        type->pointer_p = g_type_info_is_pointer(type->info);
         type->tag = g_type_info_get_tag(type->info);
     }
     if (type->tag == GI_TYPE_TAG_INTERFACE) {
@@ -114,7 +107,6 @@ rb_gi_arg_metadata_new(GICallableInfo *callable_info, gint i)
     metadata->array_p = (metadata->type.tag == GI_TYPE_TAG_ARRAY);
     metadata->array_length_p = FALSE;
     metadata->may_be_null_p = rb_gi_arg_info_may_be_null(arg_info);
-    metadata->pointer_p = g_type_info_is_pointer(type_info);
     metadata->caller_allocates_p = g_arg_info_is_caller_allocates(arg_info);
     metadata->zero_terminated_p = FALSE;
     metadata->output_buffer_p = rb_gi_arg_info_is_output_buffer(arg_info);

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-private-arguments.h

@@ -40,6 +40,7 @@ typedef void (*RBGIArgFreeFunc)(RBGIArguments *args,
 
 typedef struct {
     GITypeInfo *info;
+    gboolean pointer_p;
     GITypeTag tag;
     GIBaseInfo *interface_info;
     GIInfoType interface_type;
@@ -64,7 +65,6 @@ struct RBGIArgMetadata_ {
     gboolean array_length_p;
     gboolean interface_p;
     gboolean may_be_null_p;
-    gboolean pointer_p;
     gboolean caller_allocates_p;
     gboolean zero_terminated_p;
     gboolean output_buffer_p;

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/lib/gobject-introspection/loader.rb

@@ -681,10 +681,10 @@ module GObjectIntrospection
       def normalize_arguments!(arguments, abort_tag)
         arguments.size.times do |i|
           argument = arguments[i]
-          next if argument.nil?
           type = @in_arg_types[i]
           converted_argument = type.try_convert(argument)
           if converted_argument.nil?
+            next if argument.nil?
             if abort_tag
               throw(abort_tag)
             elsif @on_invalid == :fallback

data/lib/gobject-introspection/type-tag.rb

@@ -29,6 +29,8 @@ module GObjectIntrospection
         case value
         when true, false
           value
+        when nil
+          false
         else
           nil
         end

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-2015  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
@@ -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_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
-ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
+require_relative "../../glib2/test/run-test"
 
-glib_base = File.join(ruby_gnome2_base, "glib2")
-gobject_introspection_base = File.join(ruby_gnome2_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.3.9
+  version: 3.4.4
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-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.3.9
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        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
@@ -38,8 +38,6 @@ files:
 - Rakefile
 - ext/gobject-introspection/depend
 - ext/gobject-introspection/extconf.rb
-- ext/gobject-introspection/gobject-introspection-enum-types.c
-- ext/gobject-introspection/gobject-introspection-enum-types.h
 - ext/gobject-introspection/gobject_introspection.def
 - ext/gobject-introspection/rb-gi-arg-info.c
 - ext/gobject-introspection/rb-gi-argument.c
@@ -88,7 +86,6 @@ files:
 - ext/gobject-introspection/rb-gi-vfunc-info.c
 - ext/gobject-introspection/rb-gobject-introspection.c
 - ext/gobject-introspection/rb-gobject-introspection.h
-- ext/gobject-introspection/rbgiversion.h
 - extconf.rb
 - gobject-introspection.gemspec
 - lib/gi.rb
@@ -154,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/GObjectIntrospection is a Ruby binding of GObject Introspection.

data/ext/gobject-introspection/gobject-introspection-enum-types.c

@@ -1,230 +0,0 @@
-
-/* Generated by glib-mkenums.rb ($Id$) */ 
-
-#include "gobject-introspection-enum-types.h"
-#include <girepository.h>
-
-
-
-/* enumerations from "/usr/include/gobject-introspection-1.0/girepository.h" */
-GType
-g_i_repository_load_flags_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GFlagsValue values[] = {
-      { G_IREPOSITORY_LOAD_FLAG_LAZY, "G_IREPOSITORY_LOAD_FLAG_LAZY", "g-irepository-load-flag-lazy" },
-      { 0, NULL, NULL }
-    };
-    etype = g_flags_register_static ("GIRepositoryLoadFlags", values);
-  }
-  return etype;
-}
-
-GType
-g_i_repository_error_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { G_IREPOSITORY_ERROR_TYPELIB_NOT_FOUND, "G_IREPOSITORY_ERROR_TYPELIB_NOT_FOUND", "typelib-not-found" },
-      { G_IREPOSITORY_ERROR_NAMESPACE_MISMATCH, "G_IREPOSITORY_ERROR_NAMESPACE_MISMATCH", "namespace-mismatch" },
-      { G_IREPOSITORY_ERROR_NAMESPACE_VERSION_CONFLICT, "G_IREPOSITORY_ERROR_NAMESPACE_VERSION_CONFLICT", "namespace-version-conflict" },
-      { G_IREPOSITORY_ERROR_LIBRARY_NOT_FOUND, "G_IREPOSITORY_ERROR_LIBRARY_NOT_FOUND", "library-not-found" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("GIRepositoryError", values);
-  }
-  return etype;
-}
-
-
-/* enumerations from "/usr/include/gobject-introspection-1.0/gitypes.h" */
-GType
-g_i_info_type_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { GI_INFO_TYPE_INVALID, "GI_INFO_TYPE_INVALID", "invalid" },
-      { GI_INFO_TYPE_FUNCTION, "GI_INFO_TYPE_FUNCTION", "function" },
-      { GI_INFO_TYPE_CALLBACK, "GI_INFO_TYPE_CALLBACK", "callback" },
-      { GI_INFO_TYPE_STRUCT, "GI_INFO_TYPE_STRUCT", "struct" },
-      { GI_INFO_TYPE_BOXED, "GI_INFO_TYPE_BOXED", "boxed" },
-      { GI_INFO_TYPE_ENUM, "GI_INFO_TYPE_ENUM", "enum" },
-      { GI_INFO_TYPE_FLAGS, "GI_INFO_TYPE_FLAGS", "flags" },
-      { GI_INFO_TYPE_OBJECT, "GI_INFO_TYPE_OBJECT", "object" },
-      { GI_INFO_TYPE_INTERFACE, "GI_INFO_TYPE_INTERFACE", "interface" },
-      { GI_INFO_TYPE_CONSTANT, "GI_INFO_TYPE_CONSTANT", "constant" },
-      { GI_INFO_TYPE_INVALID_0, "GI_INFO_TYPE_INVALID_0", "invalid-0" },
-      { GI_INFO_TYPE_UNION, "GI_INFO_TYPE_UNION", "union" },
-      { GI_INFO_TYPE_VALUE, "GI_INFO_TYPE_VALUE", "value" },
-      { GI_INFO_TYPE_SIGNAL, "GI_INFO_TYPE_SIGNAL", "signal" },
-      { GI_INFO_TYPE_VFUNC, "GI_INFO_TYPE_VFUNC", "vfunc" },
-      { GI_INFO_TYPE_PROPERTY, "GI_INFO_TYPE_PROPERTY", "property" },
-      { GI_INFO_TYPE_FIELD, "GI_INFO_TYPE_FIELD", "field" },
-      { GI_INFO_TYPE_ARG, "GI_INFO_TYPE_ARG", "arg" },
-      { GI_INFO_TYPE_TYPE, "GI_INFO_TYPE_TYPE", "type" },
-      { GI_INFO_TYPE_UNRESOLVED, "GI_INFO_TYPE_UNRESOLVED", "unresolved" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("GIInfoType", values);
-  }
-  return etype;
-}
-
-GType
-g_i_transfer_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { GI_TRANSFER_NOTHING, "GI_TRANSFER_NOTHING", "nothing" },
-      { GI_TRANSFER_CONTAINER, "GI_TRANSFER_CONTAINER", "container" },
-      { GI_TRANSFER_EVERYTHING, "GI_TRANSFER_EVERYTHING", "everything" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("GITransfer", values);
-  }
-  return etype;
-}
-
-GType
-g_i_direction_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { GI_DIRECTION_IN, "GI_DIRECTION_IN", "in" },
-      { GI_DIRECTION_OUT, "GI_DIRECTION_OUT", "out" },
-      { GI_DIRECTION_INOUT, "GI_DIRECTION_INOUT", "inout" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("GIDirection", values);
-  }
-  return etype;
-}
-
-GType
-g_i_scope_type_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { GI_SCOPE_TYPE_INVALID, "GI_SCOPE_TYPE_INVALID", "invalid" },
-      { GI_SCOPE_TYPE_CALL, "GI_SCOPE_TYPE_CALL", "call" },
-      { GI_SCOPE_TYPE_ASYNC, "GI_SCOPE_TYPE_ASYNC", "async" },
-      { GI_SCOPE_TYPE_NOTIFIED, "GI_SCOPE_TYPE_NOTIFIED", "notified" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("GIScopeType", values);
-  }
-  return etype;
-}
-
-GType
-g_i_type_tag_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { GI_TYPE_TAG_VOID, "GI_TYPE_TAG_VOID", "void" },
-      { GI_TYPE_TAG_BOOLEAN, "GI_TYPE_TAG_BOOLEAN", "boolean" },
-      { GI_TYPE_TAG_INT8, "GI_TYPE_TAG_INT8", "int8" },
-      { GI_TYPE_TAG_UINT8, "GI_TYPE_TAG_UINT8", "uint8" },
-      { GI_TYPE_TAG_INT16, "GI_TYPE_TAG_INT16", "int16" },
-      { GI_TYPE_TAG_UINT16, "GI_TYPE_TAG_UINT16", "uint16" },
-      { GI_TYPE_TAG_INT32, "GI_TYPE_TAG_INT32", "int32" },
-      { GI_TYPE_TAG_UINT32, "GI_TYPE_TAG_UINT32", "uint32" },
-      { GI_TYPE_TAG_INT64, "GI_TYPE_TAG_INT64", "int64" },
-      { GI_TYPE_TAG_UINT64, "GI_TYPE_TAG_UINT64", "uint64" },
-      { GI_TYPE_TAG_FLOAT, "GI_TYPE_TAG_FLOAT", "float" },
-      { GI_TYPE_TAG_DOUBLE, "GI_TYPE_TAG_DOUBLE", "double" },
-      { GI_TYPE_TAG_GTYPE, "GI_TYPE_TAG_GTYPE", "gtype" },
-      { GI_TYPE_TAG_UTF8, "GI_TYPE_TAG_UTF8", "utf8" },
-      { GI_TYPE_TAG_FILENAME, "GI_TYPE_TAG_FILENAME", "filename" },
-      { GI_TYPE_TAG_ARRAY, "GI_TYPE_TAG_ARRAY", "array" },
-      { GI_TYPE_TAG_INTERFACE, "GI_TYPE_TAG_INTERFACE", "interface" },
-      { GI_TYPE_TAG_GLIST, "GI_TYPE_TAG_GLIST", "glist" },
-      { GI_TYPE_TAG_GSLIST, "GI_TYPE_TAG_GSLIST", "gslist" },
-      { GI_TYPE_TAG_GHASH, "GI_TYPE_TAG_GHASH", "ghash" },
-      { GI_TYPE_TAG_ERROR, "GI_TYPE_TAG_ERROR", "error" },
-      { GI_TYPE_TAG_UNICHAR, "GI_TYPE_TAG_UNICHAR", "unichar" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("GITypeTag", values);
-  }
-  return etype;
-}
-
-GType
-g_i_array_type_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { GI_ARRAY_TYPE_C, "GI_ARRAY_TYPE_C", "c" },
-      { GI_ARRAY_TYPE_ARRAY, "GI_ARRAY_TYPE_ARRAY", "array" },
-      { GI_ARRAY_TYPE_PTR_ARRAY, "GI_ARRAY_TYPE_PTR_ARRAY", "ptr-array" },
-      { GI_ARRAY_TYPE_BYTE_ARRAY, "GI_ARRAY_TYPE_BYTE_ARRAY", "byte-array" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("GIArrayType", values);
-  }
-  return etype;
-}
-
-GType
-g_i_field_info_flags_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GFlagsValue values[] = {
-      { GI_FIELD_IS_READABLE, "GI_FIELD_IS_READABLE", "readable" },
-      { GI_FIELD_IS_WRITABLE, "GI_FIELD_IS_WRITABLE", "writable" },
-      { 0, NULL, NULL }
-    };
-    etype = g_flags_register_static ("GIFieldInfoFlags", values);
-  }
-  return etype;
-}
-
-GType
-g_iv_func_info_flags_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GFlagsValue values[] = {
-      { GI_VFUNC_MUST_CHAIN_UP, "GI_VFUNC_MUST_CHAIN_UP", "must-chain-up" },
-      { GI_VFUNC_MUST_OVERRIDE, "GI_VFUNC_MUST_OVERRIDE", "must-override" },
-      { GI_VFUNC_MUST_NOT_OVERRIDE, "GI_VFUNC_MUST_NOT_OVERRIDE", "must-not-override" },
-      { GI_VFUNC_THROWS, "GI_VFUNC_THROWS", "throws" },
-      { 0, NULL, NULL }
-    };
-    etype = g_flags_register_static ("GIVFuncInfoFlags", values);
-  }
-  return etype;
-}
-
-GType
-g_i_function_info_flags_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GFlagsValue values[] = {
-      { GI_FUNCTION_IS_METHOD, "GI_FUNCTION_IS_METHOD", "is-method" },
-      { GI_FUNCTION_IS_CONSTRUCTOR, "GI_FUNCTION_IS_CONSTRUCTOR", "is-constructor" },
-      { GI_FUNCTION_IS_GETTER, "GI_FUNCTION_IS_GETTER", "is-getter" },
-      { GI_FUNCTION_IS_SETTER, "GI_FUNCTION_IS_SETTER", "is-setter" },
-      { GI_FUNCTION_WRAPS_VFUNC, "GI_FUNCTION_WRAPS_VFUNC", "wraps-vfunc" },
-      { GI_FUNCTION_THROWS, "GI_FUNCTION_THROWS", "throws" },
-      { 0, NULL, NULL }
-    };
-    etype = g_flags_register_static ("GIFunctionInfoFlags", values);
-  }
-  return etype;
-}
-
-
-/* Generated data ends here */
-

data/ext/gobject-introspection/gobject-introspection-enum-types.h

@@ -1,42 +0,0 @@
-
-/* Generated by glib-mkenums.rb ($Id$) */ 
-
-#ifndef __GOBJECT_INTROSPECTION_ENUM_TYPES_H__
-#define __GOBJECT_INTROSPECTION_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "/usr/include/gobject-introspection-1.0/girepository.h" */
-GType g_i_repository_load_flags_get_type (void);
-#define G_TYPE_I_REPOSITORY_LOAD_FLAGS (g_i_repository_load_flags_get_type())
-GType g_i_repository_error_get_type (void);
-#define G_TYPE_I_REPOSITORY_ERROR (g_i_repository_error_get_type())
-
-/* enumerations from "/usr/include/gobject-introspection-1.0/gitypes.h" */
-GType g_i_info_type_get_type (void);
-#define G_TYPE_I_INFO_TYPE (g_i_info_type_get_type())
-GType g_i_transfer_get_type (void);
-#define G_TYPE_I_TRANSFER (g_i_transfer_get_type())
-GType g_i_direction_get_type (void);
-#define G_TYPE_I_DIRECTION (g_i_direction_get_type())
-GType g_i_scope_type_get_type (void);
-#define G_TYPE_I_SCOPE_TYPE (g_i_scope_type_get_type())
-GType g_i_type_tag_get_type (void);
-#define G_TYPE_I_TYPE_TAG (g_i_type_tag_get_type())
-GType g_i_array_type_get_type (void);
-#define G_TYPE_I_ARRAY_TYPE (g_i_array_type_get_type())
-GType g_i_field_info_flags_get_type (void);
-#define G_TYPE_I_FIELD_INFO_FLAGS (g_i_field_info_flags_get_type())
-GType g_iv_func_info_flags_get_type (void);
-#define G_TYPE_IV_FUNC_INFO_FLAGS (g_iv_func_info_flags_get_type())
-GType g_i_function_info_flags_get_type (void);
-#define G_TYPE_I_FUNCTION_INFO_FLAGS (g_i_function_info_flags_get_type())
-
-G_END_DECLS
-
-#endif /* __GOBJECT_INTROSPECTION_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-

data/ext/gobject-introspection/rbgiversion.h

@@ -1,24 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgiversion.h -
-
-  This file was generated by mkmf-gnome2.rb.
-
-************************************************/
-
-#ifndef __RBGI_VERSION_H__
-#define __RBGI_VERSION_H__
-
-#define GI_MAJOR_VERSION (1)
-#define GI_MINOR_VERSION (46)
-#define GI_MICRO_VERSION (0)
-
-#define GI_CHECK_VERSION(major,minor,micro)    \
-    (GI_MAJOR_VERSION > (major) || \
-     (GI_MAJOR_VERSION == (major) && GI_MINOR_VERSION > (minor)) || \
-     (GI_MAJOR_VERSION == (major) && GI_MINOR_VERSION == (minor) && \
-      GI_MICRO_VERSION >= (micro)))
-
-
-#endif /* __RBGI_VERSION_H__ */