gobject-introspection 3.1.8-x86-mingw32 → 3.1.9-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9896b3867d16bb99da893e5d90cb8ef833f4741a
-  data.tar.gz: 8c787c8dcf18e72268191399f94b27d2b9c8d426
+  metadata.gz: 21ab29d8b63370fc1cd673ae3eec08605fdfd1ae
+  data.tar.gz: 1a8f6ad50ed08ae63b3112d45a60c8734932d230
 SHA512:
-  metadata.gz: f902afb3ab7951cd08ca2bf429c5f6c631e9481542712058c36894fe3e0219f0a96a5ebab0d61c80049c6e5fecb96f8948c6b09fc7b47edb58927fac8e1a06c3
-  data.tar.gz: d78e007a91ebe10229fd4d8c9234fd0e34ee0f8ba3fdb1d8e861f6353c88440e79be236475b38b9205239db86ab3d3d7982d4fb64ae4f248934ba45b8dc3ce9b
+  metadata.gz: 0023689c186a8093a55e57caf657e0f45a6ee384ff675fb0dcf2fe443e9fdcf66dcba03599ba51c650ff25946cb2e6639d3eb7014daefbd5e05c9d9099a6c8ac
+  data.tar.gz: 017a1b87942c3d6200d40a82735d756e7118a31e7a78947883c1c0e14d960db6833bdcc72f44f0c6957cb9fec74e858c2d0f8767d6e3dc86c515e8ca7a6132f0

data/Rakefile

