gobject-introspection 3.2.1-x86-mingw32 → 3.2.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: face22394f08ebca5417da7390de660967d6a916
-  data.tar.gz: f3a2a68635c0d4855cca4ae1ff4f8385d9416f98
+SHA256:
+  metadata.gz: d194b2a3011b7d4c864a8884ed7d3eb7bf05d46c592cf9c62bb37fbe08bbead3
+  data.tar.gz: 648e946cc39dab34d9a287a48c7a26e0e7f17ca769fbeadb4e1bf79ab6b6f397
 SHA512:
-  metadata.gz: 92aa1e0b81aebf932e287a7fdf48a362cc086f1918338f40eea57114570ea5e601e7ed03dd1935d1d599c06e11ab2c72fb90b82586aa68cedf632f2f09d33780
-  data.tar.gz: ab8954297edd89c13d0c04becec8a8685bf2d03ff80561a8543e1819fc77e402d0e5e2c628916c27b3b28b4c5287f38db17ca1821c383a7bd488d2f49401bb7a
+  metadata.gz: 12786609db8a94078cf41ae96a8f9855c611b64e16dc0d94ae46c803b3460604a264c690fb8589639f66dcd95014d9d1428c647a616cd3d22ad639443a5a31ee
+  data.tar.gz: 006202341b9738d462e150857c24dd13ea3cf7fd624a92a36d52b485a0cf91f5311db49cc99c1e5f7743c75eafc4c149f1b03636131532fcc7cc77cdb39983bc

data/Rakefile

@@ -32,7 +32,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.54.1",
+      :version => "2.56.0",
       :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.54.1",
+      :version => "1.56.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -58,12 +58,12 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
           "support-external-g-ir-scanner.diff",
         ],
         :need_autoreconf => true,
+        :build_concurrently => false,
         :built_file => "bin/libgirepository-1.0-1.dll",
       },
       :native => {
         :build => true,
         :patches => [
-          # "cross-compilable-g-ir-scanner.diff",
         ],
         :built_file => "bin/g-ir-scanner",
       }
@@ -74,20 +74,23 @@ package_task.define
 
 namespace :native do
   namespace :"gobject-introspection" do
+    patched_paths = []
+
     g_ir_scanner_dir = package_task.native.absolute_binary_dir
     g_ir_scanner_dir += "lib/gobject-introspection/giscanner"
-    patched_path = g_ir_scanner_dir + "patched"
-    file patched_path.to_s do
+    g_ir_scanner_patched_path = g_ir_scanner_dir + "patched"
+    patched_paths << g_ir_scanner_patched_path
+    file g_ir_scanner_patched_path.to_s do
       Dir.chdir(g_ir_scanner_dir.to_s) do
         patch = "#{package_task.package.patches_dir}/cross-g-ir-scanner.diff"
         sh("patch -p2 < #{patch}")
         rm_f(Dir.glob("*.{pyc,pyo}"))
       end
-      touch(patched_path)
+      touch(g_ir_scanner_patched_path)
     end
 
     desc "Make g-ir-scanner workable for Windows on non Windows"
-    task :cross => patched_path
+    task :cross => patched_paths
   end
 
   namespace :builder do

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2017  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
@@ -21,6 +21,7 @@
 #include "rb-gi-private.h"
 
 static VALUE rb_cGLibValue = Qnil;
+static VALUE rb_cGLibBytes = Qnil;
 
 static const gchar *
 rb_gi_transfer_to_string(GITransfer transfer)
@@ -267,6 +268,14 @@ array_c_to_ruby_sized(gconstpointer *elements,
         }
         break;
     case GI_TYPE_TAG_FILENAME:
