cairo 1.10.0-x86-mingw32 → 1.10.1-x86-mingw32

data/Gemfile

@@ -0,0 +1,14 @@
+# -*- mode: ruby; coding: utf-8 -*-
+
+source "http://rubygems.org/"
+
+group :development, :test do
+  gem 'pkg-config'
+  gem "test-unit"
+  gem "test-unit-notify"
+  gem "rake"
+  gem "rake-compiler"
+  gem "jeweler"
+  gem "yard"
+  gem "packnga"
+end

data/NEWS

@@ -1,3 +1,36 @@
+Release 1.10.1 (2011-10-12) Kouhei Sutou <kou@cozmixng.org>)
+============================================================
+
+Features
+--------
+
+  * Accepted Cairo::EXTEND_PAD as extend value.
+  * Suppressed a warning. [Stefan Salewski]
+  * Bound CAIRO_SURFACE_TYPE_XLIB and CAIRO_SURFACE_TYPE_XCB.
+  * Supported cairo 1.10.2.
+  * Fixed recording surface test. #4 [Mamoru Tasaka]
+  * AcceptedCairo::OPERATOR_HSL_LUMINDSITY as operator value.
+    #6 [Matt Bramlage]
+  * Suppressed warnings on Windows. [Nikolai Weibull]
+  * Added --without-vendor-override options to extconf.rb.
+    [Nikolai Weibull]
+
+Thanks
+------
+
+  * Stefan Salewski
+  * Mamoru Tasaka
+  * Matt Bramlage
+  * Nikolai Weibull
+
+Release 1.10.0 (2010-09-12) Kouhei Sutou <kou@cozmixng.org>)
+===========================================================
+
+Features
+--------
+
+  * Support cairo 1.10.0.
+
 Release 1.8.5 (2010-08-28) Kouhei Sutou <kou@cozmixng.org>)
 ===========================================================
 

data/README.rdoc

@@ -0,0 +1,115 @@
+= README
+
+== Name
+
+rcairo
+
+== Description
+
+Ruby bindings for cairo // cairo extension for Ruby
+
+http://cairographics.org/
+
+== Dependencies
+
+* ruby >= 1.8 (1.9.2 also supported!)
+* cairo >= 1.2.0 (1.10.0 also supported!)
+
+== Install
+
+=== Package
+
+This way is recommended.
+
+  # gem install cairo
+
+=== Self build
+
+For experimental users.
+
+Download rcairo-X.Y.Z.tar.gz from http://cairographics.org/releases/
+
+Extracting:
+  % tar xvzf rcairo-X.Y.Z.tar.gz
+
+Compiling:
+  % cd rcairo-X.Y.Z
+  % ruby extconf.rb    # to check for dependencies and create Makefiles
+  % make               # to compile
+
+  # make install       # to install the cairo extension.
+		       # The samples in the samples folder should be able
+		       # to run before installation except text-on-path.rb
+		       # and text2.rb. They uses Ruby/Pango with rcairo
+		       # support. So you need to install rcairo and build
+		       # Ruby/Pango with it before you run them.
+
+Options to extconf.rb:
+
+  * --without-vendor-override: Use system libraries instead of those found in
+                               vendor/local for compiling
+
+== Windows
+
+cairo-X.Y.Z-x86-mswin32.gem includes cairo related binaries.
+
+* cairo related binaries:
+  http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/
+
+  * cairo-X.Y.Z-a_win32.zip
+  * cairo-dev-X.Y.Z-a_win32.zip
+  * libpng-X.Y.Z-a_win32.zip
+  * zlib-X.Y.Z-a_win32.zip
+  * expat_X.Y.Z-a_win32.zip
+  * fontconfig_X.Y.Z-a_win32.zip
+  * freetype_X.Y.Z-a_win32.zip
+
+== Documents
+
+* Reference manual:
+  http://cairo.rubyforge.org/doc/
+* Repository of the reference manual:
+  http://github.com/rcairo/doc
+* An article for rcairo on Rubyst Magazine a.k.a. RubiMa (in Japanese):
+  http://jp.rubyist.net/magazine/?0019-cairo
+
+== Source
+
+There is the rcairo repository at GitHub:
+http://github.com/rcairo/rcairo
+
+== Mailing list
+
+If you have trouble with cairo or rcairo, or you have some ideas for how
+it could be improved, please feel free to send a message to the cairo
+mailinglist at cairo@cairographics.org , which is archived at
+
+http://cairographics.org/cgi-bin/mailman/listinfo/cairo
+
+== Thanks
+
+* Yoshinao Muramatsu: win32 surface support patch.
+* NANKI Haruo: some bug fix patches.
+* Paul van Tilburg:
+  * some patches that support ruby 1.9.
+  * some suggestions.
+* Binzo: some bug reports and fixed that.
+* kimura wataru:
+  * some advices for RubyCocoa.
+  * reports a bug.
+* OBATA Akio:
+  * reports a bug.
+  * some suggestions.
+* James Healy: reports bugs.
+* Carsten Bormann: A suggestion.
+* Davide Rambaldi: A suggestion.
+* Yusuke ENDOH: reports a bug.
+* Yuta Taniguchi: a bug fix patch.
+* kimura wataru:
+  * reports a bug.
+  * some patches.
+* Masayas TARUI:
+  * Windows support.
+* Stefan Salewski: reports a bug.
+* Mamoru Tasaka: reports a bug.
+* Nikolai Weibull: reports problems.

