cairo 1.15.9-x64-mingw32 → 1.15.10-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9628b453119ca047558822f51b5d344e9bba3f19
-  data.tar.gz: 4c346e96472eb43dfdd199592915265491ff3057
+  metadata.gz: e9842651100d20901318ea528bd64fcfd538cb05
+  data.tar.gz: 659ae87499b2cec88ab043b0d5502395e88396f8
 SHA512:
-  metadata.gz: f80adb90ddc12dba5552cdbf07840b02e9a5bbdb530c539101907c036fb47becf3b69541c4714c72c4055a5a05e2a958bcefbfff4ba9f91911a2c9c2dcd4864f
-  data.tar.gz: 20909541b35815235fc2d3dd2dc4e94828e4a6695d4970ce9053bd7c82cdad4be54ca111a356764f7c367d21b472ef1d57d7f6eceb7a331003f4d0f587c4fd23
+  metadata.gz: 3105c9ddf41febe4223b5bde59ee9c2939e0c0ec6a85e0137056255544c12092d702e483553fcd87e23abf22c9e832c60cc4802c64889a0f65651007d2655b01
+  data.tar.gz: 782be3215eb7420f47c6b3f193bfaf6a9591709ce1ca76b8745dacf9f7bba59433a101767f0faf47e0fd8afc6844023394be79f6137d5c502ddb9395303dc7c5

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)

data/vendor/local/bin/freetype-config

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright 2000-2016 by
+# Copyright 2000-2017 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -12,11 +12,55 @@
 LC_ALL=C
 export LC_ALL
 
-prefix="/home/vagrant/rcairo.win64/vendor/local"
-exec_prefix="/home/vagrant/rcairo.win64/vendor/local"
-exec_prefix_set="no"
-includedir="/home/vagrant/rcairo.win64/vendor/local/include"
-libdir="/home/vagrant/rcairo.win64/vendor/local/lib"
+
+# if `pkg-config' is available, use values from `freetype2.pc'
+/usr/bin/pkg-config --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
+if test $? -eq 0 ; then
+  # note that option `--variable' is not affected by the
+  # PKG_CONFIG_SYSROOT_DIR environment variable
+  if test "x$SYSROOT" != "x" ; then
+    PKG_CONFIG_SYSROOT_DIR="$SYSROOT"
+    export PKG_CONFIG_SYSROOT_DIR
+  fi
+
+  prefix=`/usr/bin/pkg-config --variable prefix freetype2`
+  exec_prefix=`/usr/bin/pkg-config --variable exec_prefix freetype2`
+
+  includedir=`/usr/bin/pkg-config --variable includedir freetype2`
+  libdir=`/usr/bin/pkg-config --variable libdir freetype2`
+
+  version=`/usr/bin/pkg-config --modversion freetype2`
+
+  cflags=`/usr/bin/pkg-config --cflags freetype2`
+  dynamic_libs=`/usr/bin/pkg-config --libs freetype2`
+  static_libs=`/usr/bin/pkg-config --static --libs freetype2`
+else
+  prefix="/home/vagrant/rcairo.win64/vendor/local"
+  exec_prefix="/home/vagrant/rcairo.win64/vendor/local"
+
+  includedir="/home/vagrant/rcairo.win64/vendor/local/include"
+  libdir="/home/vagrant/rcairo.win64/vendor/local/lib"
+
+  version=21.0.15
+
+  cflags="-I${SYSROOT}$includedir/freetype2"
+  dynamic_libs="-lfreetype"
+  static_libs="-lfreetype -L/home/vagrant/rcairo.win64/vendor/local/lib -lz -L/home/vagrant/rcairo.win64/vendor/local/lib -lpng16 -lz"
+  if test "${SYSROOT}$libdir" != "/usr/lib"   &&
+     test "${SYSROOT}$libdir" != "/usr/lib64" ; then
+    libs_L="-L${SYSROOT}$libdir"
+  fi
+fi
+
+orig_prefix=$prefix
+orig_exec_prefix=$exec_prefix
+
+orig_includedir=$includedir
+orig_libdir=$libdir
+
+include_suffix=`echo $includedir | sed "s|$prefix||"`
+lib_suffix=`echo $libdir | sed "s|$exec_prefix||"`
+
 
 usage()
 {
@@ -39,14 +83,17 @@ Options:
                          library
   --static               make command line options display flags
                          for static linking
+  --help                 display this help and exit
 EOF
   exit $1
 }
 
+
 if test $# -eq 0 ; then
   usage 1 1>&2
 fi
 
