cairo 1.8.1 → 1.8.3

data/NEWS

@@ -1,3 +1,19 @@
+Release 1.8.3 (2010-08-26) Kouhei Sutou <kou@cozmixng.org>)
+===========================================================
+
+Features
+--------
+  * Support cairo 1.8.10.
+  * Support Ruby 1.9.2. (reported by Tasuku SUENAGA and kimura wataru)
+  * Fix RGV -> HSV conversion. (patch by Yuta Taniguchi)
+  * Support Cairo::Color as Hash key.
+
+Thanks
+------
+  * Yuta Taniguchi
+  * Tasuku SUENAGA
+  * kimura wataru
+
 Release 1.8.1 (2009-12-13) Kouhei Sutou <kou@cozmixng.org>)
 ===========================================================
 

data/Rakefile

@@ -6,14 +6,15 @@ require 'find'
 require 'fileutils'
 require 'rubygems'
 require 'hoe'
+require 'rake/extensiontask'
 
 base_dir = File.join(File.dirname(__FILE__))
 truncate_base_dir = Proc.new do |x|
   x.gsub(/^#{Regexp.escape(base_dir + File::SEPARATOR)}/, '')
 end
 
-cairo_ext_dir = File.join(base_dir, 'src')
-cairo_lib_dir = File.join(cairo_ext_dir, 'lib')
+cairo_ext_dir = File.join(base_dir, 'ext', 'cairo')
+cairo_lib_dir = File.join(base_dir, 'lib')
 $LOAD_PATH.unshift(cairo_ext_dir)
 $LOAD_PATH.unshift(cairo_lib_dir)
 ENV["RUBYLIB"] = "#{cairo_lib_dir}:#{cairo_ext_dir}:#{ENV['RUBYLIB']}"
@@ -23,17 +24,14 @@ def guess_rcairo_version
   Cairo.bindings_version
 end
 
-cairo_win32_dir = "cairo"
-FileUtils.rm_rf(cairo_win32_dir)
-
 manifest = File.join(base_dir, "Manifest.txt")
 manifest_contents = []
 base_dir_included_components = %w(AUTHORS COPYING ChangeLog GPL
-                                  NEWS README Rakefile
+                                  NEWS README.doc Rakefile
                                   extconf.rb pkg-config.rb)
 excluded_components = %w(.cvsignore .gdb_history CVS depend Makefile pkg
-                         .test-result)
-excluded_suffixes = %w(.png .ps .pdf .o .so .a .txt .~)
+                         .test-result .gitignore .git vendor)
+excluded_suffixes = %w(.png .ps .pdf .o .so .a .txt .~ .log)
 Find.find(base_dir) do |target|
   target = truncate_base_dir[target]
   components = target.split(File::SEPARATOR)
@@ -76,8 +74,8 @@ project = Hoe.spec('cairo') do |project|
   project.url = 'http://cairographics.org/rcairo'
   project.test_globs = []
   project.spec_extras = {
-    :extensions => ['extconf.rb'],
-    :require_paths => ['src/lib', 'src'],
+    :extensions => ['ext/cairo/extconf.rb'],
+    :require_paths => ['lib'],
     :has_rdoc => false,
   }
   platform = ENV["FORCE_PLATFORM"]
@@ -91,12 +89,13 @@ end
 
 project.spec.dependencies.delete_if {|dependency| dependency.name == "hoe"}
 
-if /mswin32/ =~ project.spec.platform.to_s
-  project.spec.extensions = []
-  project.spec.files += ["src/cairo.so", "src/libruby-cairo.a"]
+Rake::ExtensionTask.new("cairo", project.spec) do |ext|
+  ext.cross_compile = true
+  ext.cross_platform = 'x86-mingw32'
+end
 
-  FileUtils.cp_r(File.expand_path("~/.wine/drive_c/cairo-dev"),
-                 cairo_win32_dir)
+if /mswin32/ =~ project.spec.platform.to_s
+  cairo_win32_dir = File.join(base_dir, "vendor", "local")
   cairo_files = []
   Find.find(cairo_win32_dir) do |f|
     cairo_files << f

