RubyGems - gobject-introspection - Versions diffs - 4.2.4 â†’ 4.2.5 - Mend

gobject-introspection 4.2.4 â†’ 4.2.5

Files changed (6) hide show

checksums.yaml +4 -4
data/Rakefile +2 -2
data/ext/gobject-introspection/rb-gi-arguments-out.c +16 -8
data/ext/gobject-introspection/rb-gi-arguments.c +118 -33
data/ext/gobject-introspection/rb-gi-private-arguments.h +5 -0
metadata +5 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e5222f7c984b0eebce13f19a04226893d9e768fb80a3f473b9ced83fd9adb4
-  data.tar.gz: cf3e563695a4afe3df79bdaa9e25f20b24bec24a28a4612c7d4e309883f6e258
+  metadata.gz: 35271806b1d69784715f1d2b32cec3e9c522156e322b28e67d88153f4b114373
+  data.tar.gz: 7ff88d676bf1cf71281ec663526986ff97f1555b3613be9845cc35006333ffc9
 SHA512:
-  metadata.gz: f38460961ce556431c16dcdc24853d67b794de52d2b32c49064ee7b67354ddd9371d15fc10abc4bff84967539a9d47cc8fc484e3eaddee761fd0f2f15a41ca91
-  data.tar.gz: e71bd1165a0fdbd2a7532efc4db7e2b8048f37ae0023f3989acf913fb16535517a534dac21d4d6f121a416a40f0df1f6d435c4e25b9fae0fd5c40fb8a65a4c58
+  metadata.gz: 86f9733cabb3d7dca03feef1db7888f3e4cce4b80f514e5b8e0c83fec98187564a841a0313309e31168a96f59f58612447493a046293b7b66066f139f2c3f80e
+  data.tar.gz: 64a2cf9fedcf690184727f4da0d2cfbc76162febeec36bebf92d4179741b324710546a3716f9fb43d94efb3d18f43cb17a4a82017782099f571c201fd90984b3

data/Rakefile CHANGED Viewed

@@ -17,10 +17,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 $LOAD_PATH.unshift("./../glib2/lib")
-require "gnome2/rake/package-task"
+require "gnome/rake/package-task"
 package_name = File.basename(__dir__)
 spec = Gem::Specification.load("#{package_name}.gemspec")
-GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
+GNOME::Rake::PackageTask.define(spec, __dir__) do |package|
 end

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

