cairo 1.15.14-x64-mingw32 → 1.16.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232fcc3fde1ee933c7456acd422b0a6d6b9de07c640cdefbed5647602e178d2a
-  data.tar.gz: df1c0b24473693309c40ad86a145be61ac65274d83c152bbea3d32b491c82989
+  metadata.gz: 5aef778ab4a774c67001732ce01495c10dcf9c7208747abb4811b5f814ed2d6d
+  data.tar.gz: b73951b75c81b0fbdfb3cdd4e88a2bd43f6cb8542fb2b86adec99e3ce157edd8
 SHA512:
-  metadata.gz: 0c6ee18a5c3c36b3858d7468207abad3743450b866dadfb3b9fd78f7358257766fc62b179c16505e309011558cc0d5276ecc87c8176dbd58a3c102559dcad1ba
-  data.tar.gz: ad430e2bb2cf2d66583a0dd6b04708e26275b4dea2377894b3de4fe899e65fbdfd0a058e3b4e62cbc5cbca4fcd872505e976fbc6f4e737a31304a8c4a384a6b7
+  metadata.gz: b7d9528ed02fea5f60db59aa3513d6b54aab36f64b0be23e85c9879f4ce18782f93af364eaf31a1fe5e2e01c0c72f4ba2b7b97e88b56c62d8662d224725a9d57
+  data.tar.gz: fbbd47c847b05c774172d7b2cf2bcce15f58e7e08529cc20623a0a8161710e901c0eaa71a779cc7851f8488161ea789638a2ba98943d668d873be9b4dbbdd845

data/NEWS

@@ -1,3 +1,13 @@
+Release 1.16.0 (2018-10-28) Kouhei Sutou <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Added support for cairo 1.16.0.
+
+  * Removed Cairo::SkiaSurface.
+
 Release 1.15.14 (2018-08-20) Kouhei Sutou <kou@cozmixng.org>
 ============================================================
 

data/Rakefile