data/ext/cairo/extconf.rb

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+# vim: filetype=ruby:expandtab:shiftwidth=2:tabstop=8:softtabstop=2 :
+
+require 'pathname'
+require 'English'
+require 'mkmf'
+require 'fileutils'
+
+base_dir = (Pathname(__FILE__).dirname + ".." + "..").expand_path
+$LOAD_PATH.unshift(base_dir.to_s)
+
+require 'pkg-config'
+
+checking_for(checking_message("GCC")) do
+  if macro_defined?("__GNUC__", "")
+    $CFLAGS += ' -Wall'
+    true
+  else
+    false
+  end
+end
+
+package = "cairo"
+module_name = "cairo"
+major, minor, micro = 1, 2, 0
+
+PKGConfig.have_package(package, major, minor, micro) or exit 1
+
+checking_for(checking_message("Win32 OS")) do
+  case RUBY_PLATFORM
+  when /cygwin|mingw|mswin32/
+    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+    import_library_name = "libruby-#{module_name}.a"
+    $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
+    $cleanfiles << import_library_name
+    local_cairo_install_dir = base_dir + "vendor" + "local"
+    $CFLAGS += " -I#{local_cairo_install_dir}/include"
+    local_cairo_lib_dir = local_cairo_install_dir + "lib"
+    ["cairo.lib", "libcairo.dll.a"].each do |libcairo_base|
+      libcairo = local_cairo_lib_dir + libcairo_base
+      if libcairo.exist?
+        $LDFLAGS += " -L#{local_cairo_lib_dir}"
+        break
+      end
+    end
+    true
+  else
+    false
+  end
+end
+
+checking_for(checking_message("Mac OS X")) do
+  case RUBY_PLATFORM
+  when /darwin/
+    if have_macro("CAIRO_HAS_QUARTZ_SURFACE", ["cairo.h"])
+      checking_for("RubyCocoa") do
+        begin
+          require 'osx/cocoa'
+          $defs << "-DHAVE_RUBY_COCOA"
+          $DLDFLAGS << " -Wl,-framework,RubyCocoa"
+          true
+        rescue LoadError
+          false
+        end
+      end
+    end
+    true
+  else
+    false
+  end
+end
+
+$defs << "-DRB_CAIRO_COMPILATION"
+
+have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
+have_header("ruby/io.h") unless have_macro("HAVE_RUBY_IO_H", "ruby.h")
+have_func("rb_errinfo", "ruby.h")
+have_type("enum ruby_value_type", "ruby.h")
+
+create_makefile(module_name)

data/{src → ext/cairo}/rb_cairo.c

@@ -76,7 +76,7 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (8), INT2FIX (1), Qnil));
+                                INT2FIX (1), INT2FIX (8), INT2FIX (3), Qnil));
 
   rb_define_module_function (rb_mCairo, "satisfied_version?",
                              rb_cairo_satisfied_version, -1);

data/{src → ext/cairo}/rb_cairo_private.c

