glib2 3.4.3 → 3.5.1

data/ext/glib2/rbgobject.h

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
- *  Copyright (C) 2003,2006  Ruby-GNOME Project Team
+ *  Copyright (C) 2003-2021  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -206,6 +205,7 @@ extern void rbgobj_register_mark_func(GType gtype, RGMarkFunc mark);
 extern void rbgobj_register_free_func(GType gtype, RGFreeFunc free);
 extern VALUE rbgobj_cType;
 extern VALUE rbgobj_gtype_new(GType gtype);
+/* Deprecated. Use rbgobj_gtype_from_ruby() instead. */
 extern GType rbgobj_gtype_get(VALUE obj);
 
 /* rbgobj_signal.c */
@@ -292,31 +292,6 @@ extern VALUE rbgobj_enum_alloc_func(VALUE klass);
 extern VALUE rbgobj_flags_alloc_func(VALUE klass);
 
 
-/* rbglib_mainloop.c */
-#if !GLIB_CHECK_VERSION(2,30,0)
-  #define G_TYPE_MAIN_LOOP (g_main_loop_get_type())
-  extern GType g_main_loop_get_type(void);
-#endif
-
-/* rbglib_maincontext.c */
-#if !GLIB_CHECK_VERSION(2,30,0)
-  #define G_TYPE_MAIN_CONTEXT (g_main_context_get_type())
-  #define G_TYPE_SOURCE (g_source_get_type())
-  extern GType g_main_context_get_type(void);
-  extern GType g_source_get_type(void);
-#endif
-
-#if !GLIB_CHECK_VERSION(2, 36, 0)
-  #define G_TYPE_POLLFD (g_pollfd_get_type())
-  extern GType g_pollfd_get_type(void);
-#endif
-
-/* rbglib_keyfile.c */
-#if !GLIB_CHECK_VERSION(2,31,2)
-  #define G_TYPE_KEY_FILE (g_key_file_get_type())
-  extern GType g_key_file_get_type(void);
-#endif
-
 /* rbgobj_convert.c */
 typedef struct {
     GType type;

data/ext/glib2/rbgprivate.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2007-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
@@ -21,12 +21,13 @@
 #pragma once
 
 /*
- * CentOS 6: GLib 2.28
  * CentOS 7: GLib 2.50
+ * CentOS 8: GLib 2.56
  * Ubuntu 16.04: GLib 2.48
- * Ubuntu 18.04: GLib 2.54
+ * Ubuntu 18.04: GLib 2.56
+ * Ubuntu 20.04: GLib 2.64
  */
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_28
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48
 
 #include "rbgobject.h"
 
@@ -42,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 {
@@ -58,7 +63,7 @@ typedef struct {
     GType type;
 } boxed_holder;
 
-G_GNUC_INTERNAL extern GStaticPrivate rg_polling_key;
+G_GNUC_INTERNAL extern GPrivate rg_polling_key;
 G_GNUC_INTERNAL extern rb_encoding *rbg_filename_encoding;
 
 extern VALUE rbgobj_cEnum;
@@ -181,7 +186,6 @@ G_GNUC_INTERNAL void Init_gobject_gvalue(void);
 G_GNUC_INTERNAL void Init_gobject_gvaluetypes(void);
 G_GNUC_INTERNAL void Init_gobject_gboxed(void);
 G_GNUC_INTERNAL void Init_gobject_gstrv(void);
-G_GNUC_INTERNAL void Init_gobject_value_array(void);
 G_GNUC_INTERNAL void Init_gobject_genumflags(void);
 G_GNUC_INTERNAL void Init_gobject_genums(void);
 G_GNUC_INTERNAL void Init_gobject_gflags(void);

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-2019  Ruby-GNOME2 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
@@ -61,11 +67,11 @@ typedef struct _CallbackRequest {
     VALUE (*function)(VALUE);
     VALUE argument;
     VALUE result;
-    GMutex *done_mutex;
-    GCond *done_cond;
+    GMutex done_mutex;
+    GCond done_cond;
 } CallbackRequest;
 
-static GMutex *callback_dispatch_thread_mutex = NULL;
+static GMutex callback_dispatch_thread_mutex;
 static GAsyncQueue *callback_request_queue = NULL;
 static ID id_callback_dispatch_thread;
 static gint callback_pipe_fds[2] = {-1, -1};
@@ -84,10 +90,10 @@ static VALUE
 process_request(void *user_data)
 {
     CallbackRequest *request = user_data;
-    g_mutex_lock(request->done_mutex);
+    g_mutex_lock(&(request->done_mutex));
     request->result = rbgutil_protect(exec_callback, (VALUE)request);
-    g_cond_signal(request->done_cond);
-    g_mutex_unlock(request->done_mutex);
+    g_cond_signal(&(request->done_cond));
+    g_mutex_unlock(&(request->done_mutex));
 
     return Qnil;
 }
@@ -146,30 +152,30 @@ invoke_callback_in_ruby_thread(VALUE (*func)(VALUE), VALUE arg)
 {
     CallbackRequest request;
 
-    g_mutex_lock(callback_dispatch_thread_mutex);
+    g_mutex_lock(&callback_dispatch_thread_mutex);
     if (callback_pipe_fds[0] == -1) {
         g_error("Please call rbgutil_start_callback_dispatch_thread() "
                 "to dispatch a callback from non-ruby thread before "
                 "callbacks are requested from non-ruby thread.");
-        g_mutex_unlock(callback_dispatch_thread_mutex);
+        g_mutex_unlock(&callback_dispatch_thread_mutex);
         return Qnil;
     }
 
     request.function = func;
     request.argument = arg;
     request.result = Qnil;
-    request.done_mutex = g_mutex_new();
-    request.done_cond = g_cond_new();
+    g_mutex_init(&(request.done_mutex));
+    g_cond_init(&(request.done_cond));
 
-    g_mutex_lock(request.done_mutex);
+    g_mutex_lock(&(request.done_mutex));
     queue_callback_request(&request);
-    g_mutex_unlock(callback_dispatch_thread_mutex);
+    g_mutex_unlock(&callback_dispatch_thread_mutex);
 
-    g_cond_wait(request.done_cond, request.done_mutex);
-    g_mutex_unlock(request.done_mutex);
+    g_cond_wait(&(request.done_cond), &(request.done_mutex));
+    g_mutex_unlock(&(request.done_mutex));
 
-    g_cond_free(request.done_cond);
-    g_mutex_free(request.done_mutex);
+    g_cond_clear(&(request.done_cond));
+    g_mutex_clear(&(request.done_mutex));
 
 
     return request.result;
@@ -195,7 +201,7 @@ rbgutil_invoke_callback(VALUE (*func)(VALUE), VALUE arg)
 {
 #ifdef HAVE_NATIVETHREAD
     if (ruby_native_thread_p()) {
-        if (!GPOINTER_TO_INT(g_static_private_get(&rg_polling_key))) {
+        if (!GPOINTER_TO_INT(g_private_get(&rg_polling_key))) {
             return rbgutil_protect(func, arg);
         }
 #  ifdef HAVE_RB_THREAD_CALL_WITH_GVL
@@ -221,7 +227,7 @@ rbgutil_start_callback_dispatch_thread(void)
 #ifdef HAVE_NATIVETHREAD
     VALUE callback_dispatch_thread;
 
-    g_mutex_lock(callback_dispatch_thread_mutex);
+    g_mutex_lock(&callback_dispatch_thread_mutex);
     callback_dispatch_thread = rb_ivar_get(mGLib, id_callback_dispatch_thread);
     if (NIL_P(callback_dispatch_thread)) {
         if (pipe(callback_pipe_fds) == -1)
@@ -231,7 +237,7 @@ rbgutil_start_callback_dispatch_thread(void)
         rb_ivar_set(mGLib, id_callback_dispatch_thread,
                     callback_dispatch_thread);
     }
-    g_mutex_unlock(callback_dispatch_thread_mutex);
+    g_mutex_unlock(&callback_dispatch_thread_mutex);
 #endif
 }
 
@@ -241,13 +247,13 @@ rbgutil_stop_callback_dispatch_thread(void)
 #ifdef HAVE_NATIVETHREAD
     VALUE callback_dispatch_thread;
 
-    g_mutex_lock(callback_dispatch_thread_mutex);
+    g_mutex_lock(&callback_dispatch_thread_mutex);
     callback_dispatch_thread = rb_ivar_get(mGLib, id_callback_dispatch_thread);
     if (!NIL_P(callback_dispatch_thread)) {
         queue_callback_request(NULL);
         rb_ivar_set(mGLib, id_callback_dispatch_thread, Qnil);
     }
-    g_mutex_unlock(callback_dispatch_thread_mutex);
+    g_mutex_unlock(&callback_dispatch_thread_mutex);
 #endif
 }
 
@@ -260,13 +266,10 @@ Init_gutil_callback(void)
                               rb_eRuntimeError);
 
 #ifdef HAVE_NATIVETHREAD
-    if (!g_thread_supported())
-        g_thread_init(NULL);
-
     id_callback_dispatch_thread = rb_intern("callback_dispatch_thread");
     rb_ivar_set(mGLib, id_callback_dispatch_thread, Qnil);
 
     callback_request_queue = g_async_queue_new();
-    callback_dispatch_thread_mutex = g_mutex_new();
+    g_mutex_init(&callback_dispatch_thread_mutex);
 #endif
 }

data/lib/glib2/deprecated.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019  Ruby-GNOME Project Team
+# Copyright (C) 2018-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
@@ -26,4 +26,25 @@ module GLib
     define_deprecated_const(:PRIVATE, :STATIC_NAME)
     define_deprecated_method(:private?, :static_name?)
   end
+
+  class SpawnError
+    extend GLib::Deprecatable
+    define_deprecated_const(:E2BIG, :TOO_BIG)
+  end
+
+  module Unicode
+    extend GLib::Deprecatable
+    define_deprecated_singleton_method(
+      :canonical_decomposition,
+      warn: "Use 'GLib::UniChar.decompose(char)'.") do |_, char|
+      UniChar.decompose(char)
+    end
+  end
+
+  extend GLib::Deprecatable
+  define_deprecated_singleton_method(
+    :format_size_for_display,
+    warn: "Use 'GLib.format_size(size, flags: :iec_units)'.") do |_, size|
+    format_size(size, flags: :iec_units)
+  end
 end

data/lib/glib2.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2019  Ruby-GNOME Project Team
+# Copyright (C) 2005-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
@@ -117,17 +117,68 @@ end
 require "glib2.so"
 
 module GLib
+  SIGNAL_HANDLER_PREFIX = "signal_do_"
+  VIRTUAL_FUNCTION_IMPLEMENTATION_PREFIX = "virtual_do_"
+
   module MetaInterface
     class << self
-      def signal_callback(klass, id)
+      def signal_callback(klass, name)
         lambda do |instance, *args|
-          klass.instance_method(id).bind(instance).call(*args)
+          method_name = "#{SIGNAL_HANDLER_PREFIX}#{name}"
+          klass.instance_method(method_name).bind(instance).call(*args)
         end
       end
     end
   end
 
   class Instantiatable
+    class << self
+      def method_added(name)
+        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
+          begin
+            signal_ = signal(signal_name)
+          rescue NoSignalError
+            return
+          end
+          return unless signal_.class != self
+          signal_handler_attach(signal_, name.to_s) do |instance, *args|
+            instance.__send__(name, *args)
+          end
+        when /\A#{Regexp.escape(VIRTUAL_FUNCTION_IMPLEMENTATION_PREFIX)}/o
+          ancestors.each do |klass|
+            next unless klass.respond_to?(:implement_virtual_function)
+            return if klass.implement_virtual_function(self, name)
+          end
+        end
+      end
+    end
+
     private
     def create_signal_handler(signal_name, callback)
       callback

data/lib/mkmf-gnome.rb

@@ -37,11 +37,11 @@ end
 def enable_debug_build_flag(flags)
   if gcc?
     expanded_flags = RbConfig.expand(flags.dup)
-    debug_option_pattern = /(^|\s)-g\d?(\s|$)/
+    debug_option_pattern = /(^|\s)-g(?:gdb)?\d?(\s|$)/
     if debug_option_pattern =~ expanded_flags
-      expanded_flags.gsub(debug_option_pattern, '\\1-g3\\2')
+      expanded_flags.gsub(debug_option_pattern, '\\1-ggdb3\\2')
     else
-      flags + " -g3"
+      flags + " -ggdb3"
     end
   else
     flags
@@ -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'
@@ -198,7 +199,7 @@ def add_depend_package_path(target_name, target_source_dir, target_build_dir)
     $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
   end
 
-  library_base_name = target_name.gsub(/-/, "_")
+  library_base_name = File.basename(target_source_dir).gsub(/-/, "_")
   case RUBY_PLATFORM
   when /cygwin|mingw/
     $libs << " " << File.join(target_build_dir, "#{library_base_name}.so")

data/test/glib-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 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
@@ -14,6 +14,12 @@
 # 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 "pathname"
+
+require "test-unit"
+
+require "glib2"
+
 module GLibTestUtils
   private
   def only_glib_version(major, minor, micro)
@@ -22,7 +28,20 @@ module GLibTestUtils
     end
   end
 
-  def only_win32
-    omit("Only for Win32 platform") unless GLib.os_win32?
+  def only_windows
+    omit("Only for Windows platform") unless GLib.os_win32?
+  end
+
+  def only_not_windows
+    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)
+    return path unless File::ALT_SEPARATOR
+    path.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
   end
 end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2015-2020  Ruby-GNOME Project Team
+# Copyright (C) 2015-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,23 +16,57 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-test_dir = File.expand_path(File.join(__dir__))
-source_dir = File.expand_path(File.join(test_dir, ".."))
-build_dir = File.expand_path(".")
+require "fileutils"
 
-$LOAD_PATH.unshift(source_dir)
-require_relative "glib-test-init"
+def run_test(test_dir, dependencies)
+  $VERBOSE = true
 
-if File.exist?("#{build_dir}/Makefile") and system("which make > /dev/null")
-  system("cd #{build_dir.dump} && make > /dev/null") or exit(1)
-end
+  ruby_gnome_build_dir = ENV["RUBY_GNOME_BUILD_DIR"]
+  ruby_gnome_build_dir ||= File.expand_path("..")
+  ruby_gnome_source_dir = File.expand_path("../..", test_dir)
+
+  dependencies.each do |dependency|
+    source_dir = File.join(ruby_gnome_source_dir, dependency)
+    build_dir = File.join(ruby_gnome_build_dir, dependency)
+    makefile = File.join(build_dir, "Makefile")
+    if File.exist?(makefile)
+      system("make", "-C", build_dir, "-j", out: IO::NULL) or exit(false)
+      $LOAD_PATH.unshift(File.join(build_dir, "ext", dependency))
+    end
+    $LOAD_PATH.unshift(File.join(source_dir, "lib"))
+  end
 
-$LOAD_PATH.unshift(File.join(build_dir, "ext", "glib2"))
-$LOAD_PATH.unshift(File.join(source_dir, "lib"))
+  source_fixture_dir = File.join(test_dir, "fixture")
+  if File.exist?(source_fixture_dir)
+    target_name = File.basename(File.expand_path("..", test_dir))
+    build_fixture_dir = File.join(ruby_gnome_build_dir,
+                                  target_name,
+                                  "test",
+                                  "fixture")
+    unless source_fixture_dir == build_fixture_dir
+      FileUtils.rm_rf(build_fixture_dir)
+      FileUtils.mkdir_p(File.dirname(build_fixture_dir))
+      FileUtils.cp_r(source_fixture_dir, build_fixture_dir)
+    end
+    Dir.chdir(build_fixture_dir) do
+      if File.exist?("Rakefile")
+        system("rake") or exit(false)
+      end
+    end
+  end
 
-$LOAD_PATH.unshift(test_dir)
-require_relative "glib-test-utils"
+  require_relative "glib-test-utils"
 
-require "glib2"
+  if block_given?
+    context = {
+      build_fixture_dir: build_fixture_dir,
+    }
+    yield(context)
+  end
 
-exit(Test::Unit::AutoRunner.run(true, test_dir))
+  exit(Test::Unit::AutoRunner.run(true, test_dir))
+end
+
+if $PROGRAM_NAME == __FILE__
+  run_test(__dir__, ["glib2"])
+end

data/test/test-binding.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-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
@@ -55,10 +55,6 @@ class TestGLibBinding < Test::Unit::TestCase
       end
     end
 
-    setup do
-      only_glib_version(2, 26, 0)
-    end
-
     setup do
       @source = DataObjectDefault.new
       @target = DataObjectDefault.new
@@ -86,7 +82,6 @@ class TestGLibBinding < Test::Unit::TestCase
     end
 
     test "#unbind" do
-      only_glib_version(2, 38, 0)
       assert_equal(0, @target.target)
       @source.source = 10
       assert_equal(10, @target.target)
@@ -132,10 +127,6 @@ class TestGLibBinding < Test::Unit::TestCase
       end
     end
 
-    setup do
-      only_glib_version(2, 26, 0)
-    end
-
     setup do
       @source = DataObjectBidir.new
       @target = DataObjectBidir.new
@@ -174,7 +165,6 @@ class TestGLibBinding < Test::Unit::TestCase
     end
 
     test "#unbind" do
-      only_glib_version(2, 38, 0)
       assert_equal("nan", @target.target)
       @source.source = 10
       assert_equal("10", @target.target)

data/test/test-bytes.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019  Ruby-GNOME Project Team
+# Copyright (C) 2017-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
@@ -17,10 +17,6 @@
 class TestGLibBytes < Test::Unit::TestCase
   include GLibTestUtils
 
-  setup do
-    only_glib_version(2, 32, 0)
-  end
-
   sub_test_case ".try_convert" do
     def test_nil
       assert_nil(GLib::Bytes.try_convert(nil))

data/test/test-date-time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-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
@@ -76,7 +76,6 @@ class TestDateTime < Test::Unit::TestCase
     end
 
     test "timezone: local time zone" do
-      only_glib_version(2, 34, 0)
       time = Time.now
       tz = GLib::TimeZone.local
       datetime = GLib::DateTime.new(:timezone => tz,
@@ -95,7 +94,6 @@ class TestDateTime < Test::Unit::TestCase
     end
 
     test "timezone: UTC time zone" do
-      only_glib_version(2, 34, 0)
       time = Time.now.utc
       tz = GLib::TimeZone.utc
       datetime = GLib::DateTime.new(:timezone => tz,

data/test/{glib-test-init.rb → test-error.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2020  Ruby-GNOME Project Team
+# 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
@@ -14,6 +14,28 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-$VERBOSE = true
+class TestError < Test::Unit::TestCase
+  sub_test_case("error class") do
+    def test_code
+      assert_equal(nil,
+                   GLib::BookmarkFileError.new.code)
+    end
 
-require "test-unit"
+    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