+
 while test $# -gt 0 ; do
   case "$1" in
   -*=*)
@@ -74,8 +121,8 @@ while test $# -gt 0 ; do
     echo_exec_prefix=yes
     ;;
   --version)
-    echo 19.0.13
-    exit 0
+    echo_version=yes
+    break
     ;;
   --ftversion)
     echo_ft_version=yes
@@ -92,6 +139,9 @@ while test $# -gt 0 ; do
   --static)
     show_static=yes
     ;;
+  --help)
+    usage 0
+    ;;
   *)
     usage 1 1>&2
     ;;
@@ -99,12 +149,27 @@ while test $# -gt 0 ; do
   shift
 done
 
+
 if test "$local_prefix" = "yes" ; then
   if test "$exec_prefix_set" != "yes" ; then
     exec_prefix=$prefix
   fi
 fi
 
+if test "$local_prefix" = "yes" ; then
+  includedir=${prefix}${include_suffix}
+  if test "$exec_prefix_set" = "yes" ; then
+    libdir=${exec_prefix}${lib_suffix}
+  else
+    libdir=${prefix}${lib_suffix}
+  fi
+fi
+
+
+if test "$echo_version" = "yes" ; then
+  echo $version
+fi
+
 if test "$echo_prefix" = "yes" ; then
   echo ${SYSROOT}$prefix
 fi
@@ -113,15 +178,6 @@ if test "$echo_exec_prefix" = "yes" ; then
   echo ${SYSROOT}$exec_prefix
 fi
 
-if test "$exec_prefix_set" = "yes" ; then
-  libdir=$exec_prefix/lib
-else
-  if test "$local_prefix" = "yes" ; then
-    includedir=$prefix/include
-    libdir=$prefix/lib
-  fi
-fi
-
 if test "$echo_ft_version" = "yes" ; then
   major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
          | grep FREETYPE_MAJOR \
@@ -136,26 +192,20 @@ if test "$echo_ft_version" = "yes" ; then
 fi
 
 if test "$echo_cflags" = "yes" ; then
-  echo -I${SYSROOT}$includedir/freetype2
+  echo $cflags | sed "s|$orig_includedir/freetype2|$includedir/freetype2|"
 fi
 
 if test "$echo_libs" = "yes" ; then
-  libs="-lfreetype"
-  staticlibs="-lfreetype -L/home/vagrant/rcairo.win64/vendor/local/lib -lz -L/home/vagrant/rcairo.win64/vendor/local/lib -lpng16 -lz"
   if test "$show_static" = "yes" ; then
-    libs="$staticlibs"
-  fi
-  if test "${SYSROOT}$libdir" != "/usr/lib"  &&
-     test "${SYSROOT}$libdir" != "/usr/lib64"; then
-    echo -L${SYSROOT}$libdir $libs
+    libs="$libs_L $static_libs"
   else
-    echo $libs
+    libs="$libs_L $dynamic_libs"
   fi
+  echo $libs | sed "s|$orig_libdir|$libdir|"
 fi
 
 if test "$echo_libtool" = "yes" ; then
-  convlib="libfreetype.la"
-  echo ${SYSROOT}$libdir/$convlib
+  echo ${SYSROOT}$libdir/libfreetype.la
 fi
 
 # EOF

data/vendor/local/bin/libpng-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.29"
+version="1.6.32"
 prefix="/home/vagrant/rcairo.win64/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/libpng16-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.29"
+version="1.6.32"
 prefix="/home/vagrant/rcairo.win64/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/xml2-config

@@ -58,7 +58,7 @@ while test $# -gt 0; do
       ;;
 
     --version)
-	echo 2.9.4
+	echo 2.9.6
 	exit 0
 	;;
 

data/vendor/local/etc/fonts/conf.d/30-metric-aliases.conf

@@ -6,17 +6,17 @@
 
 Alias similar/metric-compatible families from various sources:
 
