glib2 2.2.1-x86-mingw32 → 2.2.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc39df32746e00a04b54d407e8cce5ab26041cfc
-  data.tar.gz: 16e8f643cbe0e506cc4b65b29487c49147816a6d
+  metadata.gz: 4717432258005ed1c54a0e24face32c8ed9f2f65
+  data.tar.gz: 044d3553342221ff94f94fcc2e17dc92d957a38c
 SHA512:
-  metadata.gz: 3394264908f915ebc96346ab8415a7b95558da5f9e93e67f944e6adb6d54786b6ff2a63d989a87d46e32260853bf7f8f88f5ae3a684cc4205f51350cb62717e4
-  data.tar.gz: b797610f37284d26c2da025ffb4702469d5d485e1678db6be7e8e3b1052f22bdf88d7b345c12b3f5b6fc4e2a960dec5845b915ea07c8ea43a7f583953ec28e8a
+  metadata.gz: 2aaa9cb40246a3114a886b68b371d0d1ad84ad93ffcf62c9c1c36c64c204202cfd80b96382546a421c210afd2afd740e508e93f839625d5d20aa5e86d31eae24
+  data.tar.gz: cc0696b349ffaba14f684c3cffd015fb14c084724a55d74cd7697de0e01c0540be5e4972029a6ab00c8ea141660d6c6db075c792b89b8964a7b7dde193681fa4

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 2
 #define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 1
+#define RBGLIB_MICRO_VERSION 2
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-# Copyright(C) 2011 Ruby-GNOME2 Project.
+# Copyright(C) 2011-2014 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same license of Ruby-GNOME2.
 
@@ -112,6 +112,10 @@ module GNOME2
         @dependency_configuration = DependencyConfiguration.new(self)
       end
 
+      def cross_platform
+        "#{windows.build_architecture}-mingw32"
+      end
+
       def define_spec
         @spec = Gem::Specification.new do |s|
           s.name                  = @name
@@ -167,9 +171,8 @@ module GNOME2
       end
 
       def define_win32_extension_task
-        cross_platform = nil
         ::Rake::ExtensionTask.new(so_base_name, @spec) do |ext|
-          cross_platform = ext.cross_platform
+          ext.cross_platform = cross_platform
           ext.ext_dir = "ext/#{@name}"
           ext.cross_compile = true
           ext.cross_compiling do |spec|

data/lib/gnome2/rake/package.rb

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2014  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
@@ -106,17 +106,29 @@ module GNOME2
         end
 
         def build_host
-          super || "i686-w64-mingw32"
+          super || guess_build_host
         end
 
-        def build_architecture
-          case build_host
-          when /\Ai\d86-/
-            "x86_64"
+        def guess_build_host
+          ENV["RUBY_GNOME2_BUILD_HOST"] ||
+            guess_build_host_from_architecture ||
+            "i686-w64-mingw32"
+        end
+
+        def guess_build_host_from_architecture
+          case build_architecture
+          when "x86"
+            "i686-w64-mingw32"
+          when "x64"
+            "x86_64-w64-mingw32"
           else
-            "x64"
+            nil
           end
         end
+
+        def build_architecture
+          ENV["RUBY_GNOME2_BUILD_ARCHITECTURE"] || "x86"
+        end
       end
 
       class NativeConfiguration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: x86-mingw32
 authors:
 - The Ruby-GNOME2 Project Team
@@ -130,6 +130,7 @@ files:
 - ext/glib2/rbgutildeprecated.h
 - extconf.rb
 - lib/2.0/glib2.so
+- lib/2.1/glib2.so
 - lib/glib-mkenums.rb
 - lib/glib2.rb
 - lib/glib2/deprecatable.rb