data/Rakefile

@@ -5,13 +5,13 @@ require 'English'
 require 'find'
 require 'fileutils'
 require 'rubygems'
-require 'hoe'
+require 'rubygems/package_task'
+require 'yard'
+require 'jeweler'
 require 'rake/extensiontask'
+require 'packnga'
 
 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, 'ext', 'cairo')
 cairo_lib_dir = File.join(base_dir, 'lib')
@@ -19,79 +19,67 @@ $LOAD_PATH.unshift(cairo_ext_dir)
 $LOAD_PATH.unshift(cairo_lib_dir)
 ENV["RUBYLIB"] = "#{cairo_lib_dir}:#{cairo_ext_dir}:#{ENV['RUBYLIB']}"
 
-def guess_rcairo_version
-  require 'cairo'
-  Cairo.bindings_version
-end
-
-manifest = File.join(base_dir, "Manifest.txt")
-manifest_contents = []
-base_dir_included_components = %w(AUTHORS COPYING ChangeLog GPL
-                                  NEWS README.doc Rakefile
-                                  extconf.rb pkg-config.rb)
-excluded_components = %w(.cvsignore .gdb_history CVS depend Makefile pkg
-                         .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)
-  if components.size == 1 and !File.directory?(target)
-    next unless base_dir_included_components.include?(components[0])
+def guess_rcairo_version(cairo_ext_dir)
+  version = {}
+  File.open(File.join(cairo_ext_dir, "rb_cairo.h")) do |rb_cairo_h|
+    rb_cairo_h.each_line do |line|
+      case line
+      when /\A#define RB_CAIRO_VERSION_([A-Z]+) (\d+)/
+        version[$1.downcase] = $2
+      end
+    end
   end
-  Find.prune if (excluded_components - components) != excluded_components
-  next if excluded_suffixes.include?(File.extname(target))
-  manifest_contents << target if File.file?(target)
+  [version["major"], version["minor"], version["micro"]].join(".")
 end
 
-File.open(manifest, "w") do |f|
-  f.puts manifest_contents.sort.join("\n")
-end
-
-# For Hoe's no user friendly default behavior. :<
-File.open("README.txt", "w") {|file| file << "= Dummy README\n== XXX\n"}
-FileUtils.cp("NEWS", "History.txt")
-at_exit do
-  FileUtils.rm_f("README.txt")
-  FileUtils.rm_f("History.txt")
-  FileUtils.rm_f(manifest)
-end
-
-ENV["VERSION"] ||= guess_rcairo_version
-version = ENV["VERSION"]
-project = Hoe.spec('cairo') do |project|
-  project.version = version
-  project.rubyforge_name = 'cairo'
+ENV["VERSION"] ||= guess_rcairo_version(cairo_ext_dir)
+version = ENV["VERSION"].dup
+spec = nil
+Jeweler::Tasks.new do |_spec|
+  spec = _spec
+  spec.name = "cairo"
+  spec.version = version
+  spec.rubyforge_project = 'cairo'
+  spec.homepage = 'http://cairographics.org/rcairo'
   authors = File.join(base_dir, "AUTHORS")