@@ -103,14 +103,20 @@ rb_gi_arguments_out_free_array_c_interface(RBGIArguments *args,
         g_free(*target);
         break;
       case GI_TRANSFER_EVERYTHING:
-      default:
-        rb_raise(rb_eNotImpError,
-                 "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));
+        if (metadata->element_type.interface_gtype == G_TYPE_NONE) {
+            /* This assumes that this memory was allocated by
+             * g_new0(MyStruct, n). */
+            g_free(*target);
+        } else {
+            rb_raise(rb_eNotImpError,
+                     "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));
+        }
+        break;
     }
     xfree(target);
 }
@@ -337,6 +343,7 @@ rb_gi_arguments_out_init_arg_array_c(RBGIArguments *args,
         break;
       case GI_TYPE_TAG_UTF8:
         argument->v_pointer = ALLOC(gchar **);
+        *((gchar **)(argument->v_pointer)) = NULL;
         metadata->free_func = rb_gi_arguments_out_free_array_c_string;
         break;
       case GI_TYPE_TAG_FILENAME:
@@ -349,6 +356,7 @@ rb_gi_arguments_out_init_arg_array_c(RBGIArguments *args,
         break;
       case GI_TYPE_TAG_INTERFACE:
         argument->v_pointer = ALLOC(gpointer *);
+        *((gpointer *)(argument->v_pointer)) = NULL;
         metadata->free_func = rb_gi_arguments_out_free_array_c_interface;
         break;
       case GI_TYPE_TAG_GLIST:

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2024  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
@@ -683,10 +683,10 @@ rb_gi_arguments_convert_arg_array_like_ensure(VALUE user_data)
     return Qnil;
 }
-static gint64
-rb_gi_arguments_convert_arg_array_body_extract_length(GIArgument *arg,
-                                                      RBGIArgMetadata *metadata,
-                                                      gboolean is_pointer)
+gint64
+rb_gi_argument_out_array_get_length(GIArgument *arg,
+                                    RBGIArgMetadata *metadata,
+                                    gboolean is_pointer)
 {
     switch (metadata->type.tag) {
       case GI_TYPE_TAG_VOID:
@@ -697,49 +697,49 @@ rb_gi_arguments_convert_arg_array_body_extract_length(GIArgument *arg,
         return -1;
       case GI_TYPE_TAG_INT8:
         if (is_pointer) {
-            return *((gint8 *)arg->v_pointer);
+            return *((gint8 *)(arg->v_pointer));
         } else {
             return arg->v_int8;
         }
       case GI_TYPE_TAG_UINT8:
         if (is_pointer) {
-            return *((guint8 *)arg->v_pointer);
+            return *((guint8 *)(arg->v_pointer));
         } else {
             return arg->v_uint8;
         }
       case GI_TYPE_TAG_INT16:
         if (is_pointer) {
-            return *((gint16 *)arg->v_pointer);
+            return *((gint16 *)(arg->v_pointer));
         } else {
             return arg->v_int16;
         }
       case GI_TYPE_TAG_UINT16:
         if (is_pointer) {
-            return *((guint16 *)arg->v_pointer);
+            return *((guint16 *)(arg->v_pointer));
         } else {
             return arg->v_uint16;
         }
       case GI_TYPE_TAG_INT32:
         if (is_pointer) {
-            return *((gint32 *)arg->v_pointer);
+            return *((gint32 *)(arg->v_pointer));
         } else {
             return arg->v_int32;
         }
       case GI_TYPE_TAG_UINT32:
         if (is_pointer) {
-            return *((guint32 *)arg->v_pointer);
+            return *((guint32 *)(arg->v_pointer));
         } else {
             return arg->v_uint32;
         }
       case GI_TYPE_TAG_INT64:
         if (is_pointer) {
-            return *((gint64 *)arg->v_pointer);
+            return *((gint64 *)(arg->v_pointer));
         } else {
             return arg->v_int64;
         }
       case GI_TYPE_TAG_UINT64:
         if (is_pointer) {
-            return *((guint64 *)arg->v_pointer);
+            return *((guint64 *)(arg->v_pointer));
         } else {
             return arg->v_uint64;
         }
@@ -789,10 +789,9 @@ rb_gi_arguments_convert_arg_array_body_get_length(ArrayLikeToRubyData *data)
                                             data->arg_metadata->struct_info,
                                             data->arg_metadata->struct_memory);
         int64_t length =
-            rb_gi_arguments_convert_arg_array_body_extract_length(
-                &value,
-                &length_metadata,
-                FALSE);
+            rb_gi_argument_out_array_get_length(&value,
+                                                &length_metadata,
+                                                FALSE);
         /* TODO: Use ensure */
         rb_gi_arg_metadata_clear(&length_metadata);
         g_base_info_unref(field_info);
@@ -816,20 +815,16 @@ rb_gi_arguments_convert_arg_array_body_get_length(ArrayLikeToRubyData *data)
         gboolean is_pointer =
             !(length_metadata->array_metadata &&
               length_metadata->array_metadata->output_buffer_p);
-        return
-            rb_gi_arguments_convert_arg_array_body_extract_length(
-                length_arg,
-                length_metadata,
-                is_pointer);
+        return rb_gi_argument_out_array_get_length(length_arg,
+                                                   length_metadata,
+                                                   is_pointer);
     } else {
         length_arg = &g_array_index(data->args->in_args,
                                     GIArgument,
                                     length_metadata->in_arg_index);
-        return
-            rb_gi_arguments_convert_arg_array_body_extract_length(
-                length_arg,
-                length_metadata,
-                FALSE);
+        return rb_gi_argument_out_array_get_length(length_arg,
+                                                   length_metadata,
+                                                   FALSE);
     }
 }
@@ -1105,26 +1100,116 @@ static VALUE
 rb_gi_arguments_convert_arg_array_body_c_fixed_size(ArrayLikeToRubyData *data,
                                                     gint fixed_size)
 {
-    const char *array_c_type = "[fixed-size]";
+    const char *array_c_type = "fixed-size";
     switch (data->element_type_tag) {
       case GI_TYPE_TAG_VOID:
       case GI_TYPE_TAG_BOOLEAN:
+        rb_raise(rb_eNotImpError,
+                 "TODO: GIArgument(array)[c][%s][%s] -> Ruby",
+                 array_c_type,
+                 g_type_tag_to_string(data->element_type_tag));
+        return Qnil;
       case GI_TYPE_TAG_INT8:
+        {
+            gint8 *array = (gint8 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_INT2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_UINT8:
+        {
+            guint8 *array = (guint8 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_UINT2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_INT16:
+        {
+            gint16 *array = (gint16 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_INT2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_UINT16:
+        {
+            guint16 *array = (guint16 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_UINT2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_INT32:
+        {
+            gint32 *array = (gint32 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_INT2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_UINT32:
+        {
+            guint32 *array = (guint32 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_UINT2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_INT64:
+        {
+            gint64 *array = (gint64 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_LL2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_UINT64:
+        {
+            guint64 *array = (guint64 *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, RB_ULL2NUM(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_FLOAT:
+        {
+            float *array = (float *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, rb_float_new(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_DOUBLE:
+        {
+            double *array = (double *)(data->arg->v_pointer);
+            VALUE rb_array = rb_ary_new_capa(fixed_size);
+            gint i;
+            for (i = 0; i < fixed_size; i++) {
+                rb_ary_push(rb_array, rb_float_new(array[i]));
+            }
+            return rb_array;
+        }
       case GI_TYPE_TAG_GTYPE:
-        rb_raise(rb_eNotImpError,
-                 "TODO: GIArgument(array)[c][%s][%s] -> Ruby",
-                 array_c_type,
-                 g_type_tag_to_string(data->element_type_tag));
-        return Qnil;
       case GI_TYPE_TAG_UTF8:
       case GI_TYPE_TAG_FILENAME:
       case GI_TYPE_TAG_ARRAY:

data/ext/gobject-introspection/rb-gi-private-arguments.h CHANGED Viewed

@@ -101,6 +101,11 @@ rb_gi_arg_metadata_clear(RBGIArgMetadata *metadata);
 G_GNUC_INTERNAL void
 rb_gi_arg_metadata_free(RBGIArgMetadata *metadata);
+G_GNUC_INTERNAL gint64
+rb_gi_argument_out_array_get_length(GIArgument *arg,
+                                    RBGIArgMetadata *metadata,
+                                    gboolean is_pointer);
 G_GNUC_INTERNAL void
 rb_gi_arguments_init(RBGIArguments *args,
                      GICallableInfo *info,

metadata CHANGED Viewed

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
+original_platform: ''
 authors:
 - The Ruby-GNOME Project Team
 bindir: bin
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -15,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries