cairo 1.15.5-x64-mingw32 → 1.15.6-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671b09b79a7134f1940395d2bf8e22d899cecc49
-  data.tar.gz: 1fe5303b2364cec6b68f7bcd859be084ae092bc7
+  metadata.gz: 915e61bc437ce59886917cd620cffb1fb1077649
+  data.tar.gz: 538ace9fce8bfda968d4a3aa93abdb4d468541a1
 SHA512:
-  metadata.gz: 23b24e7d77689bb3d83bde4cb5460318d0c3320ef722baf64776fd21d6ecd89c9815d1b97a2bb819a3b76e89677be11e769d4cd356d0f40a148ac2b079c2ebc0
-  data.tar.gz: 16f480a23100b65a3abeac521714f66d5220e1a483badb7cf2583c3ba6bec57113e4702cd5cfd173dbf1d7fd9c16c9942ef1d2c5a23e8b5d3b1c8715f45941f8
+  metadata.gz: 8653ae1fe3dd55244cf3819c4501358a660ba76e4e18a3c1309dc672eca23a6e7e5ef37b5d269ecc0e555ab4be2656382ee0f85435512c5acc332d3eb9654b2e
+  data.tar.gz: 2c80f9a3cfdb56b1ab2320462940cf24ddb6ae2827ad8d6edeb2d0c76d27ec2c8b2a9fda9dd0298270accf7677b45b608acaf6bd3ea42f43cd67a48e7033cbe4

data/NEWS

@@ -1,3 +1,16 @@
+Release 1.15.6 (2017-04-27) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Added Cairo::Context#refrence_count.
+  * Windows: Update bundled libraries:
+    * zlib: 1.2.10 -> 1.2.11
+    * libpng: 1.6.27 -> 1.6.29
+    * FreeType: 2.7 -> 2.7.1
+  * Used native-package-installer gem.
+
 Release 1.15.5 (2017-01-14) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/Rakefile

