glib2 3.1.0-x86-mingw32 → 3.1.1-x86-mingw32

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

@@ -44,15 +44,15 @@ module GNOME2
       end
 
       def compression_method
-        super || "gz"
+        resolve_value(super) || "gz"
       end
 
       def base_name
-        super || "#{name}-#{version}"
+        resolve_value(super) || "#{name}-#{version}"
       end
 
       def archive_base_name
-        super || "#{base_name}.tar.#{compression_method}"
+        resolve_value(super) || "#{base_name}.tar.#{compression_method}"
       end
 
       def archive_url
@@ -60,7 +60,7 @@ module GNOME2
       end
 
       def download_base_url
-        super || download_site_base_url
+        resolve_value(super) || download_site_base_url
       end
 
       def patches
@@ -76,7 +76,7 @@ module GNOME2
       end
 
       def base_dir_in_package
-        super || "."
+        resolve_value(super) || "."
       end
 
       def windows
@@ -109,12 +109,22 @@ module GNOME2
           latest_version_freedesktop_gstreamer
         when :webkitgtk
           latest_version_webkitgtk
+        when :icu
+          latest_version_icu
         else
           nil
         end
       end
 
       private
+      def resolve_value(value)
+        if value.respond_to?(:call)
+          value.call(self)
+        else
+          value
+        end
+      end
+
       def download_site_base_url
         case download_site
         when :gnome
@@ -131,6 +141,8 @@ module GNOME2
           base_url = "http://ftp.gnu.org/pub/gnu/#{name}"
         when :webkitgtk
           base_url = webkitgtk_base_url
+        when :icu
+          base_url = "#{icu_base_url}/#{version}"
         else
           base_url = nil
         end
@@ -153,6 +165,10 @@ module GNOME2
         "https://webkitgtk.org/releases"
       end
 
+      def icu_base_url
+        "http://download.icu-project.org/files/icu4c"
+      end
+
       def sort_versions(versions)
         versions.sort_by do |version|
           version.split(".").collect(&:to_i)
@@ -247,6 +263,20 @@ module GNOME2
         sort_versions(versions).last
       end
 