-PostScript fonts:       URW fonts:              GUST fonts:        Windows fonts:
-======================  ======================  =================  ==================
-Helvetica               Nimbus Sans             TeX Gyre Heros
-Helvetica Condensed     Nimbus Sans Narrow      TeX Gyre Heros Cn
-Times                   Nimbus Roman            TeX Gyre Termes
-Courier                 Nimbus Mono             TeX Gyre Cursor
-ITC Avant Garde Gothic  URW Gothic              TeX Gyre Adventor
-ITC Bookman             Bookman URW             TeX Gyre Bonum     Bookman Old Style
-ITC Zapf Chancery       Chancery URW            TeX Gyre Chorus
-Palatino                Palladio URW            TeX Gyre Pagella   Palatino Linotype
-New Century Schoolbook  Century SchoolBook URW  TeX Gyre Schola    Century Schoolbook
+PostScript fonts:       URW fonts:           GUST fonts:        Windows fonts:
+======================  ==================  =================  ==================
+Helvetica               Nimbus Sans         TeX Gyre Heros
+Helvetica Narrow        Nimbus Sans Narrow  TeX Gyre Heros Cn
+Times                   Nimbus Roman        TeX Gyre Termes
+Courier                 Nimbus Mono PS      TeX Gyre Cursor
+ITC Avant Garde Gothic  URW Gothic          TeX Gyre Adventor
+ITC Bookman             URW Bookman         TeX Gyre Bonum     Bookman Old Style
+ITC Zapf Chancery       Z003                TeX Gyre Chorus
+Palatino                P052                TeX Gyre Pagella   Palatino Linotype
+New Century Schoolbook  C059                TeX Gyre Schola    Century Schoolbook
 
 Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
 ================  ======================  =======================  =================  ==============
@@ -73,14 +73,14 @@ but in an order preferring similar designs first.  We do this in three steps:
 	<alias binding="same">
 	  <family>Nimbus Sans Narrow</family>
 	  <default>
-	  <family>Helvetica Condensed</family>
+	  <family>Helvetica Narrow</family>
 	  </default>
 	</alias>
 
 	<alias binding="same">
 	  <family>TeX Gyre Heros Cn</family>
 	  <default>
-	  <family>Helvetica Condensed</family>
+	  <family>Helvetica Narrow</family>
 	  </default>
 	</alias>
 
@@ -119,6 +119,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Nimbus Mono PS</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>TeX Gyre Cursor</family>
 	  <default>
@@ -175,6 +182,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>URW Bookman</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>TeX Gyre Bonum</family>
 	  <default>
@@ -210,6 +224,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Z003</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>TeX Gyre Chorus</family>
 	  <default>
@@ -231,6 +252,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>P052</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>TeX Gyre Pagella</family>
 	  <default>
@@ -259,6 +287,13 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>C059</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>TeX Gyre Schola</family>
 	  <default>
@@ -405,7 +440,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	</alias>
 
 	<alias>
-	  <family>Helvetica Condensed</family>
+	  <family>Helvetica Narrow</family>
 	  <default>
 	  <family>Arial Narrow</family>
 	  </default>
@@ -437,7 +472,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	<alias>
 	  <family>Arial Narrow</family>
 	  <default>
-	  <family>Helvetica Condensed</family>
+	  <family>Helvetica Narrow</family>
 	  </default>
 	</alias>
 
@@ -470,7 +505,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	</alias>
 
 	<alias binding="same">
-	  <family>Helvetica Condensed</family>
+	  <family>Helvetica Narrow</family>
 	  <accept>
 	  <family>TeX Gyre Heros Cn</family>
 	  <family>Nimbus Sans Narrow</family>
@@ -490,6 +525,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>Courier</family>
 	  <accept>
 	  <family>TeX Gyre Cursor</family>
+	  <family>Nimbus Mono PS</family>
 	  <family>Nimbus Mono</family>
 	  <family>Nimbus Mono L</family>
 	  </accept>
@@ -509,6 +545,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <accept>
 	  <family>Bookman Old Style</family>
 	  <family>TeX Gyre Bonum</family>
+	  <family>URW Bookman</family>
 	  <family>Bookman URW</family>
 	  <family>URW Bookman L</family>
 	  </accept>
@@ -518,6 +555,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>ITC Zapf Chancery</family>
 	  <accept>
 	  <family>TeX Gyre Chorus</family>
+	  <family>Z003</family>
 	  <family>Chancery URW</family>
 	  <family>URW Chancery L</family>
 	  </accept>
@@ -528,6 +566,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <accept>
 	  <family>Palatino Linotype</family>
 	  <family>TeX Gyre Pagella</family>
+	  <family>P052</family>
 	  <family>Palladio URW</family>
 	  <family>URW Palladio L</family>
 	  </accept>
@@ -538,6 +577,7 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <accept>
 	  <family>Century Schoolbook</family>
 	  <family>TeX Gyre Schola</family>
+	  <family>C059</family>
 	  <family>Century SchoolBook URW</family>
 	  <family>Century Schoolbook L</family>
 	  </accept>