cairo 1.14.3 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6352c8474409a3dc77b667c482f645d9f6eb6e
-  data.tar.gz: 3a756185b5816b5a8c11951835fc7cb5115ffd70
+  metadata.gz: e6a841e03b059ec2f53d5f5d639f799b01fc3f97
+  data.tar.gz: f2286b521dc84d2fc6b4d95f19101292233bde2f
 SHA512:
-  metadata.gz: 08c3ee47ccb9e4ca12d9577f51ec49028581151576c5f83711fa9d4564832bcb89f501b7e557147d5a795856dedb25bf11356858419bb55c24554dce8226ce75
-  data.tar.gz: 81828f7139acf3d451aed3f3f95ee50343d289e1a21320be756e236e61364a8d1a8914cbadc409cba43901f28e790cd1363b3a6f3a8c5c6e42da93c90a18abe5
+  metadata.gz: ebcbdc4695496430894c1cdd42c166092ea8b7df68b15aaa5bf9b9c804985442f75a10fdd5461904c45c7f80ff315ed127c9a65941e7503c0903215d833edb6f
+  data.tar.gz: 2f0b4693cf680b3773edd545d2168d40f6a0c380b71ceebef86e9a9e7fb4b42ebc29440c1a4787b57c897cd659924b75e033e8d856e8574a3898b7af37b0c27d

data/NEWS

@@ -1,3 +1,14 @@
+Release 1.15.2 (2016-04-02) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Supported cairo 1.15.2.
+  * Cairo::Win32Surface.new(hdc, format): Added.
+  * Dropped Ruby 2.0 support.
+  * Windows: Supported Ruby 2.3.
+
 Release 1.14.3 (2015-09-08) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/Rakefile

