cairo 1.15.9 → 1.15.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe2015411b6f8596221ee25cbab4b10c0d7c63e
-  data.tar.gz: ec47b23e02310bb52c3f2e9b1c715f0daabe4458
+  metadata.gz: e98d253ecf1026eae9b0e632d7da4e96eb8c1b56
+  data.tar.gz: 168a50409bfc3cca15329ea0352652b3bbbc9b32
 SHA512:
-  metadata.gz: 585166feb480e97329db7e8e0570ff6b144f8aa341594b76deb87b4570bfe5c6308edd479cfe5917a5ccfc2d1a16209fe5068f5f9cf7c6a57d3b06b1c235fd10
-  data.tar.gz: c3f958f8f7e84dbac5eb0d6c9fedd129e838433676f30922c22e1dbb92daf8de5879abc8ccb5389f87d97b92d8b4755f4a41e97984af1ffbbbc7ab0e028e7b0e
+  metadata.gz: b59c0c32c42824aad114dc98078e99079d1919607d708e3435e4397a063199be01d2a10e0d734635724e6cc8688f478a877338d7b76895adf04fa73d9c638632
+  data.tar.gz: eee06bf5b91c207838c2ba8c2c285a3f523275d75afbc2c9cc7c16f11a139938c4f7354a324c43ab3eb65d8a238681ab62c76eb8c15b820e44f90a3f094a7c52

data/NEWS

@@ -1,3 +1,23 @@
+Release 1.15.10 (2017-10-15) Kouhei Sutou <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Windows: Ensure setting PATH environment variable.
+
+  * Added cairo 1.15.8 support.
+
+  * Windows: Updated bundled libraries:
+
+    * libpng: 1.6.29 -> 1.6.32
+
+    * freetype: 2.9.4 -> 2.9.6
+
+    * fontconfig: 2.12.1 -> 2.12.4
+
+    * cairo: 1.15.4 -> 1.15.8
+
 Release 1.15.9 (2017-06-03) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/Rakefile

@@ -444,6 +444,8 @@ end
 
 windows_task = WindowsTask.new(spec) do |task|
   zlib_version = "1.2.11"
+  libpng_version = "1.6.32"
+  freetype_version = "2.8.1"
   task.packages = [
     {
       # We should use the same version as Ruby Installer.
@@ -458,16 +460,16 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.29",
-      :download_base_url => "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.29",
+      :version => libpng_version,
+      :download_base_url => "https://downloads.sourceforge.net/project/libpng/libpng16/#{libpng_version}",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
     },
     {
       :name => "freetype",
-      :version => "2.7.1",
-      :download_base_url => "https://downloads.sourceforge.net/project/freetype/freetype2/2.7.1",
+      :version => freetype_version,
+      :download_base_url => "https://downloads.sourceforge.net/project/freetype/freetype2/#{freetype_version}",
       :compression_method => "bz2",
       :windows => {
         :built_file => "bin/libfreetype-7.dll",
@@ -475,7 +477,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libxml2",
-      :version => "2.9.4",
+      :version => "2.9.6",
       :download_base_url => "ftp://xmlsoft.org/libxml2",
       :compression_method => "gz",
       :windows => {
@@ -487,7 +489,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "fontconfig",
-      :version => "2.12.1",
+      :version => "2.12.4",
       :download_base_url => "https://www.freedesktop.org/software/fontconfig/release",
       :compression_method => "bz2",
       :windows => {
@@ -509,7 +511,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.15.4",
+      :version => "1.15.8",
       :download_site => :cairo_snapshots,
       :windows => {
         :built_file => "bin/libcairo-2.dll",

data/ext/cairo/rb_cairo.h

@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 15
-#define RB_CAIRO_VERSION_MICRO 9
+#define RB_CAIRO_VERSION_MICRO 10
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/lib/cairo.rb

@@ -9,12 +9,12 @@ if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
     begin
       require "ruby_installer/runtime"
     rescue LoadError
-      ENV["PATH"] = %w(bin lib).collect do |dir|
-        "#{base_dir}\\#{dir};"
-      end.join("") + ENV["PATH"]
     else
       RubyInstaller::Runtime.add_dll_directory("#{base_dir}\\bin")
     end
+    ENV["PATH"] = %w(bin lib).collect do |dir|
+      "#{base_dir}\\#{dir};"
+    end.join("") + ENV["PATH"]
   else
     require "rbconfig"
     ENV["PATH"] = %w(bin lib).collect do |dir|

data/test/cairo-test-utils.rb

@@ -11,12 +11,16 @@ module CairoTestUtils
     end
   end
 
-  def only_win32
-    omit("Only for Win32 platform") unless win32
+  def only_windows
+    omit("Only for Windows platform") unless windows?
   end
 
-  def win32?
-    /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM) ? true : false
+  def only_not_windows
+    omit("Only for not Windows platform") if windows?
+  end
+
+  def windows?
+    /cygwin|mingw|mswin|bccwin/ === RUBY_PLATFORM
   end
 
   def quartz?

data/test/test_context.rb

@@ -74,7 +74,7 @@ class ContextTest < Test::Unit::TestCase
     face = context.font_face
     default_font_family = ""
     default_font_family = "Helvetica" if quartz?
-    default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if windows?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],

data/test/test_font_face.rb

@@ -55,7 +55,7 @@ class FontFaceTest < Test::Unit::TestCase
     face = Cairo::ToyFontFace.new
     default_font_family = ""
     default_font_family = "Helvetica" if quartz?
-    default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if windows?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],

data/test/test_recording_surface.rb

@@ -6,6 +6,7 @@ class RecordingSurfaceTest < Test::Unit::TestCase
   end
 
   def test_new
+    only_not_windows
     only_cairo_version(1, 12, 0)
     surface = Cairo::RecordingSurface.new(10, 20, 300, 400)
     assert_equal([0.0, 0.0, 0.0, 0.0], surface.ink_extents)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.15.9
+  version: 1.15.10
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for cairo