glib2 3.4.6 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc0f7e879583c78a16beaf5bd526103aff1c1cd8ed38795bcd78279cac04f60
-  data.tar.gz: e8a36e9d680bd8e7678b9c42fde7048e64d21e34231b9b6d852a295e7faa4663
+  metadata.gz: 135835c6036937932bed291b322562c6df79be9a0ef07610b9b01627fa9449d4
+  data.tar.gz: 0a07086fc4c87b2311fb608d2a27eedf3ceb1d9a24c0abc0caa061cfb7eacf1a
 SHA512:
-  metadata.gz: dd7c4bfa0c976dd0a99b5082c6758a7a0e3ffc899bf5c4449d2e874e71e0dbc1e9527c2a0260d91f8a9618d9cc62ebccf9605b8095ce9f5febdcb8fafd04ca6d
-  data.tar.gz: 5aa55268dd1afe305f289fbed40e758392d553fdf09260b3e072c7944574b462bbc1167a9720daa20786bbe742cbf68163b7c586512bd106dca4b7adf7b7198b
+  metadata.gz: 4498dc7d5f612602a79519285dc5e026f9f8abd0d74754317ad451399d780749066b38872317edd2ddb08f1b3ecca48ece9b9264ec61c52241d05c6f572c62d2
+  data.tar.gz: 3b240df85066aaea0ea91dd0f91b05bef11d74906c3c733549d4aa833fb56c88df88baffd9e20f08339e8371de4d7fbaf55a3b1e75a68a563c29dddf1a1035c5

data/ext/glib2/glib2.def

@@ -153,6 +153,7 @@ EXPORTS
 	rbgutil_glibid_r2g_func
 	rbgutil_sym_g2r_func
 	rbgutil_protect
+	rbgutil_on_callback_error
 	rbgutil_invoke_callback
 	rbgutil_start_callback_dispatch_thread
 	rbgutil_stop_callback_dispatch_thread

data/ext/glib2/rbglib-variant.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2015-2022  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
@@ -69,9 +69,10 @@ rbg_variant_to_ruby(GVariant *variant)
         VALUE value = rbg_variant_to_ruby(val);
         g_variant_unref(val);
         return value;