@@ -475,7 +475,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libxml2",
-      :version => "2.9.7",
+      :version => "2.9.8",
       :download_base_url => "ftp://xmlsoft.org/libxml2",
       :compression_method => "gz",
       :windows => {
@@ -509,8 +509,8 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.15.12",
-      :download_site => :cairo_snapshots,
+      :version => "1.16.0",
+      :download_site => :cairo,
       :windows => {
         :built_file => "bin/libcairo-2.dll",
         :configure_args => [

data/ext/cairo/rb_cairo.h

@@ -72,8 +72,8 @@ RB_CAIRO_BEGIN_DECLS
 #endif
 
 #define RB_CAIRO_VERSION_MAJOR 1
-#define RB_CAIRO_VERSION_MINOR 15
-#define RB_CAIRO_VERSION_MICRO 14
+#define RB_CAIRO_VERSION_MINOR 16
+#define RB_CAIRO_VERSION_MICRO 0
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_surface.c

@@ -86,7 +86,6 @@ VALUE rb_cCairo_GLTextureSurface = Qnil;
 VALUE rb_cCairo_DRMSurface = Qnil;
 VALUE rb_cCairo_TeeSurface = Qnil;
 VALUE rb_cCairo_XMLSurface = Qnil;
-VALUE rb_cCairo_SkiaSurface = Qnil;
 VALUE rb_cCairo_SubSurface = Qnil;
 VALUE rb_cCairo_CoglSurface = Qnil;
 
@@ -195,9 +194,6 @@ cr_surface_get_klass (cairo_surface_t *surface)
     case CAIRO_SURFACE_TYPE_XML:
       klass = rb_cCairo_XMLSurface;
       break;
-    case CAIRO_SURFACE_TYPE_SKIA:
-      klass = rb_cCairo_SkiaSurface;
-      break;
     case CAIRO_SURFACE_TYPE_SUBSURFACE:
       klass = rb_cCairo_SubSurface;
       break;
@@ -2358,10 +2354,6 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_XMLSurface);
 #endif
 
-  /* Skia surface */
-  rb_cCairo_SkiaSurface =
-    rb_define_class_under (rb_mCairo, "SkiaSurface", rb_cCairo_Surface);
-
   /* sub surface */
   rb_cCairo_SubSurface =
     rb_define_class_under (rb_mCairo, "SubSurface", rb_cCairo_Surface);

data/vendor/local/bin/xml2-config

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

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

@@ -2,7 +2,7 @@
 #define CAIRO_VERSION_H
 
 #define CAIRO_VERSION_MAJOR 1
-#define CAIRO_VERSION_MINOR 15
-#define CAIRO_VERSION_MICRO 12
+#define CAIRO_VERSION_MINOR 16
+#define CAIRO_VERSION_MICRO 0
 
 #endif

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

@@ -606,7 +606,7 @@ cairo_pop_group_to_source (cairo_t *cr);
  * translucent layers too.
  * For a more detailed explanation of the effects of each operator, including
  * the mathematical definitions, see
- * <ulink url="http://cairographics.org/operators/">http://cairographics.org/operators/</ulink>.
+ * <ulink url="https://cairographics.org/operators/">https://cairographics.org/operators/</ulink>.
  *
  * Since: 1.0
  **/
@@ -1063,7 +1063,7 @@ typedef struct _cairo_scaled_font cairo_scaled_font_t;
  *
  * A #cairo_font_face_t specifies all aspects of a font other
  * than the size or font matrix (a font matrix is used to distort
- * a font by sheering it or scaling it unequally in the two
+ * a font by shearing it or scaling it unequally in the two
  * directions) . A font face can be set on a #cairo_t by using
  * cairo_set_font_face(); the size and font matrix are set with
  * cairo_set_font_size() and cairo_set_font_matrix().
@@ -2366,7 +2366,6 @@ cairo_surface_status (cairo_surface_t *surface);
  * @CAIRO_SURFACE_TYPE_DRM: The surface is of type Direct Render Manager, since 1.10
  * @CAIRO_SURFACE_TYPE_TEE: The surface is of type 'tee' (a multiplexing surface), since 1.10
  * @CAIRO_SURFACE_TYPE_XML: The surface is of type XML (for debugging), since 1.10
- * @CAIRO_SURFACE_TYPE_SKIA: The surface is of type Skia, since 1.10
  * @CAIRO_SURFACE_TYPE_SUBSURFACE: The surface is a subsurface created with
  *   cairo_surface_create_for_rectangle(), since 1.10
  * @CAIRO_SURFACE_TYPE_COGL: This surface is of type Cogl, since 1.12

data/vendor/local/include/libxml2/libxml/encoding.h

@@ -129,9 +129,14 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
  * If iconv is supported, there are two extra fields.
  */
 #ifdef LIBXML_ICU_ENABLED
+/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
+#define ICU_PIVOT_BUF_SIZE 1024
 struct _uconv_t {
   UConverter *uconv; /* for conversion between an encoding and UTF-16 */
   UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
+  UChar      pivot_buf[ICU_PIVOT_BUF_SIZE];
+  UChar      *pivot_source;
+  UChar      *pivot_target;
 };
 typedef struct _uconv_t uconv_t;
 #endif

data/vendor/local/include/libxml2/libxml/hash.h

@@ -66,7 +66,7 @@ extern "C" {
  *
  * Callback to free data from a hash.
  */
-typedef void (*xmlHashDeallocator)(void *payload, xmlChar *name);
+typedef void (*xmlHashDeallocator)(void *payload, const xmlChar *name);
 /**
  * xmlHashCopier:
  * @payload:  the data in the hash
@@ -76,7 +76,7 @@ typedef void (*xmlHashDeallocator)(void *payload, xmlChar *name);
  *
  * Returns a copy of the data or NULL in case of error.
  */
-typedef void *(*xmlHashCopier)(void *payload, xmlChar *name);
+typedef void *(*xmlHashCopier)(void *payload, const xmlChar *name);
 /**
  * xmlHashScanner:
  * @payload:  the data in the hash
@@ -85,7 +85,7 @@ typedef void *(*xmlHashCopier)(void *payload, xmlChar *name);
  *
  * Callback when scanning data in a hash with the simple scanner.
  */
-typedef void (*xmlHashScanner)(void *payload, void *data, xmlChar *name);
+typedef void (*xmlHashScanner)(void *payload, void *data, const xmlChar *name);
 /**
  * xmlHashScannerFull:
  * @payload:  the data in the hash
@@ -111,6 +111,9 @@ XMLPUBFUN xmlHashTablePtr XMLCALL
 XMLPUBFUN void XMLCALL
 			xmlHashFree	(xmlHashTablePtr table,
 					 xmlHashDeallocator f);
+XMLPUBFUN void XMLCALL
+			xmlHashDefaultDeallocator(void *entry,
+					 const xmlChar *name);
 
 /*
  * Add a new entry to the hash table.

data/vendor/local/include/libxml2/libxml/list.h

@@ -49,7 +49,7 @@ typedef int  (*xmlListDataCompare) (const void *data0, const void *data1);
  *
  * Returns 0 to stop walking the list, 1 otherwise.
  */
-typedef int (*xmlListWalker) (const void *data, const void *user);
+typedef int (*xmlListWalker) (const void *data, void *user);
 
 /* Creation/Deletion */
 XMLPUBFUN xmlListPtr XMLCALL
@@ -110,11 +110,11 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN void XMLCALL
 		xmlListWalk		(xmlListPtr l,
 					 xmlListWalker walker,
-					 const void *user);
+					 void *user);
 XMLPUBFUN void XMLCALL
 		xmlListReverseWalk	(xmlListPtr l,
 					 xmlListWalker walker,
-					 const void *user);
+					 void *user);
 XMLPUBFUN void XMLCALL
 		xmlListMerge		(xmlListPtr l1,
 					 xmlListPtr l2);

data/vendor/local/include/libxml2/libxml/xmlversion.h

@@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.9.7"
+#define LIBXML_DOTTED_VERSION "2.9.8"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20907
+#define LIBXML_VERSION 20908
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20907"
+#define LIBXML_VERSION_STRING "20908"
 
 /**
  * LIBXML_VERSION_EXTRA:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20907);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20908);
 
 #ifndef VMS
 #if 0
@@ -410,9 +410,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #endif
 
 #ifdef __GNUC__
-#ifdef HAVE_ANSIDECL_H
-#include <ansidecl.h>
-#endif
 
 /**
  * ATTRIBUTE_UNUSED:

data/vendor/local/lib/cmake/libxml2/libxml2-config.cmake

@@ -18,8 +18,8 @@ get_filename_component(_libxml2_rootdir ${CMAKE_CURRENT_LIST_DIR}/../../../ ABSO
 
 set(LIBXML2_VERSION_MAJOR  2)
 set(LIBXML2_VERSION_MINOR  9)
-set(LIBXML2_VERSION_MICRO  7)
-set(LIBXML2_VERSION_STRING "2.9.7")
+set(LIBXML2_VERSION_MICRO  8)
+set(LIBXML2_VERSION_STRING "2.9.8")
 set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
 set(LIBXML2_INCLUDE_DIRS   ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2)
 set(LIBXML2_LIBRARY_DIR    ${_libxml2_rootdir}/lib)

data/vendor/local/lib/libcairo-gobject.la

@@ -1,5 +1,5 @@
 # libcairo-gobject.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-0.1
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -23,8 +23,8 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vag
 weak_library_names=''
 
 # Version information for libcairo-gobject.
-current=11514
-age=11512
+current=11602
+age=11600
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libcairo-script-interpreter.la

@@ -1,5 +1,5 @@
 # libcairo-script-interpreter.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-0.1
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib /home/vagrant/rcairo/v
 weak_library_names=''
 
 # Version information for libcairo-script-interpreter.
-current=11514
-age=11512
+current=11602
+age=11600
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libcairo.la

@@ -1,5 +1,5 @@
 # libcairo.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-0.1
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -23,8 +23,8 @@ dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib -lpthread /home/vagran
 weak_library_names=''
 
 # Version information for libcairo.
-current=11514
-age=11512
+current=11602
+age=11600
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libxml2.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libxml2.
 current=11
 age=9
-revision=7
+revision=8
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/pkgconfig/cairo-fc.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-fc
 Description: Fontconfig font backend for cairo graphics library
-Version: 1.15.12
+Version: 1.16.0
 
 Requires: cairo fontconfig >= 2.2.95
 Libs:  

data/vendor/local/lib/pkgconfig/cairo-ft.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: cairo-ft
 Description: FreeType font backend for cairo graphics library
-Version: 1.15.12
+Version: 1.16.0
 
 Requires: cairo freetype2 >= 9.7.3 
 Libs: