1 files changed, 31 insertions, 19 deletions
diff --git a/community/ruby-gtk2/mkmf-gnome2.patch b/community/ruby-gtk2/mkmf-gnome2.patch
index a03ab9e4c..bf877cf9c 100644
--- a/community/ruby-gtk2/mkmf-gnome2.patch
+++ b/community/ruby-gtk2/mkmf-gnome2.patch
@@ -1,19 +1,31 @@
-*** mkmf-gnome2.rb.orig	2011-02-21 12:41:16.563334382 -0600
---- mkmf-gnome2.rb	2011-02-21 12:41:37.610001048 -0600
-***************
-*** 364,370 ****
-      rescue LoadError
-      end
-    end
-!   return false if rcairo_source_dir.nil?
-  
-    if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
-      options = {}
---- 364,370 ----
-      rescue LoadError
-      end
-    end
-!   return false if rcairo_source_dir.nil? && !(PKGConfig.have_package('cairo') && have_header('rb_cairo.h'))  
-  
-    if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
-      options = {}
+--- glib2/lib/mkmf-gnome2.rb.orig	2011-04-12 14:51:53.223390976 +0200
++++ glib2/lib/mkmf-gnome2.rb	2011-04-12 14:52:21.240120725 +0200
+@@ -366,20 +366,19 @@
+     rescue LoadError
+     end
+   end
++  return false if rcairo_source_dir.nil? && !(PKGConfig.have_package('cairo') && have_header('rb_cairo.h'))  
+ 
+-  unless rcairo_source_dir.nil?
+-    if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+-      options = {}
+-      build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
+-      if File.exist?(File.join(rcairo_source_dir, build_dir))
+-        options[:target_build_dir] = build_dir
+-      end
+-      add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
+-      $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
++  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
++    options = {}
++    build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
++    if File.exist?(File.join(rcairo_source_dir, build_dir))
++      options[:target_build_dir] = build_dir
+     end
+-    $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
++    add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
++    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+   end
+ 
++  $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
+   PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
+ end