glib2 3.1.1-x64-mingw32 → 3.1.2-x64-mingw32

data/ext/glib2/rbgprivate.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2007-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
@@ -152,6 +152,7 @@ G_GNUC_INTERNAL void Init_glib_regex(void);
 G_GNUC_INTERNAL void Init_glib_matchinfo(void);
 G_GNUC_INTERNAL void Init_glib_date_time(void);
 G_GNUC_INTERNAL void Init_glib_time_zone(void);
+G_GNUC_INTERNAL void Init_glib_bytes(void);
 
 G_GNUC_INTERNAL void Init_gobject_convert(void);
 G_GNUC_INTERNAL void Init_gobject_gtype(void);

data/lib/gnome2/rake/package-task.rb

@@ -123,14 +123,16 @@ module GNOME2
           s.author                = @author
           s.email                 = @email
           s.homepage              = @homepage
-          s.licenses              = ["LGPLv2.1+"]
+          s.licenses              = ["LGPL-2.1+"]
           s.version               = version
-          extensions              = FileList["ext/#{@name}/extconf.rb"]
+          extensions              = FileList["ext/#{@name}/extconf.rb",
+                                             "dependency-check/Rakefile"]
           extensions.existing!
           s.extensions            = extensions
           s.require_paths         = ["lib"]
           files                   = FileList["ChangeLog", "README",
                                              "Rakefile", "extconf.rb",
+                                             "dependency-check/Rakefile",
                                              "lib/**/*.rb",
                                              "ext/**/depend",
                                              "ext/**/*.{c,h,def,rb}",

data/lib/mkmf-gnome2.rb

@@ -13,6 +13,7 @@ require 'English'
 require 'mkmf'
 require 'pkg-config'
 require 'glib-mkenums'
+require "native-package-installer"
 
 $CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
 
@@ -106,7 +107,7 @@ include_path = nil
 if ENV['GTK_BASEPATH'] and /cygwin/ !~ RUBY_PLATFORM
   include_path = (ENV['GTK_BASEPATH'] + "\\INCLUDE").gsub("\\", "/")
 #  $hdrdir += " -I#{include_path} "
-  $CFLAGS += " -I#{include_path} "
+  $INCFLAGS += " -I#{include_path} "
 end
 
 def windows_platform?
@@ -123,7 +124,7 @@ def setup_windows(target_name, base_dir=nil)
       base_dir = Pathname(base_dir) if base_dir.is_a?(String)
       binary_base_dir = base_dir + "vendor" + "local"
       if binary_base_dir.exist?
-        $CFLAGS += " -I#{binary_base_dir}/include"
+        $INCFLAGS += " -I#{binary_base_dir}/include"
         pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
         PKGConfig.add_path(pkg_config_dir.to_s)
       end
@@ -147,7 +148,8 @@ def find_gem_spec(package)
 end
 
 def setup_homebrew_libffi
-  return unless package_platform == :homebrew
+  platform = NativePackageInstaller::Platform.detect
+  return unless platform.is_a?(NativePackageInstaller::Platform::Homebrew)
 
   PKGConfig.add_path("/usr/local/opt/libffi/lib/pkgconfig")
 end
@@ -463,127 +465,14 @@ def check_cairo(options={})
       add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
       $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
     end
-    $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
+    $INCFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
   end
 
   PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
 end
 
-def package_platform
-  if File.exist?("/etc/debian_version")
-    :debian
-  elsif File.exist?("/etc/fedora-release")
-    :fedora
-  elsif File.exist?("/etc/redhat-release")
-    :redhat
-  elsif File.exist?("/etc/SuSE-release")
-    :suse
-  elsif File.exist?("/etc/altlinux-release")
-    :altlinux
-  elsif find_executable("pacman")
-    :arch
-  elsif find_executable("brew")
-    :homebrew
-  elsif find_executable("port")
-    :macports
-  else
-    :unknown
-  end
-end
-
-def super_user?
-  Process.uid.zero?
-end
-
-def normalize_native_package_info(native_package_info)
-  native_package_info ||= {}
-  native_package_info = native_package_info.dup
-  native_package_info[:fedora] ||= native_package_info[:redhat]
-  native_package_info[:suse] ||= native_package_info[:fedora]
-  native_package_info
-end
-
 def install_missing_native_package(native_package_info)
-  platform = package_platform
-  native_package_info = normalize_native_package_info(native_package_info)
-  package = native_package_info[platform]
-  return false if package.nil?
-
-  package_name, *options = package
-  package_command_line = [package_name, *options].join(" ")
-  need_super_user_priviledge = true
-  case platform
-  when :debian, :altlinux
-    install_command = "apt-get install -V -y #{package_command_line}"
-  when :fedora, :redhat
-    install_command = "yum install -y #{package_command_line}"
-  when :suse
-    install_command = "zypper --non-interactive install #{package_command_line}"
-  when :arch
-    install_command = "pacman -S --noconfirm #{package_command_line}"
-  when :homebrew
-    need_super_user_priviledge = false
-    install_command = "brew install #{package_command_line}"
-  when :macports
-    install_command = "port install -y #{package_command_line}"
-  else
-    return false
-  end
-
-  have_priviledge = (not need_super_user_priviledge or super_user?)
-  unless have_priviledge
-    sudo = find_executable("sudo")
-  end
-
-  installing_message = "installing '#{package_name}' native package... "
-  message("%s", installing_message)
-  failed_to_get_super_user_priviledge = false
-  if have_priviledge
-    succeeded = xsystem(install_command)
-  else
-    if sudo
-      prompt = "[sudo] password for %u to install <#{package_name}>: "
-      sudo_options = "-p #{Shellwords.escape(prompt)}"
-      install_command = "#{sudo} #{sudo_options} #{install_command}"
-      succeeded = xsystem(install_command)
-    else
-      succeeded = false
-      failed_to_get_super_user_priviledge = true
-    end
-  end
-
-  if failed_to_get_super_user_priviledge
-    result_message = "require super user privilege"
-  else
-    result_message = succeeded ? "succeeded" : "failed"
-  end
-  Logging.postpone do
-    "#{installing_message}#{result_message}\n"
-  end
-  message("#{result_message}\n")
-
-  error_message = nil
-  unless succeeded
-    if failed_to_get_super_user_priviledge
-      error_message = <<-EOM
-'#{package_name}' native package is required.
-run the following command as super user to install required native package:
-  \# #{install_command}
-EOM
-    else
-      error_message = <<-EOM
-failed to run '#{install_command}'.
-EOM
-    end
-  end
-  if error_message
-    message("%s", error_message)
-    Logging.message("%s", error_message)
-  end
-
-  Logging.message("--------------------\n\n")
-
-  succeeded
+  NativePackageInstaller.install(native_package_info)
 end
 
 def required_pkg_config_package(package_info, native_package_info=nil)

data/test/test-bytes.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 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
+# 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 TestGLibBytes < Test::Unit::TestCase
+  include GLibTestUtils
+
+  setup do
+    only_glib_version(2, 32, 0)
+  end
+
+  test "#to_s" do
+    data = "Hello"
+    bytes = GLib::Bytes.new(data)
+    string = bytes.to_s
+    assert_equal([data, Encoding::ASCII_8BIT],
+                 [string, string.encoding])
+  end
+
+  test "#to_str" do
+    bytes = GLib::Bytes.new("Hello")
+    assert_equal(bytes.to_s, bytes.to_str)
+  end
+end

data/test/test-date-time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-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
@@ -15,6 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestDateTime < Test::Unit::TestCase
+  include GLibTestUtils
+
   def test_now_local
     now = GLib::DateTime.now(:local)
     format = "%Y-%m-%d-%H-%M"
@@ -74,6 +76,7 @@ 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,
@@ -92,6 +95,7 @@ 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-match-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-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
@@ -15,6 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 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-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-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
@@ -15,6 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 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-time-zone.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-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
@@ -15,6 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestTimeZone < Test::Unit::TestCase
+  include GLibTestUtils
+
+  setup do
+    only_glib_version(2, 34, 0)
+  end
+
   sub_test_case "new" do
     test "local" do
       local_1 = GLib::TimeZone.local

data/test/test-type-interface.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 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
+# 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 TestTypeInterface < Test::Unit::TestCase
+  sub_test_case("#append_features") do
+    def test_not_instantiatable
+      plain_class = Class.new
+      assert_raise(TypeError.new("Not a subclass of GLib::Instantiatable")) do
+        plain_class.class_eval do
+          include GLib::TypePlugin
+        end
+      end
+    end
+
+    def test_instantiatable
+      gobject_class = Class.new(GLib::Object)
+      gobject_class.class_eval do
+        include GLib::TypePlugin
+      end
+      assert do
+        gobject_class.method_defined?(:use)
+      end
+    end
+  end
+end

data/test/test-variant-type.rb

@@ -111,6 +111,7 @@ class TestGLibVariantType < Test::Unit::TestCase
     end
 
     test "OBJECT_PATH_ARRAY" do
+      only_glib_version(2, 30, 0)
       assert_equal("ao", GLib::VariantType::OBJECT_PATH_ARRAY.to_s)
     end
 
@@ -123,6 +124,7 @@ class TestGLibVariantType < Test::Unit::TestCase
     end
 
     test "VARDICT" do
+      only_glib_version(2, 30, 0)
       assert_equal("a{sv}", GLib::VariantType::VARDICT.to_s)
     end
   end

data/test/test_key_file.rb

@@ -13,7 +13,7 @@
 # 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
- 
+
 require 'tempfile'
 
 class TestGLibKeyFile < Test::Unit::TestCase
@@ -35,10 +35,14 @@ class TestGLibKeyFile < Test::Unit::TestCase
     end
     if GLib.check_version?(2, 31, 2)
       assert_equal(temp.path, key_file.load_from_dirs(base_name, search_dirs))
-    else
+    elsif GLib.check_version?(2, 30, 0)
       assert_raise(GLib::KeyFileError::NotFound) do
         key_file.load_from_dirs(base_name, search_dirs)
       end
+    else
+      assert_raise(GLib::KeyFileError::Parse) do
+        key_file.load_from_dirs(base_name, search_dirs)
+      end
     end
     temp.puts(<<-EOK)
 [General]

data/vendor/local/bin/glib-gettextize

@@ -37,7 +37,7 @@ Usage: glib-gettextize [OPTION]... [package-dir]
   -f, --force          force writing of new files even if old exist
 Report bugs to http://bugzilla.gnome.org/."
 package=glib
-version=2.50.2
+version=2.52.1
 try_ln_s=:
 
 # Directory where the sources are stored.
@@ -51,7 +51,7 @@ esac
 datarootdir=${prefix}/share
 datadir=${datarootdir}
 
-gettext_dir=$prefix/share/glib-2.0/gettext
+gettext_dir=$datadir/glib-2.0/gettext
 
 while test $# -gt 0; do
   case "$1" in