@@ -442,8 +442,8 @@ windows_task = WindowsTask.new(spec) do |task|
   task.packages = [
     {
       :name => "zlib",
-      :version => "1.2.10",
-      :download_base_url => "https://downloads.sourceforge.net/project/libpng/zlib/1.2.10",
+      :version => "1.2.11",
+      :download_base_url => "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11",
       :compression_method => "gz",
       :windows => {
         :builder => ZlibBuilder.new,
@@ -452,16 +452,16 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.27",
-      :download_base_url => "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.27",
+      :version => "1.6.29",
+      :download_base_url => "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.29",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
     },
     {
       :name => "freetype",
-      :version => "2.7",
-      :download_base_url => "https://downloads.sourceforge.net/project/freetype/freetype2/2.7",
+      :version => "2.7.1",
+      :download_base_url => "https://downloads.sourceforge.net/project/freetype/freetype2/2.7.1",
       :compression_method => "bz2",
       :windows => {
         :built_file => "bin/libfreetype-7.dll",

data/ext/cairo/extconf.rb

@@ -6,12 +6,8 @@ require 'English'
 require 'mkmf'
 require 'fileutils'
 
-begin
-  require 'pkg-config'
-rescue LoadError
-  require 'rubygems'
-  require 'pkg-config'
-end
+require "pkg-config"
+require "native-package-installer"
 
 checking_for(checking_message("GCC")) do
   if macro_defined?("__GNUC__", "")
@@ -47,119 +43,6 @@ checking_for(checking_message("Win32 OS")) do
   end
 end
 
-def package_platform
-  if File.exist?("/etc/debian_version")
-    :debian
-  elsif File.exist?("/etc/fedora-release")
-    :fedora
-  elsif File.exist?("/etc/redhat-release")
-    :redhat
-  elsif find_executable("brew")
-    :homebrew
-  elsif find_executable("port")
-    :macports
-  else
-    :unknown
-  end
-end
-
-def super_user?
-  Process.uid.zero?
-end
-
-def normalize_native_package_info(native_package_info)
-  native_package_info ||= {}
-  native_package_info = native_package_info.dup
-  native_package_info[:fedora] ||= native_package_info[:redhat]
-  native_package_info
-end
-
-def install_missing_native_package(native_package_info)
-  platform = package_platform
-  native_package_info = normalize_native_package_info(native_package_info)
-  package = native_package_info[platform]
-  return false if package.nil?
-
-  need_super_user_priviledge = true
-  case platform
-  when :debian
-    install_command = "apt-get install -V -y #{package}"
-  when :fedora, :redhat
-    install_command = "yum install -y #{package}"
-  when :homebrew
-    need_super_user_priviledge = false
-    install_command = "brew install #{package}"
-  when :macports
-    install_command = "port install -y #{package}"
-  else
-    return false
-  end
-
-  have_priviledge = (not need_super_user_priviledge or super_user?)
-  unless have_priviledge
-    sudo = find_executable("sudo")
-  end
-
-  installing_message = "installing '#{package}' native package... "
-  message("%s", installing_message)
-  failed_to_get_super_user_priviledge = false
-
-  succeeded = false
-  execution_result = ""
-  File.open("mkmf.log") do |log|
-    log.seek(0, IO::SEEK_END)
-    if have_priviledge
-      succeeded = xsystem(install_command)
-    else
-      if sudo
-        install_command = "#{sudo} #{install_command}"
-        succeeded = xsystem(install_command)
-      else
-        succeeded = false
-        failed_to_get_super_user_priviledge = true
-      end
-    end
-    executed_command_line = log.gets
-    execution_result = log.read
-  end
-
-  if failed_to_get_super_user_priviledge
-    result_message = "require super user privilege"
-  else
-    result_message = succeeded ? "succeeded" : "failed"
-  end
-  Logging.postpone do
-    "#{installing_message}#{result_message}\n"
-  end
-  message("#{result_message}\n")
-
-  error_message = nil
-  unless succeeded
-    if failed_to_get_super_user_priviledge
-      error_message = <<-EOM
-'#{package}' native package is required.
-Run the following command as super user to install required native package:
-  \# #{install_command}
-EOM
-    else
-      error_message = <<-EOM
-Failed to run '#{install_command}':
---
-#{execution_result.chomp}
---
-EOM
-    end
-  end
-  if error_message
-    message("%s", error_message)
-    Logging.message("%s", error_message)
-  end
-
-  Logging.message("--------------------\n\n")
-
-  succeeded
-end
-
 def required_pkg_config_package(package_info, native_package_info=nil)
   if package_info.is_a?(Array)
     required_package_info = package_info
@@ -169,7 +52,7 @@ def required_pkg_config_package(package_info, native_package_info=nil)
   return true if PKGConfig.have_package(*required_package_info)
 
   native_package_info ||= {}
-  return false unless install_missing_native_package(native_package_info)
+  return false unless NativePackageInstaller.install(native_package_info)
 
   PKGConfig.have_package(*required_package_info)
 end

data/ext/cairo/rb_cairo.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2016 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2017 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 15
-#define RB_CAIRO_VERSION_MICRO 5
+#define RB_CAIRO_VERSION_MICRO 6
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_constants.c

@@ -127,7 +127,7 @@ VALUE rb_mCairo_PDFMetadata = Qnil;
 #define CAIRO_REGION_OVERLAP_MIN CAIRO_REGION_OVERLAP_IN
 #define CAIRO_REGION_OVERLAP_MAX CAIRO_REGION_OVERLAP_PART
 
-#if CAIRO_CHECK_VERSION(1, 15, 6)
+#if CAIRO_CHECK_VERSION(1, 15, 5)
 #  define CAIRO_PDF_OUTLINE_FLAGS_MIN CAIRO_PDF_OUTLINE_FLAG_OPEN
 #  define CAIRO_PDF_OUTLINE_FLAGS_MAX CAIRO_PDF_OUTLINE_FLAG_ITALIC
 #else
@@ -692,7 +692,7 @@ Init_cairo_constants (void)
 #if CAIRO_CHECK_VERSION(1, 15, 4)
   rb_mCairo_PDFOutlineFlags =
     rb_define_module_under (rb_mCairo, "PDFOutlineFlags");
-#  if CAIRO_CHECK_VERSION(1, 15, 6)
+#  if CAIRO_CHECK_VERSION(1, 15, 5)
   rb_define_const (rb_mCairo_PDFOutlineFlags, "OPEN",
                    INT2NUM (CAIRO_PDF_OUTLINE_FLAG_OPEN));
   rb_define_const (rb_mCairo_PDFOutlineFlags, "BOLD",

data/ext/cairo/rb_cairo_context.c

@@ -129,6 +129,18 @@ cr_destroy_with_destroy_check (VALUE self)
   return Qnil;
 }
 
+static VALUE
+cr_get_reference_count (VALUE self)
+{
+  cairo_t *cr;
+  unsigned int  reference_count;
+
+  cr = _SELF;
+  reference_count = cairo_get_reference_count (cr);
+
+  return UINT2NUM (reference_count);
+}
+
 static VALUE
 cr_s_wrap (VALUE self, VALUE pointer)
 {
@@ -1673,6 +1685,8 @@ Init_cairo_context (void)
   /* 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);
+  rb_define_method (rb_cCairo_Context, "reference_count",
+                    cr_get_reference_count, 0);
 
   rb_define_method (rb_cCairo_Context, "save", cr_save, 0);
   rb_define_method (rb_cCairo_Context, "restore", cr_restore, 0);

data/ext/cairo/rb_cairo_surface.c

@@ -465,6 +465,18 @@ cr_surface_destroy (VALUE self)
   return self;
 }
 
+static VALUE
+cr_surface_get_reference_count (VALUE self)
+{
+  cairo_surface_t *surface;
+  unsigned int reference_count;
+
+  surface = _SELF;
+  reference_count = cairo_surface_get_reference_count (surface);
+
+  return UINT2NUM (reference_count);
+}
+
 static VALUE
 cr_surface_finish (VALUE self)
 {
@@ -1998,6 +2010,8 @@ Init_cairo_surface (void)
                     cr_surface_get_device, 0);
 #endif
   rb_define_method (rb_cCairo_Surface, "destroy", cr_surface_destroy, 0);
+  rb_define_method (rb_cCairo_Surface, "reference_count",
+                    cr_surface_get_reference_count, 0);
   rb_define_method (rb_cCairo_Surface, "finish", cr_surface_finish, 0);
   rb_define_method (rb_cCairo_Surface, "content", cr_surface_get_content, 0);
 

data/vendor/local/bin/freetype-config

@@ -74,7 +74,7 @@ while test $# -gt 0 ; do
     echo_exec_prefix=yes
     ;;
   --version)
-    echo 18.6.12
+    echo 19.0.13
     exit 0
     ;;
   --ftversion)

data/vendor/local/bin/libpng-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.27"
+version="1.6.29"
 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.27"
+version="1.6.29"
 prefix="/home/vagrant/rcairo.win64/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/include/freetype2/freetype/config/ftconfig.h

@@ -288,8 +288,8 @@ FT_BEGIN_HEADER
 #endif
 
 
-  /* determine whether we have a 64-bit int type for platforms without */
-  /* Autoconf                                                          */
+  /* determine whether we have a 64-bit int type  */
+  /* (mostly for environments without `autoconf') */
 #if FT_SIZEOF_LONG == 8
 
   /* FT_LONG64 must be defined if a 64-bit type is available */
@@ -297,6 +297,16 @@ FT_BEGIN_HEADER
 #define FT_INT64   long
 #define FT_UINT64  unsigned long
 
+  /* we handle the LLP64 scheme separately for GCC and clang, */
+  /* suppressing the `long long' warning                      */
+#elif ( FT_SIZEOF_LONG == 4 )       && \
+      defined( HAVE_LONG_LONG_INT ) && \
+      defined( __GNUC__ )
+#pragma GCC diagnostic ignored "-Wlong-long"
+#define FT_LONG64
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
+
   /*************************************************************************/
   /*                                                                       */
   /* A 64-bit data type may create compilation problems if you compile     */
@@ -369,10 +379,11 @@ FT_BEGIN_HEADER
 
 
   /* typeof condition taken from gnulib's `intprops.h' header file */
-#if ( __GNUC__ >= 2                         || \
-      defined( __IBM__TYPEOF__ )            || \
-      ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
-#define FT_TYPEOF( type )  (__typeof__ (type))
+#if ( ( defined( __GNUC__ ) && __GNUC__ >= 2 )                       || \
+      ( defined( __IBMC__ ) && __IBMC__ >= 1210 &&                      \
+        defined( __IBM__TYPEOF__ ) )                                 || \
+      ( defined( __SUNPRO_C ) && __SUNPRO_C >= 0x5110 && !__STDC__ ) )
+#define FT_TYPEOF( type )  ( __typeof__ ( type ) )
 #else
 #define FT_TYPEOF( type )  /* empty */
 #endif

data/vendor/local/include/freetype2/freetype/freetype.h

@@ -951,6 +951,10 @@ FT_BEGIN_HEADER
   /*                           strikes in the face.  It is set to NULL if  */
   /*                           there is no bitmap strike.                  */
   /*                                                                       */
+  /*                           Note that FreeType tries to sanitize the    */
+  /*                           strike data since they are sometimes sloppy */
+  /*                           or incorrect, but this can easily fail.     */
+  /*                                                                       */
   /*    num_charmaps        :: The number of charmaps in the face.         */
   /*                                                                       */
   /*    charmaps            :: An array of the charmaps of the face.       */
@@ -1727,7 +1731,6 @@ FT_BEGIN_HEADER
   /*    position (e.g., coordinates (0,0) on the baseline).  Of course,    */
   /*    `slot->format' is also changed to @FT_GLYPH_FORMAT_BITMAP.         */
   /*                                                                       */
-  /* <Note>                                                                */
   /*    Here is a small pseudo code fragment that shows how to use         */
   /*    `lsb_delta' and `rsb_delta':                                       */
   /*                                                                       */
@@ -1755,6 +1758,12 @@ FT_BEGIN_HEADER
   /*      endfor                                                           */
   /*    }                                                                  */
   /*                                                                       */
+  /*    If you use strong auto-hinting, you *must* apply these delta       */
+  /*    values!  Otherwise you will experience far too large inter-glyph   */
+  /*    spacing at small rendering sizes in most cases.  Note that it      */
+  /*    doesn't harm to use the above code for other hinting modes also,   */
+  /*    since the delta values are zero then.                              */
+  /*                                                                       */
   typedef struct  FT_GlyphSlotRec_
   {
     FT_Library        library;
@@ -2322,7 +2331,10 @@ FT_BEGIN_HEADER
   /*    FT_Select_Size                                                     */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    Select a bitmap strike.                                            */
+  /*    Select a bitmap strike.  To be more precise, this function sets    */
+  /*    the scaling factors of the active @FT_Size object in a face so     */
+  /*    that bitmaps from this particular strike are taken by              */
+  /*    @FT_Load_Glyph and friends.                                        */
   /*                                                                       */
   /* <InOut>                                                               */
   /*    face         :: A handle to a target face object.                  */
@@ -2334,6 +2346,20 @@ FT_BEGIN_HEADER
   /* <Return>                                                              */
   /*    FreeType error code.  0~means success.                             */
   /*                                                                       */
+  /* <Note>                                                                */
+  /*    For bitmaps embedded in outline fonts it is common that only a     */
+  /*    subset of the available glyphs at a given ppem value is available. */
+  /*    FreeType silently uses outlines if there is no bitmap for a given  */
+  /*    glyph index.                                                       */
+  /*                                                                       */
+  /*    For GX variation fonts, a bitmap strike makes sense only if the    */
+  /*    default instance is active (this is, no glyph variation takes      */
+  /*    place); otherwise, FreeType simply ignores bitmap strikes.  The    */
+  /*    same is true for all named instances that are different from the   */
+  /*    default instance.                                                  */
+  /*                                                                       */
+  /*    Don't use this function if you are using the FreeType cache API.   */
+  /*                                                                       */
   FT_EXPORT( FT_Error )
   FT_Select_Size( FT_Face  face,
                   FT_Int   strike_index );
@@ -2786,6 +2812,14 @@ FT_BEGIN_HEADER
    *
    *     Currently, this flag is only implemented for TrueType fonts.
    *
+   *   FT_LOAD_BITMAP_METRICS_ONLY ::
+   *     This flag is used to request loading of the metrics and bitmap
+   *     image information of a (possibly embedded) bitmap glyph without
+   *     allocating or copying the bitmap image data itself.  No effect if
+   *     the target glyph is not a bitmap image.
+   *
+   *     This flag unsets @FT_LOAD_RENDER.
+   *
    *   FT_LOAD_CROP_BITMAP ::
    *     Ignored.  Deprecated.
    *
@@ -2832,6 +2866,7 @@ FT_BEGIN_HEADER
   /* Bits 16..19 are used by `FT_LOAD_TARGET_' */
 #define FT_LOAD_COLOR                        ( 1L << 20 )
 #define FT_LOAD_COMPUTE_METRICS              ( 1L << 21 )
+#define FT_LOAD_BITMAP_METRICS_ONLY          ( 1L << 22 )
 
   /* */
 
@@ -4206,7 +4241,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  7
-#define FREETYPE_PATCH  0
+#define FREETYPE_PATCH  1
 
 
   /*************************************************************************/