-  project.author = File.readlines(authors).collect do |line|
+  spec.authors = File.readlines(authors).collect do |line|
     if /\s*<[^<>]*>$/ =~ line
       $PREMATCH
     else
       nil
     end
   end.compact
-  project.email = ['cairo@cairographics.org']
-  project.summary = 'Ruby bindings for cairo'
-  project.url = 'http://cairographics.org/rcairo'
-  project.test_globs = []
-  project.spec_extras = {
-    :extensions => ['ext/cairo/extconf.rb'],
-    :require_paths => ['lib'],
-    :has_rdoc => false,
-  }
-  project.extra_deps << ['pkg-config', '>= 0']
-  platform = ENV["FORCE_PLATFORM"]
-  project.spec_extras[:platform] = platform if platform
-  news = File.join(base_dir, "NEWS")
-  project.changes = File.read(news).gsub(/\n+^Release(?m:.*)/, '')
-  project.description = "Ruby bindings for cairo"
-  project.need_tar = false
-  project.remote_rdoc_dir = "doc"
+  spec.email = ['cairo@cairographics.org']
+  spec.summary = 'Ruby bindings for cairo'
+  spec.description = "Ruby bindings for cairo"
+  spec.license = "Ruby's"
+  spec.files = FileList["{lib,samples}/**/*.rb",
+                        "ext/**/{*.def,depend,*.rb,*.c,*.h}",
+                        "AUTHORS", "COPYING", "GPL", "Gemfile",
+                        "NEWS", "README.rdoc", "Rakefile"]
+  spec.test_files = FileList["test/**/*.rb"]
 end
 
-project.spec.dependencies.delete_if {|dependency| dependency.name == "hoe"}
+Rake::Task["release"].prerequisites.clear
+Jeweler::RubygemsDotOrgTasks.new do
+end
+
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_tar_gz = true
+end
+
+document_task = Packnga::DocumentTask.new(spec) do |t|
+  t.yard do |yard_task|
+    yard_task.files += FileList["ext/**/*.c"]
+    # yard_task.options += ["--markup", "textile"]
+  end
+end
+
+Packnga::ReleaseTask.new(spec) do |task|
+end
 
 binary_dir = File.join("vendor", "local")
-Rake::ExtensionTask.new("cairo", project.spec) do |ext|
+Rake::ExtensionTask.new("cairo", spec) do |ext|
   ext.cross_compile = true
   ext.cross_compiling do |spec|
     if /mingw|mswin/ =~ spec.platform.to_s
@@ -111,8 +99,7 @@ task 'cross' => "download_windows_binaries"
 def download_windows_binaries(binary_dir)
   base_url = "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/"
   dependencies = [
-                  ["cairo", "1.10.0-1"],
-                  ["cairo-dev", "1.10.0-1"],
+                  ["cairo", "1.10.2-1"],
                   ["libpng", "1.4.3-1"],
                   ["zlib", "1.2.5-2"],
                   ["expat", "2.0.1-1"],
@@ -120,15 +107,24 @@ def download_windows_binaries(binary_dir)
                   ["freetype", "2.4.2-1"],
                  ]
   dependencies.each do |name, version|
-    file_name = "#{name}_#{version}_win32.zip"
-    full_file_name = File.join(binary_dir, file_name)
-    next if File.exist?(full_file_name)
-    open("#{base_url}#{file_name}", "rb") do |input|
-      File.open(full_file_name, "wb") do |output|
-        output.print(input.read)
+    ["", "-dev"].each do |suffix|
+      file_name = "#{name}#{suffix}_#{version}_win32.zip"
+      full_file_name = File.join(binary_dir, file_name)
+      next if File.exist?(full_file_name)
+      open("#{base_url}#{file_name}", "rb") do |input|
+        File.open(full_file_name, "wb") do |output|
+          output.print(input.read)
+        end
       end
+      sh("unzip", "-o", full_file_name, "-d", binary_dir)
+    end
+  end
+  Dir.glob("#{binary_dir}/lib/pkgconfig/*.pc") do |pc_path|
+    pc = File.read(pc_path)
+    pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{File.expand_path(binary_dir)}"}
+    File.open(pc_path, "w") do |pc_file|
+      pc_file.print(pc)
     end
