cairo 1.12.9-x86-mingw32 → 1.14.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95cad002f4b037e88d556ed364319b036ab73774
-  data.tar.gz: e311b379d3cca8ae09290f6a6853160f0b6b84ac
+  metadata.gz: 2dd3e49755906b08aed379c487bb7e7565927f35
+  data.tar.gz: 6e7539a6e2b6f373901fdb4b935070f23ca70c97
 SHA512:
-  metadata.gz: 627f0a7065903eba9ff54e6fd27e74a5afe63b75619563220fe89c8796263bae1f6b73ae07adb1ccba90457773db39683fc60b8e21054c6953eef9980eff7281
-  data.tar.gz: 019c64c84064e5315ca9021df33d5f332b98ca7d52feb071640ac0ecb7bd8d50f897c33573525b58e933f8c9b46452933d9139606f97148eb15e1da346d85618
+  metadata.gz: 8912265da6be8a29b6a9631dca4861d0d215ddc8314cdda7f699cffbfaa52724def46a07799261d00295f687656a16cd8f3aee4bfff4dd20f05e8d12f9eecdd1
+  data.tar.gz: 79987f96dd98ed445a25327f9ebfa06fa1cf122af2b8c8b5f9bcd590ecdee6dd5ccab3265ea03df4fd6c45ac9eef1c2e0e638a1681a0f2cd7d97ad37a30de089

data/NEWS

