glib2 3.4.0 → 3.4.5

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/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
@@ -198,7 +198,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-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,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,16 @@ 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 for Windows platform") if GLib.os_win32?
+  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,5 +1,6 @@
 #!/usr/bin/env ruby
-# 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
@@ -15,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
 
+require "fileutils"
 
-base = File.expand_path(File.join(File.dirname(__FILE__)))
-top = File.expand_path(File.join(base, ".."))
+def run_test(test_dir, dependencies)
+  $VERBOSE = true
 
-$LOAD_PATH.unshift(top)
-require 'test/glib-test-init'
+  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)
 
-if File.exist?("#{top}/Makefile") and system("which make > /dev/null")
-  system("cd #{top.dump} && make > /dev/null") or exit(1)
-end
+  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(top, "ext", "glib2"))
-$LOAD_PATH.unshift(File.join(top, "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(base)
-require '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, base)
+  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/test-file-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019  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
@@ -21,38 +21,7 @@ class TestGLibFileUtils < Test::Unit::TestCase
     string.gsub("\u{00A0}", " ")
   end
 
-  sub_test_case "#format_size_for_display" do
-    def setup
-      only_glib_version(2, 16, 0)
-    end
-
-    def test_kb
-      assert_equal("1.0 KB", GLib.format_size_for_display(1024))
-    end
-
-    def test_10kb
-      assert_equal("10.0 KB", GLib.format_size_for_display(1024 * 10))
-    end
-
-    def test_mb
-      assert_equal("1.0 MB", GLib.format_size_for_display(1024 * 1024))
-    end
-
-    def test_gb
-      assert_equal("1.0 GB", GLib.format_size_for_display(1024 * 1024 * 1024))
-    end
-
-    def test_over_guint32_value
-      guint32_max = 2 ** 32 - 1
-      assert_equal("4.0 GB", GLib.format_size_for_display(guint32_max + 1))
-    end
-  end
-
   sub_test_case "#format_size" do
-    def setup
-      only_glib_version(2, 30, 0)
-    end
-
     def test_kb
       assert_equal("1.0 kB",
                    normalize_space(GLib.format_size(1000)))

data/test/test-iochannel.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  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
@@ -26,11 +26,13 @@ class TestGIOChannel < Test::Unit::TestCase
 
     @file = Tempfile.new("glib2-content")
     @file.open
+    @file.binmode
     @file.print(@content)
     @file.close
 
     @sjis_file = Tempfile.new("glib2-sjis-content")
     @sjis_file.open
+    @sjis_file.binmode
     @sjis_file.print(@sjis_content)
     @sjis_file.close
   end
@@ -66,10 +68,6 @@ class TestGIOChannel < Test::Unit::TestCase
       end
     end
 
-    assert_raises(GLib::IOChannelError) do
-      io.close
-    end
-
     assert_raises(GLib::FileError) do
       GLib::IOChannel.new("foo")
     end

data/test/test-key-file.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
@@ -20,8 +20,6 @@ class TestGLibKeyFile < Test::Unit::TestCase
   include GLibTestUtils
 
   def test_load_from_dirs
-    only_glib_version(2, 14, 0)
-
     key_file = GLib::KeyFile.new
     assert_raise(GLib::KeyFileError::NotFound) do
       key_file.load_from_dirs("non-existent")
@@ -34,7 +32,8 @@ class TestGLibKeyFile < Test::Unit::TestCase
       key_file.load_from_dirs("non-existent", search_dirs)
     end
     if GLib.check_version?(2, 31, 2)
-      assert_equal(temp.path, key_file.load_from_dirs(base_name, search_dirs))
+      loaded_path = key_file.load_from_dirs(base_name, search_dirs)
+      assert_equal(temp.path, normalize_path(loaded_path))
     elsif GLib.check_version?(2, 30, 0)
       assert_raise(GLib::KeyFileError::NotFound) do
         key_file.load_from_dirs(base_name, search_dirs)
@@ -49,11 +48,11 @@ class TestGLibKeyFile < Test::Unit::TestCase
 key = value
 EOK
     temp.close
-    assert_equal(temp.path, key_file.load_from_dirs(base_name, search_dirs))
+    loaded_path = key_file.load_from_dirs(base_name, search_dirs)
+    assert_equal(temp.path, normalize_path(loaded_path))
   end
 
   def test_desktop_constants
-    only_glib_version(2, 14, 0)
     assert_equal("Desktop Entry", GLib::KeyFile::DESKTOP_GROUP)
     assert_equal("URL", GLib::KeyFile::DESKTOP_KEY_URL)
   end

data/test/test-match-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  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
@@ -17,10 +17,6 @@
 class TestMatchInfo < Test::Unit::TestCase
   include GLibTestUtils
 
-  setup do
-    only_glib_version(2, 30, 0)
-  end
-
   def test_string
     regex = GLib::Regex.new("[A-Z]+")
     match_info = regex.match("abc def")

data/test/test-regex.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  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
@@ -17,10 +17,6 @@
 class TestRegex < Test::Unit::TestCase
   include GLibTestUtils
 
-  setup do
-    only_glib_version(2, 30, 0)
-  end
-
   def test_enum_match_flags
     assert_const_defined(GLib, :RegexMatchFlags)
     assert_kind_of(GLib::RegexMatchFlags, GLib::RegexMatchFlags::PARTIAL_HARD)

data/test/test-source.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-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
@@ -32,15 +32,6 @@ class TestGLibSource < Test::Unit::TestCase
   end
 
   def test_destroy
-    # only_glib_version(2, 35, 4)
-    # GMainContext may be freed before GSource by Ruby's GC.
-    # If GMainContext is freed before GSource, GLib 2.35.3 or earlier is
-    # crashed.
-    #
-    # See also:
-    #   * https://bugzilla.gnome.org/show_bug.cgi?id=661767
-    #   * https://git.gnome.org/browse/glib/commit/?id=26056558be4656ee6e891a4fae5d4198de7519cf
-
     context = GLib::MainContext.new
     source = GLib::Idle.source_new
     id = source.attach(context)
@@ -52,8 +43,6 @@ class TestGLibSource < Test::Unit::TestCase
   end
 
   def test_name
-    only_glib_version(2, 26, 0)
-
     source = GLib::Idle.source_new
 
     source_name = "glib source"
@@ -62,8 +51,6 @@ class TestGLibSource < Test::Unit::TestCase
   end
 
   def test_ready_time
-    only_glib_version(2, 36, 0)
-
     source = GLib::Idle.source_new
 
     ready_time = 5