-    sh("unzip", full_file_name, "-d", binary_dir)
   end
 end
 
@@ -140,17 +136,10 @@ task "download_windows_binaries" do
   end
 end
 
-# fix Hoe's incorrect guess.
-project.spec.executables.clear
-
-task(:release).prerequisites.reject! {|name| name == "clean"}
-task(:release_to_rubyforge).prerequisites.reject! {|name| name == "clean"}
-
 # for releasing
-task :dist => [:docs] do
+task :dist do
   sh "./dist.sh", version
 end
-task :gem => [:docs]
 
 # for documentation
 langs = [

data/ext/cairo/cairo.def

@@ -51,7 +51,7 @@ EXPORTS
     rb_cCairo_GLDevice        DATA
     rb_cCairo_ScriptDevice    DATA
     rb_cCairo_XCBDevice       DATA
-    rb_cCairo_XlibtDevice     DATA
+    rb_cCairo_XlibDevice      DATA
     rb_cCairo_XMLDevice       DATA
 
     rb_mCairo_Operator        DATA

data/ext/cairo/depend

@@ -0,0 +1,2 @@
+install-so:
+	$(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYARCHDIR)

data/ext/cairo/extconf.rb

@@ -34,11 +34,13 @@ checking_for(checking_message("Win32 OS")) do
     import_library_name = "libruby-#{module_name}.a"
     $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
     $cleanfiles << import_library_name
-    binary_base_dir = base_dir + "vendor" + "local"
-    $CFLAGS += " -I#{binary_base_dir}/include"
-    pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-    PKGConfig.add_path(pkg_config_dir.to_s)
-    PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+    if with_config('vendor-override', true)
+      binary_base_dir = base_dir + "vendor" + "local"
+      $CFLAGS += " -I#{binary_base_dir}/include"
+      pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
+      PKGConfig.add_path(pkg_config_dir.to_s)
+      PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+    end
     true
   else
     false

data/ext/cairo/rb_cairo.c

@@ -76,7 +76,10 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (10), INT2FIX (0), Qnil));
+                                INT2FIX (RB_CAIRO_VERSION_MAJOR),
+                                INT2FIX (RB_CAIRO_VERSION_MINOR),
+                                INT2FIX (RB_CAIRO_VERSION_MICRO),
+                                Qnil));
 
   rb_define_module_function (rb_mCairo, "satisfied_version?",
                              rb_cairo_satisfied_version, -1);

data/ext/cairo/rb_cairo.h

@@ -71,6 +71,10 @@ RB_CAIRO_BEGIN_DECLS
 #  define RB_CAIRO_VAR extern
 #endif
 
+#define RB_CAIRO_VERSION_MAJOR 1
+#define RB_CAIRO_VERSION_MINOR 10
+#define RB_CAIRO_VERSION_MICRO 1
+
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
 RB_CAIRO_VAR VALUE rb_cCairo_Point;

data/ext/cairo/rb_cairo_constants.c

@@ -41,7 +41,11 @@ VALUE rb_mCairo_MimeType = Qnil;
 VALUE rb_mCairo_RegionOverlap = Qnil;
 
 #define CAIRO_OPERATOR_MIN CAIRO_OPERATOR_CLEAR
-#define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+#  define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_HSL_LUMINOSITY
+#else
+#  define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
+#endif
 
 #define CAIRO_ANTIALIAS_MIN CAIRO_ANTIALIAS_DEFAULT
 #define CAIRO_ANTIALIAS_MAX CAIRO_ANTIALIAS_SUBPIXEL
@@ -80,7 +84,7 @@ VALUE rb_mCairo_RegionOverlap = Qnil;
 #define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
 
 #define CAIRO_EXTEND_MIN CAIRO_EXTEND_NONE
-#define CAIRO_EXTEND_MAX CAIRO_EXTEND_REFLECT
+#define CAIRO_EXTEND_MAX CAIRO_EXTEND_PAD
 
 #define CAIRO_FILTER_MIN CAIRO_FILTER_FAST
 #define CAIRO_FILTER_MAX CAIRO_FILTER_GAUSSIAN