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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fc39df32746e00a04b54d407e8cce5ab26041cfc
4
- data.tar.gz: 16e8f643cbe0e506cc4b65b29487c49147816a6d
3
+ metadata.gz: 4717432258005ed1c54a0e24face32c8ed9f2f65
4
+ data.tar.gz: 044d3553342221ff94f94fcc2e17dc92d957a38c
5
5
  SHA512:
6
- metadata.gz: 3394264908f915ebc96346ab8415a7b95558da5f9e93e67f944e6adb6d54786b6ff2a63d989a87d46e32260853bf7f8f88f5ae3a684cc4205f51350cb62717e4
7
- data.tar.gz: b797610f37284d26c2da025ffb4702469d5d485e1678db6be7e8e3b1052f22bdf88d7b345c12b3f5b6fc4e2a960dec5845b915ea07c8ea43a7f583953ec28e8a
6
+ metadata.gz: 2aaa9cb40246a3114a886b68b371d0d1ad84ad93ffcf62c9c1c36c64c204202cfd80b96382546a421c210afd2afd740e508e93f839625d5d20aa5e86d31eae24
7
+ data.tar.gz: cc0696b349ffaba14f684c3cffd015fb14c084724a55d74cd7697de0e01c0540be5e4972029a6ab00c8ea141660d6c6db075c792b89b8964a7b7dde193681fa4
@@ -36,7 +36,7 @@ extern "C" {
36
36
 
37
37
  #define RBGLIB_MAJOR_VERSION 2
38
38
  #define RBGLIB_MINOR_VERSION 2
39
- #define RBGLIB_MICRO_VERSION 1
39
+ #define RBGLIB_MICRO_VERSION 2
40
40
 
41
41
  #ifndef RSTRING_PTR
42
42
  # define RSTRING_PTR(s) (RSTRING(s)->ptr)
Binary file
Binary file
@@ -1,6 +1,6 @@
1
1
  # coding: utf-8
2
2
 
3
- # Copyright(C) 2011 Ruby-GNOME2 Project.
3
+ # Copyright(C) 2011-2014 Ruby-GNOME2 Project.
4
4
  #
5
5
  # This program is licenced under the same license of Ruby-GNOME2.
6
6
 
@@ -112,6 +112,10 @@ module GNOME2
112
112
  @dependency_configuration = DependencyConfiguration.new(self)
113
113
  end
114
114
 
115
+ def cross_platform
116
+ "#{windows.build_architecture}-mingw32"
117
+ end
118
+
115
119
  def define_spec
116
120
  @spec = Gem::Specification.new do |s|
117
121
  s.name = @name
@@ -167,9 +171,8 @@ module GNOME2
167
171
  end
168
172
 
169
173
  def define_win32_extension_task
170
- cross_platform = nil
171
174
  ::Rake::ExtensionTask.new(so_base_name, @spec) do |ext|
172
- cross_platform = ext.cross_platform
175
+ ext.cross_platform = cross_platform
173
176
  ext.ext_dir = "ext/#{@name}"
174
177
  ext.cross_compile = true
175
178
  ext.cross_compiling do |spec|
@@ -1,6 +1,6 @@
1
1
  # -*- ruby -*-
2
2
  #
3
- # Copyright (C) 2013 Ruby-GNOME2 Project Team
3
+ # Copyright (C) 2013-2014 Ruby-GNOME2 Project Team
4
4
  #
5
5
  # This library is free software; you can redistribute it and/or
6
6
  # modify it under the terms of the GNU Lesser General Public
@@ -106,17 +106,29 @@ module GNOME2
106
106
  end
107
107
 
108
108
  def build_host
109
- super || "i686-w64-mingw32"
109
+ super || guess_build_host
110
110
  end
111
111
 
112
- def build_architecture
113
- case build_host
114
- when /\Ai\d86-/
115
- "x86_64"
112
+ def guess_build_host
113
+ ENV["RUBY_GNOME2_BUILD_HOST"] ||
114
+ guess_build_host_from_architecture ||
115
+ "i686-w64-mingw32"
116
+ end
117
+
118
+ def guess_build_host_from_architecture
119
+ case build_architecture
120
+ when "x86"
121
+ "i686-w64-mingw32"
122
+ when "x64"
123
+ "x86_64-w64-mingw32"
116
124
  else
117
- "x64"
125
+ nil
118
126
  end
119
127
  end
128
+
129
+ def build_architecture
130
+ ENV["RUBY_GNOME2_BUILD_ARCHITECTURE"] || "x86"
131
+ end
120
132
  end
121
133
 
122
134
  class NativeConfiguration
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: glib2
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.1
4
+ version: 2.2.2
5
5
  platform: x86-mingw32
6
6
  authors:
7
7
  - The Ruby-GNOME2 Project Team
@@ -130,6 +130,7 @@ files:
130
130
  - ext/glib2/rbgutildeprecated.h
131
131
  - extconf.rb
132
132
  - lib/2.0/glib2.so
133
+ - lib/2.1/glib2.so
133
134
  - lib/glib-mkenums.rb
134
135
  - lib/glib2.rb
135
136
  - lib/glib2/deprecatable.rb