glib2 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04730751dce8565060ffd80a06d6a0ff6a15810a
-  data.tar.gz: 259e897aa9cd8d7a9ed55fd4d5d46250d8fffefe
+  metadata.gz: 5f8d9545fe87678cf0d4db62a81e168fc2fffa17
+  data.tar.gz: 15a6ca125195b394b9668f94538d7162fc8827aa
 SHA512:
-  metadata.gz: 012bb0c94321282d928c856e78861ba209fd043dc89aad1f91e9c452c33e26a894efba8291923dfaa78d2763f8f7e9729c8a7918bb205ea12b8805c8349ebc0b
-  data.tar.gz: 570415824340c5482d8ff2673f5b41c64a4dcd11f33c1e01f9ed3c497e4fda0f4e92a9a1a90ff6a9850e8dddcaf32500b1ebe6cd01454fc13cf61a6117975cab
+  metadata.gz: 5ea40da0e9ef889e0589e951cfb6386ba8bd34045aca82d2e2d887fc14ec56804b960e94e94c9add2f497af25e27210ce8a05f556a9cb36a8333f7c9181903c2
+  data.tar.gz: 8ef475502ac5183a7b18366ee1406d3edd3d660e7373627bbecef7624b5fbd5f81096891e4cec8c5bd1697b80a68437b25a715f39a9a2e06254389a9f14870fa

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
@@ -168,6 +172,7 @@ module GNOME2
 
       def define_win32_extension_task
         ::Rake::ExtensionTask.new(so_base_name, @spec) do |ext|
+          ext.cross_platform = cross_platform
           ext.ext_dir = "ext/#{@name}"
           ext.cross_compile = true
           ext.cross_compiling do |spec|
@@ -198,13 +203,21 @@ module GNOME2
           end
         end
 
-        def define_win32_download_task
-          GNOME2Win32BinaryDownloadTask.new(@package)
+        extconf_rb = "ext/#{@name}/extconf.rb"
+        unless File.exist?(extconf_rb)
+          native_task_name = "native:#{@name}:#{cross_platform}"
+          if ::Rake::Task.task_defined?(native_task_name)
+            ::Rake::Task[native_task_name].prerequisites.clear
+          end
         end
+      end
 
-        def define_win32_build_task
-          GNOME2Win32BinaryBuildTask.new(@package)
-        end
+      def define_win32_download_task
+        GNOME2Win32BinaryDownloadTask.new(@package)
+      end
+
+      def define_win32_build_task
+        GNOME2Win32BinaryBuildTask.new(@package)
       end
 
       def define_package_tasks

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

data/lib/mkmf-gnome2.rb

@@ -185,6 +185,17 @@ def add_depend_package_path(target_name, target_source_dir, target_build_dir)
     $INCFLAGS = "-I#{target_source_dir} #{$INCFLAGS}"
   end
 
+  case RUBY_PLATFORM
+  when /cygwin|mingw|mswin/
+    target_base_dir = Pathname.new(target_source_dir).parent.parent
+    target_binary_base_dir = target_base_dir + "vendor" + "local"
+    if target_binary_base_dir.exist?
+      $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
+      target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
+      PKGConfig.add_path(target_pkg_config_dir.to_s)
+    end
+  end
+
   return unless File.exist?(target_build_dir)
   if target_source_dir != target_build_dir
     $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
@@ -201,13 +212,6 @@ def add_depend_package_path(target_name, target_source_dir, target_build_dir)
       $DLDFLAGS << " /libpath:#{target_build_dir}"
       $libs << " lib#{library_base_name}.lib"
     end
-    target_base_dir = Pathname.new(target_source_dir).parent.parent
-    target_binary_base_dir = target_base_dir + "vendor" + "local"
-    if target_binary_base_dir.exist?
-      $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
-      target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
-      PKGConfig.add_path(target_pkg_config_dir.to_s)
-    end
   end
 end
 

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: ruby
 authors:
 - The Ruby-GNOME2 Project Team