@@ -1,3 +1,29 @@
+Release 1.14.0 (2014-11-24) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Supported integration with ffi gem.
+    [GitHub#20][Patch by Patrick Hanevold]
+  * Supported cairo 1.14.0.
+    [GitHub#24][GitHub#25][GitHub#28][GitHub#30][Patch by Hiroshi Hatake]
+  * Added libstdc++-6.dll into gem for Windows.
+
+Fixes
+-----
+
+  * Fixed an build error on Cygwin.
+    [GitHub#19][Reported by Patrick Hanevold][Patch by Masafumi Yokoyama]
+    [ruby-gnome2-devel-en][Reported by Detlef Reichl]
+
+Thanks
+------
+
+  * Patrick Hanevold
+  * Masafumi Yokoyama
+  * Hiroshi Hatake
+
 Release 1.12.9 (2014-04-05) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 
@@ -7,6 +33,7 @@ Improvements
   * Supported cocoa gem. [Patch by Patrick Hanevold]
   * Made Cairo::Rectangle based on cairo_rectangle_int_t. It improves
     Ruby/GDK3 integration.
+  * windows: Dropped binary packages support for Ruby 1.9.3.
 
 Fixes
 -----

data/README.rdoc

@@ -12,7 +12,7 @@ http://cairographics.org/
 
 == Dependencies
 
-* ruby >= 1.9.3 (2.0.0 also supported!)
+* ruby >= 1.9.3 (2.2 also supported!)
 * cairo >= 1.2.0 (1.12.0 also supported!)
 
 == Install
@@ -38,11 +38,11 @@ Compiling:
   % 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.
+                       # 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:
 
@@ -67,7 +67,7 @@ cairo-X.Y.Z-x86-mingw32.gem includes cairo related binaries.
 == Documents
 
 * Reference manual:
-  http://cairo.rubyforge.org/doc/
+  http://rcairo.github.io/doc/
 * Repository of the reference manual:
   http://github.com/rcairo/doc
 * An article for rcairo on Rubyst Magazine a.k.a. RubiMa (in Japanese):

data/Rakefile

@@ -1,21 +1,21 @@
 # -*- coding: utf-8; mode: ruby -*-
 
-require 'English'
-
-require 'find'
-require 'fileutils'
-require 'open-uri'
-require 'rubygems'
-require 'rubygems/package_task'
-require 'yard'
-require 'bundler/gem_helper'
-require 'rake/extensiontask'
-require 'packnga'
+require "English"
+
+require "find"
+require "fileutils"
+require "open-uri"
+require "rubygems"
+require "rubygems/package_task"
+require "yard"
+require "bundler/gem_helper"
+require "rake/extensiontask"
+require "packnga"
 
 base_dir = File.join(File.dirname(__FILE__))
 
-cairo_ext_dir = File.join(base_dir, 'ext', 'cairo')
-cairo_lib_dir = File.join(base_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']}"
@@ -29,14 +29,24 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 Packnga::DocumentTask.new(spec) do |task|
+  task.original_language = "en"
+  task.translate_languages = ["ja"]
 end
 
 Packnga::ReleaseTask.new(spec) do |task|
 end
 
+module RCairoBuild
+  class << self
+    def for_64bit?
+      ENV["RCAIRO_WINDOWS_64"] == "yes"
+    end
+  end
+end
+
 binary_dir = File.join("vendor", "local")
 Rake::ExtensionTask.new("cairo", spec) do |ext|
-  if ENV["RCAIRO_WINDOWS_64"] == "yes"
+  if RCairoBuild.for_64bit?
     ext.cross_platform = ["x64-mingw32"]
   else
     ext.cross_platform = ["x86-mingw32"]
@@ -135,7 +145,7 @@ class Package < Struct.new(:name,
     end
 
     def build_host
-      if ENV["RCAIRO_WINDOWS_64"] == "yes"
+      if RCairoBuild.for_64bit?
         "x86_64-w64-mingw32"
       else
         "i686-w64-mingw32"
@@ -190,9 +200,21 @@ class WindowsTask
           directory binary_path.to_s
           desc "Bundle GCC related DLLs"
           task :bundle => binary_path do
-            dll_names = ["libgcc_s_sjlj-1.dll", "libwinpthread-1.dll"]
+            dll_names = [
+              "libstdc++-6.dll",
+              "libwinpthread-1.dll",
+              "libgcc_s_sjlj-1.dll",
+              "libgcc_s_seh-1.dll",
+            ]
             dll_names.each do |dll_name|
-              cp(absolete_gcc_dll_path(dll_name), binary_path)
+              destination_path = binary_path + dll_name
+              dll_path = absolete_gcc_dll_path(dll_name)
+              unless File.exist?(dll_path)
+                puts("#{dll_name} doesn't exist.")
+                next
+              end
+              cp(dll_path, destination_path)
+              chmod(0755, destination_path)
             end
           end
         end
@@ -227,6 +249,7 @@ class WindowsTask
   end
 
   def download(package, archive_path)
+    rake_output_message "Downloading... #{package.archive_url}"
     open(package.archive_url) do |downloaded_archive|
       begin
         archive_path.open("wb") do |archive_file|
@@ -379,7 +402,11 @@ class WindowsTask
   end
 
   def ruby_gnome2_dir
-    @base_dir.parent + "ruby-gnome2.win32"
+    if RCairoBuild.for_64bit?
+      @base_dir.parent + "ruby-gnome2.win64"
+    else
+      @base_dir.parent + "ruby-gnome2.win32"
+    end
   end
 
   def ruby_glib2_pkg_config_path
@@ -423,8 +450,8 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.10",
-      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.10",
+      :version => "1.6.14",
+      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.14",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
@@ -440,7 +467,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libxml2",
-      :version => "2.9.1",
+      :version => "2.9.2",
       :download_base_url => "ftp://xmlsoft.org/libxml2",
       :compression_method => "gz",
       :windows => {
@@ -448,6 +475,10 @@ windows_task = WindowsTask.new(spec) do |task|
         :configure_args => [
           "--without-python",
         ],
+        :patches => [
+          "remove-empty-z_dir-ldflags.diff",
+        ],
+        :need_autoreconf => true,
       },
     },
     {
@@ -469,7 +500,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "pixman",
-      :version => "0.32.4",
+      :version => "0.32.6",
       :download_site => :cairo,
       :compression_method => "gz",
       :windows => {
@@ -478,13 +509,17 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.12.16",
+      :version => "1.14.0",
       :download_site => :cairo,
       :windows => {
         :built_file => "bin/libcairo-2.dll",
         :configure_args => [
           "--enable-gobject",
         ],
+        :patches => [
+          "cairo-1.14-missing-exeext-float-m4.diff"
+        ],
+        :need_autoreconf => true,
       },
     },
   ]
@@ -569,3 +604,17 @@ langs.each do |lang,|
     rm Dir[File.join(lang_doc_dir, "*.{rd,rdc,rbl}")]
   end
 end
+
+file "Makefile" => ["extconf.rb", "ext/cairo/extconf.rb"] do
+  ruby("extconf.rb")
+end
+
+desc "Configure"
+task :configure => "Makefile"
+
+desc "Run test"
+task :test => :configure do
+  ruby("test/run-test.rb")
+end
+
+task :default => :test

data/ext/cairo/extconf.rb

@@ -29,13 +29,13 @@ major, minor, micro = 1, 2, 0
 base_dir = Pathname(__FILE__).dirname.parent.parent
 checking_for(checking_message("Win32 OS")) do
   case RUBY_PLATFORM
-  when /cygwin|mingw|mswin32/
+  when /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
-    if with_config('vendor-override', true)
-      binary_base_dir = base_dir + "vendor" + "local"
+    binary_base_dir = base_dir + "vendor" + "local"
+    if with_config('vendor-override', binary_base_dir.exist?)
       $CFLAGS += " -I#{binary_base_dir}/include"
       pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
       PKGConfig.add_path(pkg_config_dir.to_s)

data/ext/cairo/rb_cairo.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2014 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -72,8 +72,8 @@ RB_CAIRO_BEGIN_DECLS
 #endif
 
 #define RB_CAIRO_VERSION_MAJOR 1
-#define RB_CAIRO_VERSION_MINOR 12
-#define RB_CAIRO_VERSION_MICRO 9
+#define RB_CAIRO_VERSION_MINOR 14
+#define RB_CAIRO_VERSION_MICRO 0
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_constants.c

@@ -651,6 +651,14 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_MimeType, "UNIQUE_ID",
                    rb_str_new2 (CAIRO_MIME_TYPE_UNIQUE_ID));
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+  rb_define_const (rb_mCairo_MimeType, "JBIG2",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JBIG2));
+  rb_define_const (rb_mCairo_MimeType, "JBIG2_GLOBAL",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JBIG2_GLOBAL));
+  rb_define_const (rb_mCairo_MimeType, "JBIG2_GLOBAL_ID",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID));
+#endif
 
 #if CAIRO_CHECK_VERSION(1, 10, 0)
   rb_mCairo_RegionOverlap = rb_define_module_under (rb_mCairo, "RegionOverlap");