+        g_base_info_unref(element_type_info);
+        {
+            const gchar **filenames = (const gchar **)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, CSTRFILENAME2RVAL(filenames[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_ARRAY:
         g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
@@ -1264,10 +1273,10 @@ rb_gi_argument_to_ruby(GIArgument *argument,
         rb_argument = UINT2NUM(argument->v_uint32);
         break;
     case GI_TYPE_TAG_INT64:
-        rb_argument = LONG2NUM(argument->v_int64);
+        rb_argument = LL2NUM(argument->v_int64);
         break;
     case GI_TYPE_TAG_UINT64:
-        rb_argument = ULONG2NUM(argument->v_uint64);
+        rb_argument = ULL2NUM(argument->v_uint64);
         break;
     case GI_TYPE_TAG_FLOAT:
         rb_argument = DBL2NUM(argument->v_float);
@@ -2281,6 +2290,8 @@ rb_gi_return_argument_free_everything_array_c(GIArgument *argument,
         g_strfreev(argument->v_pointer);
         break;
     case GI_TYPE_TAG_FILENAME:
+        g_strfreev(argument->v_pointer);
+        break;
     case GI_TYPE_TAG_ARRAY:
     case GI_TYPE_TAG_INTERFACE:
     case GI_TYPE_TAG_GLIST:
@@ -2869,13 +2880,17 @@ rb_gi_value_argument_from_ruby_interface(GIArgument *argument,
             }
             argument->v_pointer = gvalue;
         } else if (gtype == G_TYPE_BYTES) {
-            VALUE rb_string;
-            GBytes *gbytes;
+            if (RVAL2CBOOL(rb_obj_is_kind_of(rb_argument, rb_cGLibBytes))) {
+                argument->v_pointer = RVAL2BOXED(rb_argument, G_TYPE_BYTES);
+            } else {
+                VALUE rb_string;
+                GBytes *gbytes;
 
-            rb_string = StringValue(rb_argument);
-            gbytes = g_bytes_new(RSTRING_PTR(rb_string),
-                                 RSTRING_LEN(rb_string));
-            argument->v_pointer = gbytes;
+                rb_string = StringValue(rb_argument);
+                gbytes = g_bytes_new(RSTRING_PTR(rb_string),
+                                     RSTRING_LEN(rb_string));
+                argument->v_pointer = gbytes;
+            }
         } else if (gtype == G_TYPE_CLOSURE) {
             GClosure *rclosure = NULL;
 
@@ -3136,10 +3151,10 @@ rb_gi_value_argument_from_ruby(GIArgument *argument, GITypeInfo *type_info,
         argument->v_uint32 = NUM2UINT(rb_argument);
         break;
     case GI_TYPE_TAG_INT64:
-        argument->v_int64 = NUM2LONG(rb_argument);
+        argument->v_int64 = NUM2LL(rb_argument);
         break;
     case GI_TYPE_TAG_UINT64:
-        argument->v_uint64 = NUM2ULONG(rb_argument);
+        argument->v_uint64 = NUM2ULL(rb_argument);
         break;
     case GI_TYPE_TAG_FLOAT:
         argument->v_float = NUM2DBL(rb_argument);
@@ -3406,14 +3421,46 @@ rb_gi_in_argument_transfer(GIArgument *argument, GITransfer transfer,
 }
 
 GIArgument *
-rb_gi_in_argument_from_ruby(GIArgument *argument, GIArgInfo *arg_info,
-                            VALUE rb_argument, VALUE self)
+rb_gi_in_argument_from_ruby(GICallableInfo *callable_info,
+                            GIArgument *argument,
+                            GIArgInfo *arg_info,
+                            guint nth_rb_argument,
+                            VALUE rb_argument,
+                            VALUE self)
 {
     GITypeInfo type_info;
 
-    if (g_arg_info_may_be_null(arg_info) && NIL_P(rb_argument)) {
-        memset(argument, 0, sizeof(GIArgument));
-        return argument;
+    if (NIL_P(rb_argument)) {
+        if (g_arg_info_may_be_null(arg_info)) {
+            memset(argument, 0, sizeof(GIArgument));
+            return argument;
+        } else {
+            const char *module_name;
+            GIBaseInfo *klass;
+            const char *suffix;
+
+            module_name = g_base_info_get_namespace(callable_info);
+            klass = g_base_info_get_container(callable_info);
+            if (nth_rb_argument == 1) {
+                suffix = "st";
+            } else if (nth_rb_argument == 2) {
+                suffix = "nd";
+            } else if (nth_rb_argument == 3) {
+                suffix = "rd";
+            } else {
+                suffix = "th";
+            }
+            rb_raise(rb_eArgError,
+                     "<%s%s%s%s%s>: the %u%s argument must not nil: <%s>",
+                     module_name,
+                     klass ? "::" : "",
+                     klass ? g_base_info_get_name(klass) : "",
+                     klass ? "#" : ".",
+                     g_base_info_get_name(callable_info),
+                     nth_rb_argument,
+                     suffix,
+                     g_base_info_get_name(arg_info));
+        }
     }
 
     g_arg_info_load_type(arg_info, &type_info);
@@ -4406,4 +4453,5 @@ void
 rb_gi_argument_init(void)
 {
     rb_cGLibValue = rb_const_get(mGLib, rb_intern("Value"));
+    rb_cGLibBytes = rb_const_get(mGLib, rb_intern("Bytes"));
 }

data/ext/gobject-introspection/rb-gi-conversions.h

@@ -46,9 +46,6 @@
 #define RVAL2GI_VALUE_ARGUMENT(argument, type_info, rb_argument, self)  \
     (rb_gi_value_argument_from_ruby((argument), (type_info),            \
                                     (rb_argument), (self)))
-#define RVAL2GI_IN_ARGUMENT(argument, arg_info, rb_argument, self)      \
-    (rb_gi_in_argument_from_ruby((argument), (arg_info),                \
-                                 (rb_argument), (self)))
 #define RVAL2GI_IN_ARRAY_ARGUMENT(array_argument, length_argument,      \
                                   array_arg_info, length_arg_info,      \
                                   rb_argument)                          \
@@ -127,8 +124,10 @@ GIArgument *rb_gi_value_argument_from_ruby    (GIArgument     *argument,
                                                GITypeInfo     *type_info,
                                                VALUE           rb_argument,
                                                VALUE           self);
-GIArgument *rb_gi_in_argument_from_ruby       (GIArgument     *argument,
+GIArgument *rb_gi_in_argument_from_ruby       (GICallableInfo *callable_info,
+                                               GIArgument     *argument,
                                                GIArgInfo      *arg_info,
+                                               guint           nth_rb_argument,
                                                VALUE           rb_argument,
                                                VALUE           self);
 GIArgument *rb_gi_in_array_argument_from_ruby (GIArgument     *array_argument,

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

@@ -1123,8 +1123,11 @@ in_callback_argument_from_ruby(RBGIArgMetadata *metadata, GArray *in_args)
 }
 
 static void
-in_argument_from_ruby(RBGIArgMetadata *metadata, VALUE rb_arguments,
-                      GArray *in_args, GPtrArray *args_metadata,
+in_argument_from_ruby(GICallableInfo *callable_info,
+                      RBGIArgMetadata *metadata,
+                      VALUE rb_arguments,
+                      GArray *in_args,
+                      GPtrArray *args_metadata,
                       VALUE self)
 {
     if (metadata->callback_p && !metadata->destroy_p) {
@@ -1172,10 +1175,12 @@ in_argument_from_ruby(RBGIArgMetadata *metadata, VALUE rb_arguments,
             rb_argument = RARRAY_PTR(rb_arguments)[metadata->rb_arg_index];
         }
         argument = &(g_array_index(in_args, GIArgument, metadata->in_arg_index));
-        RVAL2GI_IN_ARGUMENT(argument,
-                            &(metadata->arg_info),
-                            rb_argument,
-                            self);
+        rb_gi_in_argument_from_ruby(callable_info,
+                                    argument,
+                                    &(metadata->arg_info),
+                                    metadata->rb_arg_index,
+                                    rb_argument,
+                                    self);
     }
 }
 
@@ -1215,8 +1220,12 @@ arguments_from_ruby(GICallableInfo *info, VALUE self, VALUE rb_arguments,
 
         metadata = g_ptr_array_index(args_metadata, i);
         if (metadata->in_arg_index != -1) {
-            in_argument_from_ruby(metadata, rb_arguments,
-                                  in_args, args_metadata, self);
+            in_argument_from_ruby(info,
+                                  metadata,
+                                  rb_arguments,
+                                  in_args,
+                                  args_metadata,
+                                  self);
         } else {
             out_argument_from_ruby(metadata, out_args);
         }

data/lib/gobject-introspection/loader.rb

@@ -437,6 +437,12 @@ module GObjectIntrospection
       if name == "initialize"
         name += "_raw"
       end
+
+      n_in_args = function_info.n_in_args
+      if options[:n_in_args_offset]
+        n_in_args += options[:n_in_args_offset]
+      end
+
       return_type = function_info.return_type
       return_type_tag = return_type.tag
       if return_type_tag == TypeTag::VOID
@@ -445,11 +451,12 @@ module GObjectIntrospection
           return_type_tag = TypeTag::ARRAY
         end
       end
+
       case return_type_tag
       when TypeTag::BOOLEAN
         case name
         when "equal"
-          if function_info.n_in_args == 1
+          if n_in_args == 1
             "=="
           else
             name
@@ -457,7 +464,7 @@ module GObjectIntrospection
         when /\A(?:is|get_is|can_be)_/
           "#{$POSTMATCH}?"
         when /\Aget_/
-          if function_info.n_in_args.zero?
+          if n_in_args.zero?
             if function_info.n_out_args.zero?
               "#{$POSTMATCH}?"
             else
@@ -476,7 +483,7 @@ module GObjectIntrospection
       when TypeTag::GLIST, TypeTag::GSLIST, TypeTag::ARRAY
         case name
         when /\A(?:list|get)_/
-          if function_info.n_in_args.zero?
+          if n_in_args.zero?
             $POSTMATCH
           else
             name
@@ -487,7 +494,7 @@ module GObjectIntrospection
       else
         case name
         when /\Aget_/
-          if function_info.n_in_args.zero?
+          if n_in_args.zero?
             $POSTMATCH
           else
             name

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

@@ -116,7 +116,7 @@ class CCompiler(object):
         runtime_path_envvar = []
         runtime_paths = []
 
-        if self.check_is_msvc():
+        if os.name == 'nt':
             runtime_path_envvar = ['LIB', 'PATH']
         else:
             runtime_path_envvar = ['LD_LIBRARY_PATH']
@@ -288,9 +288,10 @@ class CCompiler(object):
             proc = subprocess.Popen([self.compiler_cmd, '-print-search-dirs'],
                                     stdout=subprocess.PIPE)
             o, e = proc.communicate()
+            libsearch = options.library_paths
             for line in o.decode('ascii').splitlines():
                 if line.startswith('libraries: '):
-                    libsearch = line[len('libraries: '):].split(os.pathsep)
+                    libsearch += line[len('libraries: '):].split(os.pathsep)
 
         shlibs = []
         not_resolved = []

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

@@ -227,7 +227,7 @@ class DumpCompiler(object):
         else:
             args.extend(['-o', output])
             if libtool:
-                if os.name == 'nt':
+                if utils.host_os() == 'nt':
                     args.append('-Wl,--export-all-symbols')
                 else:
                     args.append('-export-dynamic')

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

@@ -330,6 +330,7 @@ class MainTransformer(object):
         # might lose the ctype from the original node.
         if type_node is not None:
             result.ctype = type_node.ctype
+            result.complete_ctype = type_node.complete_ctype
         return result
 
     def _get_position(self, func, param):

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

@@ -562,7 +562,7 @@ def scanner_main(args):
     if options.warn_fatal and warning_count > 0:
         message.fatal("warnings configured as fatal")
         return 1
-    elif warning_count > 0 and options.warn_all is False:
+    elif warning_count > 0 and options.warn_all is False and options.quiet is False:
         print("g-ir-scanner: %s: warning: %d warnings suppressed "
               "(use --warn-all to see them)" %
               (transformer.namespace.name, warning_count, ))

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

@@ -29,7 +29,7 @@ import platform
 import re
 import subprocess
 
-from .utils import get_libtool_command, extract_libtool_shlib
+from .utils import get_libtool_command, extract_libtool_shlib, host_os
 from .ccompiler import CCompiler
 
 
@@ -94,7 +94,7 @@ def _resolve_non_libtool(options, binary, libraries):
         else:
             binary.args[0] = old_argdir
 
-    if os.name == 'nt':
+    if host_os() == 'nt':
         cc = CCompiler()
         shlibs = cc.resolve_windows_libs(libraries, options)
 
@@ -117,6 +117,11 @@ def _resolve_non_libtool(options, binary, libraries):
         shlibs = []
         for line in proc.stdout:
             line = line.decode('ascii')
+            # ldd on *BSD show the argument passed on the first line even if
+            # there is only one argument. We have to ignore it because it is
+            # possible for the name of the binary to match _ldd_library_pattern.
+            if line == binary.args[0] + ':\n':
+                continue
             for library, pattern in patterns.items():
                 m = pattern.search(line)
                 if m:

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

@@ -70,6 +70,7 @@ STORAGE_CLASS_EXTERN = 1 << 2
 STORAGE_CLASS_STATIC = 1 << 3
 STORAGE_CLASS_AUTO = 1 << 4
 STORAGE_CLASS_REGISTER = 1 << 5
+STORAGE_CLASS_THREAD_LOCAL = 1 << 6
 
 TYPE_QUALIFIER_NONE = 0
 TYPE_QUALIFIER_CONST = 1 << 1

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

@@ -184,6 +184,10 @@ def cflag_real_include_path(cflag):
     return "-I" + os.path.realpath(cflag[2:])
 
 
+def host_os():
+    return os.environ.get("GI_HOST_OS", os.name)
+
+
 def which(program):
     def is_exe(fpath):
         return os.path.isfile(fpath) and os.access(fpath, os.X_OK)