@@ -32,7 +32,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.52.3",
+      :version => "2.54.1",
       :compression_method => "xz",
       :windows => {
         :build => false,
@@ -47,7 +47,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gobject-introspection",
       :download_site => :gnome,
       :label => "gobject-introspection",
-      :version => "1.52.1",
+      :version => "1.54.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

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

@@ -61,13 +61,14 @@ array_c_to_ruby_sized_interface(gconstpointer *elements,
             g_base_info_unref(interface_info);
             g_base_info_unref(element_type_info);
         } else {
-            interface_name = g_info_type_to_string(interface_type);
+            /* TODO: Should we check caller_allocates? */
+            gsize struct_size = g_struct_info_get_size(interface_info);
+            for (i = 0; i < n_elements; i++) {
+                gpointer element = ((gchar *)elements) + struct_size * i;
+                rb_ary_push(rb_array, BOXED2RVAL(element, gtype));
+            }
             g_base_info_unref(interface_info);
             g_base_info_unref(element_type_info);
-            rb_raise(rb_eNotImpError,
-                     "TODO: GIArgument(array)[c][interface(%s)](%s) -> Ruby",
-                     interface_name,
-                     g_type_name(gtype));
         }
         break;
     case GI_INFO_TYPE_BOXED:
@@ -131,12 +132,20 @@ array_c_to_ruby_sized(gconstpointer *elements,
 
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
-    case GI_TYPE_TAG_BOOLEAN:
         g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
                  "TODO: GIArgument(array)[c][%s] -> Ruby",
                  g_type_tag_to_string(element_type_tag));
         break;
+    case GI_TYPE_TAG_BOOLEAN:
+        g_base_info_unref(element_type_info);
+        {
+            const gboolean *booleans = (const gboolean *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, CBOOL2RVAL(booleans[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_INT8:
         g_base_info_unref(element_type_info);
         {
@@ -1146,8 +1155,15 @@ rb_gi_argument_to_ruby_ghash(GIArgument *argument, GITypeInfo *type_info)
             g_base_info_unref(value_type_info);
             rb_argument =
                 rb_gi_argument_to_ruby_ghash_utf8_utf8(argument->v_pointer);
-            break;
+        } else {
+            g_base_info_unref(key_type_info);
+            g_base_info_unref(value_type_info);
+            rb_raise(rb_eNotImpError,
+                     "TODO: GIArgument(GHash)[%s][%s] -> Ruby",
+                     g_type_tag_to_string(key_type_tag),
+                     g_type_tag_to_string(value_type_tag));
         }
+        break;
       case GI_TYPE_TAG_FILENAME:
       case GI_TYPE_TAG_ARRAY:
       case GI_TYPE_TAG_INTERFACE:
@@ -3330,6 +3346,22 @@ set_in_array_length_argument(GIArgument *argument,
     }
 }
 
+static void
+set_in_array_boolean_arguments_from_ruby(GIArgument *array_argument,
+                                         VALUE rb_boolean_array)
+{
+    gboolean *booleans;
+    gint i, n_args;
+
+    n_args = RARRAY_LEN(rb_boolean_array);
+    booleans = ALLOC_N(gboolean, n_args);
+    for (i = 0; i < n_args; i++) {
+        booleans[i] = RVAL2CBOOL(RARRAY_PTR(rb_boolean_array)[i]);
+    }
+
+    array_argument->v_pointer = booleans;
+}
+
 static void
 set_in_array_int8_arguments_from_ruby(GIArgument *array_argument,
                                       VALUE rb_number_array)
@@ -3644,11 +3676,16 @@ in_array_c_argument_from_ruby(GIArgument *array_argument,
     element_type_tag = g_type_info_get_tag(element_type_info);
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
-    case GI_TYPE_TAG_BOOLEAN:
         rb_raise(rb_eNotImpError,
                  "TODO: Ruby -> GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
         break;
+    case GI_TYPE_TAG_BOOLEAN:
+        rb_argument = rbg_to_array(rb_argument);
+        set_in_array_boolean_arguments_from_ruby(array_argument, rb_argument);
+        set_in_array_length_argument(length_argument, length_type_info,
+                                     RARRAY_LEN(rb_argument));
+        break;
     case GI_TYPE_TAG_INT8:
         if (RB_TYPE_P(rb_argument, RUBY_T_STRING)) {
             array_argument->v_pointer = RSTRING_PTR(rb_argument);
@@ -3953,11 +3990,13 @@ rb_gi_value_argument_free_array_c(VALUE rb_argument,
     element_type_tag = g_type_info_get_tag(element_type_info);
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
-    case GI_TYPE_TAG_BOOLEAN:
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
         break;
+    case GI_TYPE_TAG_BOOLEAN:
+        xfree(argument->v_pointer);
+        break;
     case GI_TYPE_TAG_INT8:
     case GI_TYPE_TAG_UINT8:
         if (RB_TYPE_P(rb_argument, RUBY_T_STRING)) {
@@ -3985,6 +4024,7 @@ rb_gi_value_argument_free_array_c(VALUE rb_argument,
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
+        break;
     case GI_TYPE_TAG_INTERFACE:
         xfree(argument->v_pointer);
         break;

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2017  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
@@ -23,6 +23,7 @@
 #define RG_TARGET_NAMESPACE rb_cGILoader
 
 static const gchar *boxed_class_converters_name = "@@boxed_class_converters";
+static const gchar *object_class_converters_name = "@@object_class_converters";
 
 static VALUE
 rg_s_define_class(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
@@ -194,6 +195,76 @@ rg_s_register_boxed_class_converter(VALUE klass, VALUE rb_gtype)
     return Qnil;
 }
 
+typedef struct {
+    GType type;
+    VALUE rb_converters;
+    VALUE rb_converter;
+} ObjectInstance2RObjData;
+
+static void
+object_class_converter_free(gpointer user_data)
+{
+    ObjectInstance2RObjData *data = user_data;
+    rb_ary_delete(data->rb_converters, data->rb_converter);
+    g_free(data);
+}
+
+static VALUE
+object_instance2robj(gpointer instance, gpointer user_data)
+{
+    ObjectInstance2RObjData *data = user_data;
+    VALUE existing_rb_instance;
+    VALUE default_rb_instance;
+    VALUE klass;
+    ID id_call;
+    VALUE converted_rb_instance;
+    ID id_unref;
+
+    existing_rb_instance = rbgobj_get_ruby_object_from_gobject(instance, FALSE);
+    if (!NIL_P(existing_rb_instance))
+        return existing_rb_instance;
+
+    default_rb_instance = rbgobj_get_ruby_object_from_gobject(instance, TRUE);
+    CONST_ID(id_call, "call");
+    klass = rb_funcall(data->rb_converter, id_call, 1, default_rb_instance);
+    if (klass == rb_class_of(default_rb_instance))
+        return default_rb_instance;
+
+    converted_rb_instance = rbgobj_object_alloc_func(klass);
+    g_object_ref(instance);
+    CONST_ID(id_unref, "unref");
+    rb_funcall(default_rb_instance, id_unref, 0);
+    rbgobj_gobject_initialize(converted_rb_instance, instance);
+    return converted_rb_instance;
+}
+
+static VALUE
+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.klass = Qnil;
+    table.instance2robj = object_instance2robj;
+
+    data = g_new(ObjectInstance2RObjData, 1);
+    data->type = table.type;
+    data->rb_converter = rb_block_proc();
+    object_class_converters = rb_cv_get(klass, object_class_converters_name);
+    rb_ary_push(object_class_converters, data->rb_converter);
+    table.user_data = data;
+    table.notify = object_class_converter_free;
+
+    rbgobj_convert_define(&table);
+
+    return Qnil;
+}
+
 static VALUE
 rg_s_register_constant_rename_map(G_GNUC_UNUSED VALUE klass,
                                   VALUE rb_original,
@@ -260,12 +331,14 @@ rb_gi_loader_init(VALUE rb_mGI)
     RG_TARGET_NAMESPACE = rb_define_class_under(rb_mGI, "Loader", rb_cObject);
 
     rb_cv_set(RG_TARGET_NAMESPACE, boxed_class_converters_name, rb_ary_new());
+    rb_cv_set(RG_TARGET_NAMESPACE, object_class_converters_name, rb_ary_new());
 
     RG_DEF_SMETHOD(define_class, -1);
     RG_DEF_SMETHOD(define_interface, 3);
     RG_DEF_SMETHOD(define_struct, -1);
     RG_DEF_SMETHOD(define_error, -1);
     RG_DEF_SMETHOD(register_boxed_class_converter, 1);
+    RG_DEF_SMETHOD(register_object_class_converter, 1);
     RG_DEF_SMETHOD(register_constant_rename_map, 2);
     RG_DEF_SMETHOD(start_callback_dispatch_thread, 0);
     RG_DEF_SMETHOD(reference_gobject, -1);

data/test/run-test.rb

@@ -27,7 +27,7 @@ modules = [
   [gobject_introspection_base, "gobject-introspection"]
 ]
 modules.each do |target, module_name|
-  if system("which make > /dev/null")
+  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))

data/vendor/local/lib/gobject-introspection/giscanner/cachestore.py

@@ -76,7 +76,7 @@ class CacheStore(object):
         try:
             with open(version, 'r') as version_file:
                 cache_hash = version_file.read()
-        except IOError as e:
+        except (IOError, OSError) as e:
             # File does not exist
             if e.errno == errno.ENOENT:
                 cache_hash = 0
@@ -96,7 +96,7 @@ class CacheStore(object):
             # On Unix, this would just be os.rename() but Windows
             # doesn't allow that.
             shutil.move(tmp_filename, version)
-        except IOError as e:
+        except (IOError, OSError) as e:
             # Permission denied
             if e.errno == errno.EACCES:
                 return
@@ -121,15 +121,9 @@ class CacheStore(object):
     def _remove_filename(self, filename):
         try:
             os.unlink(filename)
-        except IOError as e:
-            # Permission denied
-            if e.errno == errno.EACCES:
-                return
-            else:
-                raise
-        except OSError as e:
-            # File does not exist
-            if e.errno == errno.ENOENT:
+        except (IOError, OSError) as e:
+            # Ignore "permission denied", "file does not exist"
+            if e.errno in (errno.EACCES, errno.ENOENT):
                 return
             else:
                 raise
@@ -152,7 +146,7 @@ class CacheStore(object):
         try:
             with os.fdopen(tmp_fd, 'wb') as tmp_file:
                 pickle.dump(data, tmp_file)
-        except IOError as e:
+        except (IOError, OSError) as e:
             # No space left on device
             if e.errno == errno.ENOSPC:
                 self._remove_filename(tmp_filename)
@@ -162,7 +156,7 @@ class CacheStore(object):
 
         try:
             shutil.move(tmp_filename, store_filename)
-        except IOError as e:
+        except (IOError, OSError) as e:
             # Permission denied
             if e.errno == errno.EACCES:
                 self._remove_filename(tmp_filename)
@@ -175,7 +169,7 @@ class CacheStore(object):
             return
         try:
             fd = open(store_filename, 'rb')
-        except IOError as e:
+        except (IOError, OSError) as e:
             if e.errno == errno.ENOENT:
                 return None
             else:

data/vendor/local/lib/gobject-introspection/giscanner/ccompiler.py

@@ -113,22 +113,18 @@ class CCompiler(object):
         # An "internal" link is where the library to be introspected
         # is being built in the current directory.
 
-        if not libtool:
-            # non-libtool case: prepare distutils use
-            if self.check_is_msvc():
-                for library in libraries + extra_libraries:
-                    # MSVC Builds don't use libtool, so no .la libraries,
-                    # so just add the library directly.
-                    self.compiler.add_library(library)
-                    for libpath in libpaths:
-                        self.compiler.add_library_dir(libpath)
-            else:
-                # Search the current directory first
-                # (This flag is not supported nor needed for Visual C++)
-                self.compiler.add_library_dir('.')
-                if os.name != 'nt':
-                    self.compiler.add_runtime_library_dir('.')
+        runtime_path_envvar = []
+        runtime_paths = []
 
+        if self.check_is_msvc():
+            runtime_path_envvar = ['LIB', 'PATH']
+        else:
+            runtime_path_envvar = ['LD_LIBRARY_PATH']
+            # Search the current directory first
+            # (This flag is not supported nor needed for Visual C++)
+            args.append('-L.')
+
+            if not libtool:
                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
                 args.append('-Wl,-rpath,.')
 
@@ -137,37 +133,51 @@ class CCompiler(object):
                 if sys.platform != 'darwin':
                     args.append('-Wl,--no-as-needed')
 
-            for library in libraries + extra_libraries:
-                self.compiler.add_library(library)
-            if not self.check_is_msvc():
-                for library_path in libpaths:
-                    args.append('-L' + library_path)
-                    if os.path.isabs(library_path):
-                        args.append('-Wl,-rpath,' + library_path)
-
-        else:
-            # libtool case: assemble linker command arguments, like we did before
-            args.append('-L.')
-            for library in libraries:
+        for library in libraries + extra_libraries:
+            if self.check_is_msvc():
+                # Note that Visual Studio builds do not use libtool!
+                if library != 'm':
+                    args.append(library + '.lib')
+            else:
                 if library.endswith(".la"):  # explicitly specified libtool library
                     args.append(library)
                 else:
                     args.append('-l' + library)
 
-            for library_path in libpaths:
+        for library_path in libpaths:
+            # The dumper program needs to look for dynamic libraries
+            # in the library paths first
+            if self.check_is_msvc():
+                library_path = library_path.replace('/', '\\')
+                args.append('-libpath:' + library_path)
+            else:
                 args.append('-L' + library_path)
                 if os.path.isabs(library_path):
-                    args.append('-rpath')
-                    args.append(library_path)
+                    if libtool:
+                        args.append('-rpath')
+                        args.append(library_path)
+                    else:
+                        args.append('-Wl,-rpath,' + library_path)
+
+            runtime_paths.append(library_path)
 
-    def get_external_link_flags(self, args, libtool, libraries):
+        for envvar in runtime_path_envvar:
+            if envvar in os.environ:
+                os.environ[envvar] = \
+                    os.pathsep.join(runtime_paths + [os.environ[envvar]])
+            else:
+                os.environ[envvar] = os.pathsep.join(runtime_paths)
+
+    def get_external_link_flags(self, args, libraries):
         # An "external" link is where the library to be introspected
         # is installed on the system; this case is used for the scanning
         # of GLib in gobject-introspection itself.
 
         for library in libraries:
-            if not libtool:
-                self.compiler.add_library(library)
+            if self.check_is_msvc():
+                # Visual Studio: don't attempt to link to m.lib
+                if library != 'm':
+                    args.append(library + ".lib")
             else:
                 if library.endswith(".la"):  # explicitly specified libtool library
                     args.append(library)
@@ -238,24 +248,7 @@ class CCompiler(object):
                                      macros=macros,
                                      include_dirs=includes,
                                      extra_postargs=extra_postargs,
-                                     output_dir=str(source_str[tmpdir_idx + 1:
-                                                    source_str.rfind(os.sep)]))
-
-    def link(self, output, objects, lib_args):
-        # Note: This is used for non-libtool builds only!
-        extra_preargs = []
-        extra_postargs = []
-        library_dirs = []
-        libraries = []
-
-        for arg in lib_args:
-            extra_postargs.append(arg)
-
-        self.compiler.link(target_desc=self.compiler.EXECUTABLE,
-                           objects=objects,
-                           output_filename=output,
-                           extra_preargs=extra_preargs,
-                           extra_postargs=extra_postargs)
+                                     output_dir=os.path.abspath(os.sep))
 
     def resolve_windows_libs(self, libraries, options):
         args = []
@@ -279,6 +272,10 @@ class CCompiler(object):
             args.append('dumpbin.exe')
             args.append('-symbols')
 
+            # Work around the attempt to resolve m.lib on Python 2.x
+            if sys.version_info.major < 3:
+                libraries[:] = [lib for lib in libraries if lib != 'm']
+
         # When we are not using Visual C++ (i.e. we are using GCC)...
         else:
             libtool = utils.get_libtool_command(options)