cairo 1.14.3-x64-mingw32 → 1.14.6-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43d87b5041c0703ff1a8c9db3fa56a82d10bd34
-  data.tar.gz: 1ec7d8e282dec70812a05ba8e200f1f062152109
+  metadata.gz: 7791f986e5c7ecc94a572d931f332c342fda3c45
+  data.tar.gz: be312cc4f0f24c7fb421e49e9e30287dc35cb0f8
 SHA512:
-  metadata.gz: 49bc97ff072bcf27e805880d9e9d1f5c6ce8e887fe9f7ee7748df14d25dc0ae6dd1a3015f09f4120b81486b385e1012d8c05689bb71ab603e741fe3c9c24471c
-  data.tar.gz: 5f0dc72b8835ead70a6f29205c440732d7a93cb71dc85a5744931d5e800cf7c139581087c787d0535b3f75f58bce5ba9b00845b11c97c5c30090d60c4a596646
+  metadata.gz: 88caf8d363f783743ffdeb44468c605c0c58f216f7f05bceb7bad4d3ff0140b90380ce96e52bd588c051282e8619173fe4dcd57c02be6b5ea652569ee92a53d0
+  data.tar.gz: ff419338498fb95d26af9a2d293adff622f4d82af97c974f47613a091cf475fb2383f4cd1c9b45ad02b99b1f6df4bd5e17b4498aded9a155e36f3a3242ba8707

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

data/vendor/local/bin/freetype-config

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright 2000-2015 by
+# Copyright 2000-2016 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,7 +17,6 @@ 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"
-enable_shared=""
 
 usage()
 {
@@ -75,7 +74,7 @@ while test $# -gt 0 ; do
     echo_exec_prefix=yes
     ;;
   --version)
-    echo 18.0.12
+    echo 18.3.12
     exit 0
     ;;
   --ftversion)
@@ -124,21 +123,20 @@ else
 fi
 
 if test "$echo_ft_version" = "yes" ; then
-  major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
+  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
          | grep FREETYPE_MAJOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
+  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
          | grep FREETYPE_MINOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
+  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
          | grep FREETYPE_PATCH \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
   echo $major.$minor.$patch
 fi
 
 if test "$echo_cflags" = "yes" ; then
-  cflags="-I${SYSROOT}$includedir/freetype2"
-  echo $cflags
+  echo -I${SYSROOT}$includedir/freetype2
 fi
 
 if test "$echo_libs" = "yes" ; then

data/vendor/local/bin/libpng-config

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

data/vendor/local/include/cairo/cairo-features.h

@@ -18,14 +18,29 @@
 #define CAIRO_HAS_WIN32_FONT 1
 #define CAIRO_HAS_WIN32_SURFACE 1
 
+/*#undef CAIRO_HAS_BEOS_SURFACE */
+/*#undef CAIRO_HAS_COGL_SURFACE */
+/*#undef CAIRO_HAS_DIRECTFB_SURFACE */
+/*#undef CAIRO_HAS_DRM_SURFACE */
 /*#undef CAIRO_HAS_EGL_FUNCTIONS */
+/*#undef CAIRO_HAS_GALLIUM_SURFACE */
+/*#undef CAIRO_HAS_GLESV2_SURFACE */
 /*#undef CAIRO_HAS_GLX_FUNCTIONS */
+/*#undef CAIRO_HAS_GL_SURFACE */
+/*#undef CAIRO_HAS_OS2_SURFACE */
+/*#undef CAIRO_HAS_QT_SURFACE */
 /*#undef CAIRO_HAS_QUARTZ_FONT */
+/*#undef CAIRO_HAS_QUARTZ_IMAGE_SURFACE */
 /*#undef CAIRO_HAS_QUARTZ_SURFACE */
+/*#undef CAIRO_HAS_SKIA_SURFACE */
+/*#undef CAIRO_HAS_TEE_SURFACE */
+/*#undef CAIRO_HAS_VG_SURFACE */
 /*#undef CAIRO_HAS_WGL_FUNCTIONS */
 /*#undef CAIRO_HAS_XCB_SHM_FUNCTIONS */
 /*#undef CAIRO_HAS_XCB_SURFACE */
 /*#undef CAIRO_HAS_XLIB_SURFACE */
+/*#undef CAIRO_HAS_XLIB_XCB_FUNCTIONS */
 /*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */
+/*#undef CAIRO_HAS_XML_SURFACE */
 
 #endif

data/vendor/local/include/cairo/cairo-version.h

@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 14
-#define CAIRO_VERSION_MICRO 2
+#define CAIRO_VERSION_MICRO 6
 
 #endif

data/vendor/local/include/freetype2/{config → freetype/config}/ftconfig.h

@@ -5,7 +5,7 @@
 /*                                                                         */
 /*    UNIX-specific configuration file (specification only).               */
 /*                                                                         */
-/*  Copyright 1996-2015 by                                                 */
+/*  Copyright 1996-2016 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -35,8 +35,8 @@
   /*************************************************************************/
 
 
-#ifndef __FTCONFIG_H__
-#define __FTCONFIG_H__
+#ifndef FTCONFIG_H_
+#define FTCONFIG_H_
 
 #include <ft2build.h>
 #include FT_CONFIG_OPTIONS_H
@@ -87,7 +87,7 @@ FT_BEGIN_HEADER
 #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
 
   /* Following cpp computation of the bit length of int and long */
-  /* is copied from default include/config/ftconfig.h.           */
+  /* is copied from default include/freetype/config/ftconfig.h.  */
   /* If any improvement is required for this file, it should be  */
   /* applied to the original header file for the builders that   */
   /* do not use configure script.                                */
@@ -306,7 +306,13 @@ FT_BEGIN_HEADER
   /*                                                                       */
 #elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
 
-#if defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
+#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
+
+#define FT_LONG64
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int
+
+#elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
 
   /* this compiler provides the __int64 type */
 #define FT_LONG64
@@ -340,7 +346,7 @@ FT_BEGIN_HEADER
 #define FT_INT64   long long int
 #define FT_UINT64  unsigned long long int
 
-#endif /* _MSC_VER */
+#endif /* __STDC_VERSION__ >= 199901L */
 
 #endif /* FT_SIZEOF_LONG == 8 */
 
@@ -366,9 +372,9 @@ FT_BEGIN_HEADER
 #if ( __GNUC__ >= 2                         || \
       defined( __IBM__TYPEOF__ )            || \
       ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
-#define TYPEOF( type )  (__typeof__ (type))
+#define FT_TYPEOF( type )  (__typeof__ (type))
 #else
-#define TYPEOF( type )  /* empty */
+#define FT_TYPEOF( type )  /* empty */
 #endif
 
 
@@ -492,7 +498,7 @@ FT_BEGIN_HEADER
 FT_END_HEADER
 
 
-#endif /* __FTCONFIG_H__ */
+#endif /* FTCONFIG_H_ */
 
 
 /* END */