-    } else if (g_variant_type_is_array(type)) {
+    } else if (g_variant_type_is_array(type) ||
+               g_variant_type_is_tuple(type)) {
         gsize i, len = g_variant_n_children(variant);
-        VALUE ary = rb_ary_new2(len);
+        VALUE ary = rb_ary_new_capa(len);
         for (i = 0; i < len; i++) {
             GVariant *val = g_variant_get_child_value(variant, i);
             rb_ary_store(ary, i, rbg_variant_to_ruby(val));

data/ext/glib2/rbglib.h

@@ -32,8 +32,8 @@
 G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 3
-#define RBGLIB_MINOR_VERSION 4
-#define RBGLIB_MICRO_VERSION 6
+#define RBGLIB_MINOR_VERSION 5
+#define RBGLIB_MICRO_VERSION 0
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_error.c

@@ -23,8 +23,13 @@
 #include <ctype.h>
 
 static ID id_code;
+static ID id_CODE;
+static const char *name_CODE = "CODE";
 static ID id_domain;
-static ID id_code_classes;
+static ID id_DOMAIN;
+static const char *name_DOMAIN = "DOMAIN";
+static ID id_CODE_CLASSES;
+static const char *name_CODE_CLASSES = "CODE_CLASSES";
 static VALUE gerror_table;
 static VALUE generic_error;
 static VALUE error_info;
@@ -44,13 +49,9 @@ rbgerr_gerror2exception(GError *error)
     exception_klass = rb_hash_aref(gerror_table, UINT2NUM(error->domain));
     if (NIL_P(exception_klass)) {
         exception_klass = generic_error;
-    } else {
-        VALUE code_class = Qnil;
-        VALUE code_classes;
-        code_classes = rb_ivar_get(exception_klass, id_code_classes);
-        if (!NIL_P(code_classes)) {
-            code_class = rb_hash_aref(code_classes, INT2NUM(error->code));
-        }
+    } else if (rb_const_defined_at(exception_klass, id_CODE_CLASSES)) {
+        VALUE code_classes = rb_const_get(exception_klass, id_CODE_CLASSES);
+        VALUE code_class = rb_hash_aref(code_classes, INT2NUM(error->code));
         if (!NIL_P(code_class)) {
             exception_klass = code_class;
         }
@@ -109,14 +110,19 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
 {
     VALUE error_class;
     VALUE code_classes;
+    VALUE rb_domain = rb_str_new_cstr(g_quark_to_string(domain));
+    rbgutil_string_set_utf8_encoding(rb_domain);
+    rb_obj_freeze(rb_domain);
 
     error_class = rb_define_class_under(module, name, parent);
-    rb_include_module(error_class, error_info);
+    rb_define_const(error_class, name_CODE, Qnil);
+    rb_define_const(error_class, name_DOMAIN, rb_domain);
+    rb_prepend_module(error_class, error_info);
 
     rb_hash_aset(gerror_table, UINT2NUM(domain), error_class);
 
     code_classes = rb_hash_new();
-    rb_ivar_set(error_class, id_code_classes, code_classes);
+    rb_define_const(error_class, name_CODE_CLASSES, code_classes);
 
     if (gtype != G_TYPE_INVALID) {
         GEnumClass* gclass = g_type_class_ref(gtype);
@@ -142,15 +148,28 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
                                                code_class_name,
                                                error_class);
             g_free(code_class_name);
+            rb_define_const(code_class, name_CODE, INT2NUM(entry->value));
+            rb_define_const(code_class, name_DOMAIN, rb_domain);
             rb_hash_aset(code_classes, INT2NUM(entry->value), code_class);
         }
 
         g_type_class_unref(gclass);
     }
 
+    rb_obj_freeze(code_classes);
+
     return error_class;
 }
 
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE klass = rb_obj_class(self);
+    rb_ivar_set(self, id_code, rb_const_get(klass, id_CODE));
+    rb_ivar_set(self, id_domain, rb_const_get(klass, id_DOMAIN));
+    return rb_call_super(argc, argv);
+}
+
 static VALUE
 rbg_error_to_ruby(const GValue *from)
 {
@@ -163,16 +182,22 @@ void
 Init_glib_error(void)
 {
     id_code = rb_intern("@code");
+    id_CODE = rb_intern(name_CODE);
     id_domain = rb_intern("@domain");
-    id_code_classes = rb_intern("@code_classes");
+    id_DOMAIN = rb_intern(name_DOMAIN);
+    id_CODE_CLASSES = rb_intern(name_CODE_CLASSES);
     gerror_table = rb_hash_new();
     rb_global_variable(&gerror_table);
 
+#define RG_TARGET_NAMESPACE error_info
     error_info = rb_define_module_under(mGLib, "ErrorInfo");
     rb_define_attr(error_info, "code", TRUE, FALSE);
     rb_define_attr(error_info, "domain", TRUE, FALSE);
+    RG_DEF_METHOD(initialize, -1);
 
     generic_error = rb_define_class_under(mGLib, "Error", rb_eRuntimeError);
+    rb_define_const(generic_error, name_CODE, Qnil);
+    rb_define_const(generic_error, name_DOMAIN, Qnil);
     rb_include_module(generic_error, error_info);
 }
 

data/ext/glib2/rbglib_messages.c

@@ -70,11 +70,10 @@ rbglib_log_handler(const gchar *log_domain, GLogLevelFlags log_level, const gcha
         if (rb_during_gc()) {
             g_printerr("\tfrom %s:%d\n", rb_sourcefile(), rb_sourceline());
         } else {
-            VALUE backtrace;
-
-            backtrace = rb_funcall(rb_mKernel, rb_intern("caller"), 0);
-            rb_iterate(rb_each, backtrace,
-                       rbg_printerr, Qnil);
+            VALUE backtrace = rb_funcall(rb_mKernel, rb_intern("caller"), 0);
+            ID id_each;
+            CONST_ID(id_each, "each");
+            rb_block_call(backtrace, id_each, 0, NULL, rbg_printerr, Qnil);
         }
     } else {
         g_log_default_handler(log_domain, log_level, message, user_data);

data/ext/glib2/rbgobj_boxed.c

@@ -60,7 +60,7 @@ static const rb_data_type_t rg_glib_boxed_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static boxed_holder *

data/ext/glib2/rbgobj_closure.c

@@ -236,7 +236,7 @@ static const rb_data_type_t rbg_closure_holder_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static GClosure *

data/ext/glib2/rbgobj_enums.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2011-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2004-2006  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
@@ -114,7 +114,7 @@ static const rb_data_type_t rg_glib_enum_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static enum_holder *
@@ -191,6 +191,7 @@ rbgobj_init_enum_class(VALUE klass)
 
         rb_raw_enum_value = INT2NUM(entry->value);
         value = rb_funcall(klass, id_new, 1, rb_raw_enum_value);
+        rb_obj_freeze(value);
         rb_hash_aset(values, rb_raw_enum_value, value);
         const_nick_name = nick_to_const_name(entry->value_nick);
         if (const_nick_name) {

data/ext/glib2/rbgobj_flags.c

@@ -83,7 +83,7 @@ static const rb_data_type_t rg_glib_flags_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static flags_holder*

data/ext/glib2/rbgobj_object.c

@@ -108,7 +108,7 @@ static const rb_data_type_t rg_glib_object_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 void
@@ -364,7 +364,9 @@ static VALUE
 gobj_new_body(VALUE rb_arg)
 {
     struct param_setup_arg *arg = (struct param_setup_arg *)rb_arg;
-    rb_iterate(rb_each, (VALUE)arg->params_hash, _params_setup, (VALUE)arg);
+    ID id_each;
+    CONST_ID(id_each, "each");
+    rb_block_call(arg->params_hash, id_each, 0, NULL, _params_setup, (VALUE)arg);
     return (VALUE)g_object_newv(G_TYPE_FROM_CLASS(arg->gclass),
                                 arg->param_size, arg->params);
 }

data/ext/glib2/rbgobj_param.c

@@ -61,7 +61,7 @@ static const rb_data_type_t rg_glib_param_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static pspec_holder *

data/ext/glib2/rbgobj_signal.c

@@ -36,7 +36,7 @@ static const rb_data_type_t rg_glib_signal_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 VALUE
@@ -719,7 +719,7 @@ gobj_s_signal_handler_attach(VALUE klass,
 {
     const RGObjClassInfo *cinfo = rbgobj_lookup_class(klass);
     guint signal_id = rbgobj_signal_get_raw(rb_signal)->signal_id;
-    VALUE handler_name = RVAL2CSTR(rb_handler_name);
+    const gchar *handler_name = RVAL2CSTR(rb_handler_name);
     VALUE proc = rb_block_proc();
     GClosure* rclosure = g_rclosure_new(proc,
                                         Qnil,

data/ext/glib2/rbgobj_type.c

@@ -974,6 +974,7 @@ static inline void
 _def_fundamental_type(VALUE ary, GType gtype, const char* name)
 {
     VALUE c = rbgobj_gtype_new(gtype);
+    rb_obj_freeze(c);
     rb_define_const(RG_TARGET_NAMESPACE, name, c);
     rb_ary_push(ary, c);
 }

data/ext/glib2/rbgobj_value.c

@@ -129,6 +129,7 @@ rbgobj_gvalue_to_rvalue(const GValue* value)
                     continue;
                 return func(value);
             }
+            return BOXED2RVAL(g_value_get_boxed(value), type);
         }
       case G_TYPE_VARIANT:
         {
@@ -293,7 +294,24 @@ rbgobj_rvalue_to_gvalue(VALUE val, GValue* result)
         }
       case G_TYPE_OBJECT:
       case G_TYPE_INTERFACE:
-        g_value_set_object(result, NIL_P(val) ? NULL : RVAL2GOBJ(val));
+        if (NIL_P(val)) {
+            g_value_set_object(result, NULL);
+        } else {
+            VALUE value_class = GTYPE2CLASS(type);
+            ID id_try_convert;
+            CONST_ID(id_try_convert, "try_convert");
+            if (!NIL_P(value_class) &&
+                rb_respond_to(value_class, id_try_convert)) {
+                VALUE converted_value = rb_funcall(value_class,
+                                                   id_try_convert,
+                                                   1,
+                                                   val);
+                if (!NIL_P(converted_value)) {
+                    val = converted_value;
+                }
+            }
+            g_value_set_object(result, RVAL2GOBJ(val));
+        }
         return;
       case G_TYPE_PARAM:
         g_value_set_param(result, NIL_P(val) ? NULL : RVAL2GOBJ(val));
@@ -330,6 +348,7 @@ rbgobj_rvalue_to_gvalue(VALUE val, GValue* result)
                 func(val, result);
             }
         }
+        break;
     }
 }
 

