glib2 1.0.2 → 1.0.3

data/ChangeLog

@@ -1,5 +1,17 @@
+2011-09-19  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb (check_cairo): really support RubyGems 1.8.6...
+	[#3411234]
+	Reported by Tobias Pfeiffer. Thanks!!!
+
 2011-09-18  Kouhei Sutou  <kou@cozmixng.org>
 
+	* ext/glib2/rbglib.h: 1.0.2 -> 1.0.3.
+
+	* lib/mkmf-gnome2.rb (add_depend_package): support RubyGems
+	1.8.6. [#3411204]
+	Reported by Tobias Pfeiffer. Thanks!!!
+
 	* ext/glib2/rbglib.h: 1.0.1 -> 1.0.2.
 
 	* ext/glib2/rbgutil_callback.c: don't include unistd.h on Win32

data/ext/glib2/rbglib.h

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

data/lib/mkmf-gnome2.rb

@@ -75,21 +75,28 @@ def setup_win32(target_name, base_dir=nil)
   end
 end
 
-#add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
-def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
+def find_gem_spec(package)
   begin
     require 'rubygems'
-    gem_spec = (Gem::Specification.respond_to?(:find_by_name) ?
-                Gem::Specification.find_by_name(target_name) :
-                Gem.source_index.find_name(target_name).last)
-    if gem_spec
-      target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
-      target_build_dir = target_source_dir
-      add_depend_package_path(target_name,
-                              target_source_dir,
-                              target_build_dir)
+    if Gem::Specification.respond_to?(:find_by_name)
+      Gem::Specification.find_by_name(package)
+    else
+      Gem.source_index.find_name(package).last
     end
   rescue LoadError
+    nil
+  end
+end
+
+#add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
+def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
+  gem_spec = find_gem_spec(target_name)
+  if gem_spec
+    target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
+    target_build_dir = target_source_dir
+    add_depend_package_path(target_name,
+                       target_source_dir,
+                       target_build_dir)
   end
 
   [top_srcdir,
@@ -383,16 +390,8 @@ def check_cairo(options={})
     rcairo_source_dir = nil
   end
   if rcairo_source_dir.nil?
-    begin
-      require 'rubygems'
-      cairo_gem_spec = (Gem::Specification.respond_to?(:find_by_name) ?
-                        Gem::Specification.find_by_name('cairo') :
-                        Gem.source_index.find_name('cairo')).last
-      if cairo_gem_spec
-        rcairo_source_dir = cairo_gem_spec.full_gem_path
-      end
-    rescue LoadError
-    end
+    cairo_gem_spec = find_gem_spec("cairo")
+    rcairo_source_dir = cairo_gem_spec.full_gem_path if cairo_gem_spec
   end
 
   unless rcairo_source_dir.nil?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team