data/ext/cairo/rb_cairo_context.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 13:52:08 $
  *
- * Copyright 2005-2010 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -129,6 +129,51 @@ cr_destroy_with_destroy_check (VALUE self)
   return Qnil;
 }
 
+static VALUE
+cr_s_wrap (VALUE self, VALUE pointer)
+{
+  VALUE result;
+  VALUE rb_cr;
+  cairo_t *cr;
+
+  if (NIL_P (rb_cairo__cFFIPointer))
+    {
+      rb_raise (rb_eNotImpError,
+                "%s: FFI::Pointer is required",
+                rb_id2name (rb_frame_this_func ()));
+    }
+
+  if (!RTEST (rb_obj_is_kind_of (pointer, rb_cairo__cFFIPointer)))
+    {
+      rb_raise (rb_eArgError,
+                "must be FFI::Pointer: %s",
+                rb_cairo__inspect (pointer));
+    }
+
+  {
+    VALUE rb_cr_address;
+    rb_cr_address = rb_funcall (pointer, rb_intern ("address"), 0);
+    cr = NUM2PTR (rb_cr_address);
+    cr_check_status (cr);
+  }
+
+  rb_cr = rb_obj_alloc (self);
+  cairo_reference (cr);
+  DATA_PTR (rb_cr) = cr;
+  rb_ivar_set (rb_cr, cr_id_surface, Qnil);
+
+  if (rb_block_given_p ())
+    {
+      result = rb_ensure (rb_yield, rb_cr, cr_destroy_with_destroy_check, rb_cr);
+    }
+  else
+    {
+      result = rb_cr;
+    }
+
+  return result;
+}
+
 static VALUE
 cr_initialize (VALUE self, VALUE target)
 {
@@ -138,6 +183,7 @@ cr_initialize (VALUE self, VALUE target)
   cr = cairo_create (RVAL2CRSURFACE (target));
   cr_check_status (cr);
   rb_ivar_set (self, cr_id_surface, target);
+  rb_ivar_set (self, cr_id_source, Qnil);
   if (rb_ivar_defined (target, rb_cairo__io_id_output))
     cr_set_user_data (cr,
                       &cr_object_holder_key,
@@ -149,6 +195,17 @@ cr_initialize (VALUE self, VALUE target)
   return result;
 }
 
+static VALUE
+cr_to_ptr (VALUE self)
+{
+  if (NIL_P (rb_cairo__cFFIPointer))
+    return Qnil;
+
+  return rb_funcall (rb_cairo__cFFIPointer, rb_intern ("new"),
+                     1, PTR2NUM (_SELF));
+}
+
+
 static VALUE
 cr_restore (VALUE self)
 {
@@ -1526,6 +1583,9 @@ Init_cairo_context (void)
   rb_cairo__initialize_gc_guard_holder_class (rb_cCairo_Context);
   rb_set_end_proc(cr_destroy_all_guarded_contexts_at_end, Qnil);
 
+  /* For integrate other libraries such as a FFI based library. */
+  rb_define_singleton_method (rb_cCairo_Context, "wrap", cr_s_wrap, 1);
+
   /* Functions for manipulating state objects */
   rb_define_method (rb_cCairo_Context, "initialize", cr_initialize, 1);
   rb_define_method (rb_cCairo_Context, "destroy", cr_destroy, 0);
@@ -1675,5 +1735,7 @@ Init_cairo_context (void)
   rb_define_method (rb_cCairo_Context, "copy_path_flat", cr_copy_path_flat, 0);
   rb_define_method (rb_cCairo_Context, "append_path", cr_copy_append_path, 1);
 
+  rb_define_method (rb_cCairo_Context, "to_ptr", cr_to_ptr, 0);
+
   RB_CAIRO_DEF_SETTERS (rb_cCairo_Context);
 }

data/ext/cairo/rb_cairo_exception.c

@@ -61,6 +61,9 @@ static VALUE rb_eCairo_DeviceError;
 static VALUE rb_eCairo_InvalidMeshConstruction;
 static VALUE rb_eCairo_DeviceFinished;
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+static VALUE rb_eCairo_JBIG2GlobalMissing;
+#endif
 
 void
 rb_cairo_check_status (cairo_status_t status)
@@ -192,6 +195,11 @@ rb_cairo_check_status (cairo_status_t status)
       rb_raise (rb_eCairo_DeviceFinished, "%s", string);
       break;
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+    case CAIRO_STATUS_JBIG2_GLOBAL_MISSING:
+      rb_raise (rb_eCairo_JBIG2GlobalMissing, "%s", string);
+      break;
+#endif
 #if CAIRO_CHECK_VERSION(1, 10, 0)
     case CAIRO_STATUS_LAST_STATUS:
 #else
@@ -285,6 +293,10 @@ rb_cairo__exception_to_status (VALUE exception)
   else if (rb_cairo__is_kind_of (exception, rb_eCairo_DeviceError))
     return CAIRO_STATUS_DEVICE_ERROR;
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+  else if (rb_cairo__is_kind_of (exception, rb_eCairo_JBIG2GlobalMissing))
+    return CAIRO_STATUS_JBIG2_GLOBAL_MISSING;
+#endif
 
   return -1;
 }
@@ -426,4 +438,9 @@ Init_cairo_exception ()
     rb_define_class_under (rb_mCairo, "DeviceFinished",
                            rb_eCairo_Error);
 #endif
+#if CAIRO_CHECK_VERSION(1, 14, 0)
+  rb_eCairo_JBIG2GlobalMissing =
+    rb_define_class_under (rb_mCairo, "JBIG2GlobalMissing",
+                           rb_eCairo_Error);
+#endif
 }