data/ext/glib2/rbgprivate.h

@@ -43,6 +43,10 @@
 #  define G_VALUE_INIT { 0, { { 0 } } }
 #endif
 
+#ifndef RUBY_TYPED_FROZEN_SHAREABLE
+#  define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 G_BEGIN_DECLS
 
 typedef struct {

data/ext/glib2/rbgutil.h

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002,2003 Masao Mutoh
+ *  Copyright (C) 2011-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2002,2003  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -92,6 +92,7 @@ extern void rbg_define_singleton_method(VALUE obj, const char *name, VALUE (*fun
 extern VALUE rbgutil_def_setters(VALUE klass);
 extern void rbgutil_set_properties(VALUE self, VALUE hash);
 extern VALUE rbgutil_protect(VALUE (*proc) (VALUE), VALUE data);
+extern void rbgutil_on_callback_error(VALUE error);
 extern VALUE rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg);
 extern void rbgutil_start_callback_dispatch_thread(void);
 extern void rbgutil_stop_callback_dispatch_thread(void);

data/ext/glib2/rbgutil_callback.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2007-2022  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
@@ -49,10 +49,16 @@ rbgutil_protect(VALUE (*func) (VALUE), VALUE data)
     VALUE ret = rb_protect(func, data, &state);
     VALUE e = rb_errinfo();
     if (state && !NIL_P(e))
-        rb_funcall(mGLib, id_exit_application, 2, e, INT2NUM(EXIT_FAILURE));
+        rbgutil_on_callback_error(e);
     return ret;
 }
 
+void
+rbgutil_on_callback_error(VALUE error)
+{
+    rb_funcall(mGLib, id_exit_application, 2, error, INT2NUM(EXIT_FAILURE));
+}
+
 /**********************************************************************/
 
 #ifdef HAVE_NATIVETHREAD

data/lib/glib2.rb

@@ -134,8 +134,30 @@ module GLib
   class Instantiatable
     class << self
       def method_added(name)
-        super
+        result = super
+        check_new_method(name)
+        result
+      end
+
+      def include(*modules, &block)
+        result = super
+        modules.each do |mod|
+          next if mod.is_a?(Interface)
+          mod.public_instance_methods(false).each do |name|
+            check_new_method(name)
+          end
+          mod.protected_instance_methods(false).each do |name|
+            check_new_method(name)
+          end
+          mod.private_instance_methods(false).each do |name|
+            check_new_method(name)
+          end
+        end
+        result
+      end
 
+      private
+      def check_new_method(name)
         case name.to_s
         when /\A#{Regexp.escape(SIGNAL_HANDLER_PREFIX)}/o
           signal_name = $POSTMATCH

data/lib/mkmf-gnome.rb

@@ -72,9 +72,10 @@ def try_compiler_option(opt, &block)
 end
 
 try_compiler_option '-Wall'
-try_compiler_option '-Waggregate-return'
+# NOTE: This generates warnings for functions defined in ruby.h.
+# try_compiler_option '-Waggregate-return'
 try_compiler_option '-Wcast-align'
-# NOTE: Generates way too many false positives.
+# NOTE: This generates way too many false positives.
 # try_compiler_option '-Wconversion'
 try_compiler_option '-Wextra'
 try_compiler_option '-Wformat=2'

data/test/glib-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  Ruby-GNOME Project Team
+# Copyright (C) 2015-2022  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
@@ -33,7 +33,11 @@ module GLibTestUtils
   end
 
   def only_not_windows
-    omit("Not for for Windows platform") if GLib.os_win32?
+    omit("Not for Windows platform") if GLib.os_win32?
+  end
+
+  def only_not_scl
+    omit("Not for SCL environment") if ENV["SCL"]
   end
 
   def normalize_path(path)

data/test/test-error.rb

@@ -0,0 +1,41 @@
+# Copyright (C) 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestError < Test::Unit::TestCase
+  sub_test_case("error class") do
+    def test_code
+      assert_equal(nil,
+                   GLib::BookmarkFileError.new.code)
+    end
+
+    def test_domain
+      assert_equal("g-bookmark-file-error-quark",
+                   GLib::BookmarkFileError.new.domain)
+    end
+  end
+
+  sub_test_case("error code class") do
+    def test_code
+      assert_equal(GLib::BookmarkFileError::READ,
+                   GLib::BookmarkFileError::Read.new.code)
+    end
+
+    def test_domain
+      assert_equal("g-bookmark-file-error-quark",
+                   GLib::BookmarkFileError::Read.new.domain)
+    end
+  end
+end

data/test/test-spawn.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  Ruby-GNOME Project Team
+# Copyright (C) 2015-2022  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
@@ -35,6 +35,8 @@ class TestGLibSpawn < Test::Unit::TestCase
 
   def test_async_clear_environment
     only_not_windows
+    only_not_scl
+
     if RbConfig.respond_to?(:ruby)
       ruby = RbConfig.ruby
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.5.0
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -177,6 +177,7 @@ files:
 - test/test-bytes.rb
 - test/test-date-time.rb
 - test/test-enum.rb
+- test/test-error.rb
 - test/test-file-utils.rb
 - test/test-flags.rb
 - test/test-glib2.rb
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.