+      def latest_version_icu
+        base_url = icu_base_url
+        versions = []
+        open(base_url) do |index|
+          index.read.scan(/<a (.+?)>/) do |content,|
+            case content
+            when /href="(\d+(?:\.\d+)+)\/"/x
+              versions << $1
+            end
+          end
+        end
+        sort_versions(versions).last
+      end
+
       class WindowsConfiguration < Struct.new(:build,
                                               :include_paths,
                                               :library_paths,

data/lib/gnome2/rake/source-download-task.rb

@@ -51,6 +51,7 @@ module GNOME2
         end
       end
 
+      private
       def define_download_tasks
         namespace :download do
           @package.external_packages.each do |package|
@@ -68,15 +69,34 @@ module GNOME2
             file tar_full_path.to_s => directory_path.to_s do
               archive_url = package.archive_url
               rake_output_message "Downloading... #{archive_url}"
-              open(archive_url) do |downloaded_tar|
-                tar_full_path.open("wb") do |tar_file|
-                  tar_file.print(downloaded_tar.read)
-                end
-              end
+              download(archive_url, tar_full_path)
             end
           end
         end
       end
+
+      def download(url, output_path)
+        OpenURI.singleton_class.class_eval do
+          alias_method :redirectable_original?, :redirectable?
+          def redirectable?(uri1, uri2)
+            redirectable_original?(uri1, uri2) or
+              (uri1.scheme.downcase == "http" and
+               uri2.scheme.downcase == "https")
+          end
+        end
+        begin
+          open(url) do |input|
+            output_path.open("wb") do |output_file|
+              output_file.print(input.read)
+            end
+          end
+        ensure
+          OpenURI.singleton_class.class_eval do
+            alias_method :redirectable?, :redirectable_original?
+            remove_method :redirectable_original?
+          end
+        end
+      end
     end
   end
 end

data/lib/mkmf-gnome2.rb

@@ -140,12 +140,7 @@ end
 
 def find_gem_spec(package)
   begin
-    require 'rubygems'
-    if Gem::Specification.respond_to?(:find_by_name)
-      Gem::Specification.find_by_name(package)
-    else
-      Gem.source_index.find_name(package).last
-    end
+    Gem::Specification.find_by_name(package)
   rescue LoadError
     nil
   end

data/test/test-date-time.rb

@@ -0,0 +1,112 @@
+# Copyright (C) 2016  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 TestDateTime < Test::Unit::TestCase
+  def test_now_local
+    now = GLib::DateTime.now(:local)
+    format = "%Y-%m-%d-%H-%M"
+    assert_equal(Time.now.strftime(format), now.format(format))
+  end
+
+  sub_test_case "new" do
+
+    test "unix: :local" do
+      time = Time.now
+      format = "%Y-%m-%d-%H-%M"
+      datetime = GLib::DateTime.new(:unix => time.to_i,
+                                    :timezone => :local)
+      assert_equal(time.strftime(format), datetime.format(format))
+    end
+
+    test "unix: :utc" do
+      time = Time.now.utc
+      format = "%Y-%m-%d-%H-%M"
+      datetime = GLib::DateTime.new(:unix => time.to_i,
+                                    :timezone => :utc)
+      assert_equal(time.strftime(format), datetime.format(format))
+    end
+
+    test "timezone: :local" do
+      time = Time.now
+      datetime = GLib::DateTime.new(:timezone => :local,
+                                    :year => time.year,
+                                    :month => time.month,
+                                    :day => time.day,
+                                    :hour => time.hour,
+                                    :minute => time.min,
+                                    :second => time.sec)
+      assert_equal(time.year, datetime.year)
+      assert_equal(time.month, datetime.month)
+      assert_equal(time.day, datetime.day_of_month)
+      assert_equal(time.hour, datetime.hour)
+      assert_equal(time.min, datetime.minute)
+      assert_equal(time.sec, datetime.second)
+    end
+
+    test "timezone: :utc" do
+      time = Time.now.utc
+      datetime = GLib::DateTime.new(:timezone => :utc,
+                                    :year => time.year,
+                                    :month => time.month,
+                                    :day => time.day,
+                                    :hour => time.hour,
+                                    :minute => time.min,
+                                    :second => time.sec)
+      assert_equal(time.year, datetime.year)
+      assert_equal(time.month, datetime.month)
+      assert_equal(time.day, datetime.day_of_month)
+      assert_equal(time.hour, datetime.hour)
+      assert_equal(time.min, datetime.minute)
+      assert_equal(time.sec, datetime.second)
+    end
+
+    test "timezone: local time zone" do
+      time = Time.now
+      tz = GLib::TimeZone.local
+      datetime = GLib::DateTime.new(:timezone => tz,
+                                    :year => time.year,
+                                    :month => time.month,
+                                    :day => time.day,
+                                    :hour => time.hour,
+                                    :minute => time.min,
+                                    :second => time.sec)
+      assert_equal(time.year, datetime.year)
+      assert_equal(time.month, datetime.month)
+      assert_equal(time.day, datetime.day_of_month)
+      assert_equal(time.hour, datetime.hour)
+      assert_equal(time.min, datetime.minute)
+      assert_equal(time.sec, datetime.second)
+    end
+
+    test "timezone: UTC time zone" do
+      time = Time.now.utc
+      tz = GLib::TimeZone.utc
+      datetime = GLib::DateTime.new(:timezone => tz,
+                                    :year => time.year,
+                                    :month => time.month,
+                                    :day => time.day,
+                                    :hour => time.hour,
+                                    :minute => time.min,
+                                    :second => time.sec)
+      assert_equal(time.year, datetime.year)
+      assert_equal(time.month, datetime.month)
+      assert_equal(time.day, datetime.day_of_month)
+      assert_equal(time.hour, datetime.hour)
+      assert_equal(time.min, datetime.minute)
+      assert_equal(time.sec, datetime.second)
+    end
+  end
+end

data/test/test-time-zone.rb

@@ -0,0 +1,31 @@
+# Copyright (C) 2016  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 TestTimeZone < Test::Unit::TestCase
+  sub_test_case "new" do
+    test "local" do
+      local_1 = GLib::TimeZone.local
+      local_2 = GLib::TimeZone.new
+      assert_equal(local_1.abbreviation(0), local_2.abbreviation(0))
+    end
+
+    test "UTC" do
+      utc_1 = GLib::TimeZone.utc
+      utc_2 = GLib::TimeZone.new("UTC")
+      assert_equal(utc_1.offset(0), utc_2.offset(0))
+    end
+  end
+end

data/vendor/local/bin/pcre-config

@@ -71,7 +71,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo 8.38
+      echo 8.40
       ;;
     --cflags)
       if test ${prefix}/include != /usr/include ; then

data/vendor/local/include/pcre.h

@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
 /* The current PCRE version information. */
 
 #define PCRE_MAJOR          8
-#define PCRE_MINOR          38
+#define PCRE_MINOR          40
 #define PCRE_PRERELEASE     
-#define PCRE_DATE           2015-11-23
+#define PCRE_DATE           2017-01-11
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE, the appropriate