@@ -24,7 +24,7 @@ VALUE
 rb_cairo__float_array (double *values, unsigned count)
 {
   VALUE result;
-  int i;
+  unsigned i;
 
   result = rb_ary_new2 (count);
   for (i = 0; i < count; i++)

data/extconf.rb

@@ -1,156 +1,45 @@
 #!/usr/bin/env ruby
-# vim: filetype=ruby:expandtab:shiftwidth=2:tabstop=8:softtabstop=2 :
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'English'
+require 'pathname'
 require 'mkmf'
-require 'pkg-config'
+require 'rbconfig'
 require 'fileutils'
 
-# from mkmf-gnome2.rb
-STDOUT.print("checking for GCC... ")
-STDOUT.flush
-if macro_defined?("__GNUC__", "")
-  STDOUT.print "yes\n"
-  $CFLAGS += ' -Wall'
-  $cc_is_gcc = true
-else
-  STDOUT.print "no\n"
-  $cc_is_gcc = false
-end
+base_dir = Pathname(__FILE__).dirname.expand_path
+ext_dir = base_dir + "ext" + "cairo"
 
-def check_win32
-  checking_for("Win32 OS") do
-    win32_os = /cygwin|mingw|mswin32/ =~ RUBY_PLATFORM
-    if win32_os
-      $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
-      if $cc_is_gcc
-        if /^2\./ =~ `#{Config::CONFIG['CC']} -dumpversion`.chomp
-          $CFLAGS += ' -fnative-struct'
-        else
-          $CFLAGS += ' -mms-bitfields'
-        end
-      end
-    end
-    win32_os
-  end
-end
+ruby = File.join(RbConfig::CONFIG['bindir'],
+                 RbConfig::CONFIG['ruby_install_name'] +
+                 RbConfig::CONFIG["EXEEXT"])
 
-def set_output_lib(target_name, directory=nil)
-  case RUBY_PLATFORM
-  when /cygwin|mingw/
-    filename = File.join(*([directory, "libruby-#{target_name}.a"].compact))
-    if RUBY_VERSION > "1.8.0"
-      $DLDFLAGS << ",--out-implib=#{filename}"
-    elsif RUBY_VERSION > "1.8"
-      $DLDFLAGS.gsub!(/ -Wl,--out-implib=[^ ]+/, '')
-      $DLDFLAGS << " -Wl,--out-implib=#{filename}"
-    else
-      $DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
-      $DLDFLAGS << " --output-lib #{filename}"
-    end
-    $cleanfiles << filename
-  when /mswin32/
-    $DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
-    $DLDFLAGS.gsub!(/ \/IMPLIB:[^ ]+/, '')
-    $DLDFLAGS << " /IMPLIB:$(IMPLIB)"
-  when /darwin/
-    if have_macro("CAIRO_HAS_QUARTZ_SURFACE", ["cairo.h"])
-      checking_for("RubyCocoa") do
-        begin
-          require 'osx/cocoa'
-          $defs << "-DHAVE_RUBY_COCOA"
-          $DLDFLAGS << " -Wl,-framework,RubyCocoa"
-          true
-        rescue LoadError
-          false
-        end
-      end
-    end
-  end
+Dir.chdir(ext_dir.to_s) do
+  system(ruby, "extconf.rb")
 end
 
+create_makefile("cairo")
+FileUtils.mv("Makefile", "Makefile.lib")
 
-pkg = "cairo"
-modname = "cairo"
-ext_dir_name = "src"
-srcdir = File.join(File.expand_path(File.dirname(__FILE__)), ext_dir_name)
-major, minor, micro = 1, 2, 0
-
-PKGConfig.have_package(pkg, major, minor, micro) or exit 1
+File.open("Makefile", "w") do |makefile|
+  makefile.puts(<<-EOM)
+all:
+	$(MAKE) $(MAKEFLAGS) -C ext/cairo
+	$(MAKE) $(MAKEFLAGS) -f Makefile.lib
 
-have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
-have_header("ruby/io.h") unless have_macro("HAVE_RUBY_IO_H", "ruby.h")
-have_func("rb_errinfo", "ruby.h")
-have_type("enum ruby_value_type", "ruby.h")
+install:
+	$(MAKE) $(MAKEFLAGS) -C ext/cairo install
+	$(MAKE) $(MAKEFLAGS) -f Makefile.lib install
 
-check_win32
-target_name = File.basename(modname)
-set_output_lib(target_name, ext_dir_name)
-$defs << "-DRB_CAIRO_COMPILATION"
-create_makefile(modname, srcdir)
+site-install:
+	$(MAKE) $(MAKEFLAGS) -C ext/cairo site-install
+	$(MAKE) $(MAKEFLAGS) -f Makefile.lib site-install
 
-wine = with_config("wine", false)
+clean:
+	$(MAKE) $(MAKEFLAGS) -C ext/cairo clean
+	$(MAKE) $(MAKEFLAGS) -f Makefile.lib clean
 
-makefile = File.read("Makefile")
-File.open("Makefile", "w") do |f|
-  objs = []
-  co = nil
-  makefile.each_line do |line|
-    if wine
-      line.gsub!(/\s+gcc\b/, " i586-mingw32msvc-gcc")
-      line.gsub!(/C:/, "$(HOME)/.wine/drive_c")
-      line.gsub!(/Z:/, "")
-    end
-
-    case line
-    when /^DLLIB\s*=\s*/
-      dllib = $POSTMATCH
-      f.puts("DLLIB = #{ext_dir_name}/#{dllib}")
-      f.puts("IMPLIB = #{ext_dir_name}/libruby-#{dllib.gsub(/\..+?$/, '.lib')}")
-    when /^(SRCS)\s*=\s*/
-      name = $1
-      vars = $POSTMATCH.split.collect {|var| "$(srcdir)/#{var}"}.join(" ")
-      f.puts("#{name} = #{vars}")
-    when /^(OBJS|CLEANLIBS|CLEANOBJS)\s*=\s*/
-      name = $1
-      vars = $POSTMATCH.split.collect {|var| "#{ext_dir_name}/#{var}"}
-      objs = vars if name == "OBJS"
-      vars = vars.join(" ")
-      f.puts("#{name} = #{vars}")
-    when /^LDSHARED\s*=/
-      def_file = "#{ext_dir_name}/#{target_name}.def"
-      line.gsub!(/\b-shared\b/, "-shared #{def_file}") if wine
-      f.puts(line)
-    when /^\t\$\(CC\)/
-      if PKGConfig.msvc?
-        output_option = "-Fo"
-      else
-        output_option = "-o"
-      end
-      unless /#{Regexp.escape(output_option)}/ =~ line
-        line = "#{line.chomp} #{output_option}$@"
-      end
-      co = line
-      f.puts(line)
-    else
-      f.puts(line)
-    end
-  end
-
-  if co and !objs.empty?
-    f.puts
-    if PKGConfig.msvc?
-      f.puts "{$(srcdir)}.c{#{ext_dir_name}}.obj:"
-      f.puts co
-    else
-      objs.each do |obj|
-        f.puts "#{obj}: $(srcdir)/#{File.basename(obj).sub(/\..+?$/, '.c')}"
-        f.puts co
-      end
-    end
-  end
+distclean:
+	$(MAKE) $(MAKEFLAGS) -C ext/cairo distclean
+	$(MAKE) $(MAKEFLAGS) -f Makefile.lib distclean
+	@rm -f Makefile.lib
+EOM
 end
-
-FileUtils.mkdir_p(ext_dir_name)

data/{src/lib → lib}/cairo.rb

@@ -3,7 +3,7 @@
 if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
   require 'pathname'
   base_dir = Pathname(File.dirname(__FILE__))
-  base_dir = base_dir.parent.parent + "cairo"
+  base_dir = base_dir.parent + "vendor" + "local"
   if base_dir.exist?
     base_dir = base_dir.to_s.gsub(/\//, "\\")
     ENV['PATH'] = %w(bin lib).collect do |dir|
@@ -39,7 +39,12 @@ end
 require 'cairo/color'
 require 'cairo/paper'
 
-require 'cairo.so'
+begin
+  major, minor, micro, = RUBY_VERSION.split(/\./)
+  require "#{major}.#{minor}/cairo.so"
+rescue LoadError
+  require 'cairo.so'
+end
 require 'cairo/constants'
 
 module Cairo

data/{src/lib → lib}/cairo/color.rb

@@ -88,6 +88,18 @@ module Cairo
         @blue = b
       end
 
+      def hash
+        to_s.hash
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def ==(other)
+        other.is_a?(self.class) and other.to_s == to_s
+      end
+
       def to_a
         [@red, @green, @blue, @alpha]
       end
@@ -123,10 +135,10 @@ module Cairo
           when @red
             numerator = @green - @blue
             angle = 0
-          when @blue
+          when @green
             numerator = @blue - @red
             angle = 120
-          when @green
+          when @blue
             numerator = @red - @green
             angle = 240
           end