@@ -116,7 +116,9 @@ class Package < Struct.new(:name,
   def download_site_base_url
     case download_site
     when :cairo
-      base_url = "http://cairographics.org/releases"
+      base_url = "https://cairographics.org/releases"
+    when :cairo_snapshots
+      base_url = "https://cairographics.org/snapshots"
     when :gnome
       base_url = "http://ftp.gnome.org/pub/gnome/sources"
       release_series = version.gsub(/\A(\d+\.\d+).+\z/, '\1')
@@ -441,7 +443,7 @@ windows_task = WindowsTask.new(spec) do |task|
     {
       :name => "zlib",
       :version => "1.2.8",
-      :download_base_url => "http://sourceforge.net/projects/libpng/files/zlib/1.2.8",
+      :download_base_url => "http://downloads.sourceforge.net/project/libpng/zlib/1.2.8",
       :compression_method => "gz",
       :windows => {
         :builder => ZlibBuilder.new,
@@ -450,16 +452,16 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.18",
-      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.18",
+      :version => "1.6.23",
+      :download_base_url => "http://downloads.sourceforge.net/project/libpng/libpng16/1.6.23",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
     },
     {
       :name => "freetype",
-      :version => "2.6",
-      :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.6",
+      :version => "2.6.3",
+      :download_base_url => "http://downloads.sourceforge.net/project/freetype/freetype2/2.6.3",
       :compression_method => "bz2",
       :windows => {
         :built_file => "bin/libfreetype-6.dll",
@@ -484,7 +486,7 @@ windows_task = WindowsTask.new(spec) do |task|
     {
       :name => "fontconfig",
       :version => "2.11.1",
-      :download_base_url => "http://www.freedesktop.org/software/fontconfig/release",
+      :download_base_url => "https://www.freedesktop.org/software/fontconfig/release",
       :compression_method => "bz2",
       :windows => {
         :built_file => "bin/libfontconfig-1.dll",
@@ -509,7 +511,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.14.2",
+      :version => "1.14.6",
       :download_site => :cairo,
       :windows => {
         :built_file => "bin/libcairo-2.dll",
@@ -534,7 +536,7 @@ namespace :vm do
       architectures.each do |architecture|
         desc "Build all packages for Windows #{architecture}"
         task_name = "win#{architecture}"
-        build_tasks << task_name
+        build_tasks << "vm:windows:build:#{task_name}"
         task task_name do
           cd("build") do
             sh("vagrant", "destroy", "--force", task_name)

data/ext/cairo/rb_cairo.h

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

data/ext/cairo/rb_cairo_font_options.c

@@ -96,6 +96,9 @@ cr_options_merge (VALUE self, VALUE other)
 static VALUE
 cr_options_equal (VALUE self, VALUE other)
 {
+  if (!rb_cairo__is_kind_of (other, rb_cCairo_FontOptions))
+    return Qfalse;
+
   return CBOOL2RVAL (cairo_font_options_equal (_SELF (self), _SELF (other)));
 }
 
@@ -168,12 +171,13 @@ Init_cairo_font_options (void)
     rb_define_class_under (rb_mCairo, "FontOptions", rb_cObject);
 
   rb_define_alloc_func (rb_cCairo_FontOptions, cr_options_allocate);
-  
+
   rb_define_method (rb_cCairo_FontOptions, "initialize", cr_options_create, 0);
 
   rb_define_method (rb_cCairo_FontOptions, "dup", cr_options_copy, 0);
   rb_define_method (rb_cCairo_FontOptions, "merge!", cr_options_merge, 1);
   rb_define_alias (rb_cCairo_FontOptions, "update", "merge!");
+  rb_define_method (rb_cCairo_FontOptions, "==", cr_options_equal, 1);
   rb_define_method (rb_cCairo_FontOptions, "eql?", cr_options_equal, 1);
   rb_define_method (rb_cCairo_FontOptions, "hash", cr_options_hash, 0);
   rb_define_method (rb_cCairo_FontOptions, "set_antialias",

data/ext/cairo/rb_cairo_surface.c

@@ -1232,11 +1232,34 @@ cr_win32_surface_initialize (int argc, VALUE *argv, VALUE self)
       surface = cairo_win32_surface_create (NUM2PTR (hdc));
       break;
     case 2:
-      width = arg1;
-      height = arg2;
-      surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
-                                                     NUM2INT (width),
-                                                     NUM2INT (height));
+#  if CAIRO_CHECK_VERSION(1, 11, 4)
+#    define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB30
+#  else
+#    define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
+#  endif
+      if (CAIRO_FORMAT_ARGB32 <= NUM2INT (arg2) &&
+          NUM2INT (arg2) <= CAIRO_FORMAT_MAX)
+        {
+#  if CAIRO_CHECK_VERSION(1, 15, 2)
+          hdc = arg1;
+          format = arg2;
+          surface =
+            cairo_win32_surface_create_with_format (NUM2PTR (hdc),
+                                                    RVAL2CRFORMAT (format));
+#  else
+          rb_raise (rb_eArgError,
+                    "Cairo::Win32Surface.new(hdc, format) "
+                    "is available since cairo >= 1.15.2");
+#  endif
+        }
+      else
+        {
+          width = arg1;
+          height = arg2;
+          surface = cairo_win32_surface_create_with_dib (CAIRO_FORMAT_ARGB32,
+                                                         NUM2INT (width),
+                                                         NUM2INT (height));
+        }
       break;
     case 3:
       if (NIL_P (arg1) ||

data/test/test_font_options.rb

@@ -7,7 +7,52 @@ class FontOptionsTest < Test::Unit::TestCase
     @options = Cairo::FontOptions.new
   end
 
-  def test_something
-    # WRITE ME!
+  sub_test_case "#==" do
+    test "not FontOptions" do
+      assert do
+        !(@options == nil)
+      end
+    end
+
+    test "same object" do
+      assert do
+        @options == @options
+      end
+    end
+
+    test "same content" do
+      assert do
+        @options == @options.dup
+      end
+    end
+  end
+
+  sub_test_case "#eql? and #hash" do
+    test "not FontOptions" do
+      object = Object.new
+      options = @options
+      object.singleton_class.__send__(:define_method, :hash) do
+        options.hash
+      end
+
+      hash = {
+        object => :value,
+      }
+      assert_nil(hash[@options])
+    end
+
+    test "same object" do
+      hash = {
+        @options => :value,
+      }
+      assert_equal(:value, hash[@options])
+    end
+
+    test "same content" do
+      hash = {
+        @options => :value,
+      }
+      assert_equal(:value, hash[@options.dup])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -201,29 +201,28 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for cairo
 test_files:
+- test/test_quartz_image_surface.rb
+- test/test_image_surface.rb
+- test/test_paper.rb
+- test/test_constants.rb
 - test/test_context.rb
+- test/test_text_extents.rb
+- test/test_color.rb
+- test/test_scaled_font.rb
+- test/test_text_to_glyphs_data.rb
+- test/test_region.rb
 - test/test_surface.rb
-- test/test_constants.rb
+- test/test_recording_surface.rb
+- test/test_script_device.rb
 - test/test_text_cluster.rb
-- test/cairo-test-utils.rb
 - test/test_script_surface.rb
-- test/test_color.rb
-- test/test_text_extents.rb
-- test/test_quartz_image_surface.rb
-- test/test_paper.rb
+- test/test_font_extents.rb
+- test/test_tee_surface.rb
 - test/test_raster_source_pattern.rb
-- test/test_region.rb
-- test/test_script_device.rb
-- test/test_font_face.rb
-- test/test_recording_surface.rb
-- test/test_scaled_font.rb
 - test/test_xml_surface.rb
-- test/run-test.rb
-- test/test_image_surface.rb
-- test/test_font_options.rb
-- test/test_tee_surface.rb
-- test/test_font_extents.rb
-- test/test_xml_device.rb
 - test/test_exception.rb
-- test/test_text_to_glyphs_data.rb
-has_rdoc: 
+- test/test_xml_device.rb
+- test/test_font_face.rb
+- test/test_font_options.rb
+- test/run-test.rb
+- test/cairo-test-utils.rb