cairo 1.15.12-x64-mingw32 → 1.15.13-x64-mingw32

data/vendor/local/include/fontconfig/fcprivate.h

@@ -123,5 +123,12 @@ _FcObjectSetVapBuild_bail0:						\
     ;									\
 }
 
-#endif /* _FCPRIVATE_H_ */
+#ifndef FC_ATTRIBUTE_VISIBILITY_HIDDEN
+#define FC_ATTRIBUTE_VISIBILITY_HIDDEN __attribute((visibility("hidden")))
+#endif
+
+#ifndef FC_ATTRIBUTE_VISIBILITY_EXPORT
+#define FC_ATTRIBUTE_VISIBILITY_EXPORT __attribute((visibility("default")))
+#endif
 
+#endif /* _FCPRIVATE_H_ */

data/vendor/local/include/fontconfig/fontconfig.h

@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdarg.h>
+#include <limits.h>
 
 #if defined(__GNUC__) && (__GNUC__ >= 4)
 #define FC_ATTRIBUTE_SENTINEL(x) __attribute__((__sentinel__(0)))
@@ -51,8 +52,8 @@ typedef int		FcBool;
  */
 
 #define FC_MAJOR	2
-#define FC_MINOR	12
-#define FC_REVISION	4
+#define FC_MINOR	13
+#define FC_REVISION	0
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -71,8 +72,9 @@ typedef int		FcBool;
 #define _FC_STRINGIFY(s)    	_FC_STRINGIFY_(s)
 #define FC_CACHE_VERSION    	_FC_STRINGIFY(FC_CACHE_VERSION_NUMBER)
 
-#define FcTrue		1
 #define FcFalse		0
+#define FcTrue		1
+#define FcDontCare	2
 
 #define FC_FAMILY	    "family"		/* String */
 #define FC_STYLE	    "style"		/* String */
@@ -98,6 +100,7 @@ typedef int		FcBool;
 #define FC_OUTLINE	    "outline"		/* Bool */
 #define FC_SCALABLE	    "scalable"		/* Bool */
 #define FC_COLOR	    "color"		/* Bool */
+#define FC_VARIABLE	    "variable"		/* Bool */
 #define FC_SCALE	    "scale"		/* double (deprecated) */
 #define FC_SYMBOL	    "symbol"		/* Bool */
 #define FC_DPI		    "dpi"		/* double */
@@ -118,6 +121,7 @@ typedef int		FcBool;
 #define FC_DECORATIVE	    "decorative"	/* Bool - true if style is a decorative variant */
 #define FC_LCD_FILTER	    "lcdfilter"		/* Int */
 #define FC_FONT_FEATURES    "fontfeatures"	/* String */
+#define FC_FONT_VARIATIONS  "fontvariations"	/* String */
 #define FC_NAMELANG	    "namelang"		/* String RFC 3866 langs */
 #define FC_PRGNAME	    "prgname"		/* String */
 #define FC_HASH		    "hash"		/* String (deprecated) */
@@ -236,6 +240,12 @@ typedef enum _FcResult {
     FcResultOutOfMemory
 } FcResult;
 
+typedef enum _FcValueBinding {
+    FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame,
+    /* to make sure sizeof (FcValueBinding) == 4 even with -fshort-enums */
+    FcValueBindingEnd = INT_MAX
+} FcValueBinding;
+
 typedef struct _FcPattern   FcPattern;
 
 typedef struct _FcLangSet   FcLangSet;
@@ -270,7 +280,9 @@ typedef struct _FcObjectSet {
 } FcObjectSet;
     
 typedef enum _FcMatchKind {
-    FcMatchPattern, FcMatchFont, FcMatchScan
+    FcMatchPattern, FcMatchFont, FcMatchScan,
+    FcMatchKindEnd,
+    FcMatchKindBegin = FcMatchPattern
 } FcMatchKind;
 
 typedef enum _FcLangResult {
@@ -285,6 +297,12 @@ typedef enum _FcSetName {
     FcSetApplication = 1
 } FcSetName;
 
+typedef struct _FcConfigFileInfoIter {
+    void	*dummy1;
+    void	*dummy2;
+    void	*dummy3;
+} FcConfigFileInfoIter;
+
 typedef struct _FcAtomic FcAtomic;
 
 #if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
@@ -353,6 +371,11 @@ FcDirCacheClean (const FcChar8 *cache_dir, FcBool verbose);
 FcPublic void
 FcCacheCreateTagFile (const FcConfig *config);
 
+FcPublic FcBool
+FcDirCacheCreateUUID (FcChar8  *dir,
+		      FcBool    force,
+		      FcConfig *config);
+
 /* fccfg.c */
 FcPublic FcChar8 *
 FcConfigHome (void);
@@ -441,6 +464,21 @@ FcPublic void
 FcConfigSetSysRoot (FcConfig      *config,
 		    const FcChar8 *sysroot);
 
+FcPublic void
+FcConfigFileInfoIterInit (FcConfig		*config,
+			  FcConfigFileInfoIter	*iter);
+
+FcPublic FcBool
+FcConfigFileInfoIterNext (FcConfig		*config,
+			  FcConfigFileInfoIter	*iter);
+
+FcPublic FcBool
+FcConfigFileInfoIterGet (FcConfig		*config,
+			 FcConfigFileInfoIter	*iter,
+			 FcChar8		**name,
+			 FcChar8		**description,
+			 FcBool			*enabled);
+
 /* fccharset.c */
 FcPublic FcCharSet*
 FcCharSetCreate (void);
@@ -568,7 +606,10 @@ FcDirCacheUnload (FcCache *cache);
 
 /* fcfreetype.c */
 FcPublic FcPattern *
-FcFreeTypeQuery (const FcChar8 *file, int id, FcBlanks *blanks, int *count);
+FcFreeTypeQuery (const FcChar8 *file, unsigned int id, FcBlanks *blanks, int *count);
+
+FcPublic unsigned int
+FcFreeTypeQueryAll(const FcChar8 *file, unsigned int id, FcBlanks *blanks, int *count, FcFontSet *set);
 
 /* fcfs.c */
 
@@ -837,7 +878,10 @@ FcPatternAddWeak (FcPattern *p, const char *object, FcValue value, FcBool append
     
 FcPublic FcResult
 FcPatternGet (const FcPattern *p, const char *object, int id, FcValue *v);
-    
+
+FcPublic FcResult
+FcPatternGetWithBinding (const FcPattern *p, const char *object, int id, FcValue *v, FcValueBinding *b);
+
 FcPublic FcBool
 FcPatternDel (FcPattern *p, const char *object);
 
@@ -922,9 +966,15 @@ FcRangeGetDouble(const FcRange *range, double *begin, double *end);
 FcPublic int
 FcWeightFromOpenType (int ot_weight);
 
+FcPublic double
+FcWeightFromOpenTypeDouble (double ot_weight);
+
 FcPublic int
 FcWeightToOpenType (int fc_weight);
 
+FcPublic double
+FcWeightToOpenTypeDouble (double fc_weight);
+
 /* fcstr.c */
 
 FcPublic FcChar8 *
@@ -1032,6 +1082,11 @@ FcStrListDone (FcStrList *list);
 FcPublic FcBool
 FcConfigParseAndLoad (FcConfig *config, const FcChar8 *file, FcBool complain);
 
+FcPublic FcBool
+FcConfigParseAndLoadFromMemory (FcConfig       *config,
+				const FcChar8  *buffer,
+				FcBool         complain);
+
 _FCFUNCPROTOEND
 
 #undef FC_ATTRIBUTE_SENTINEL

data/vendor/local/lib/fontconfig.def

@@ -43,6 +43,9 @@ EXPORTS
 	FcConfigCreate
 	FcConfigDestroy
 	FcConfigEnableHome
+	FcConfigFileInfoIterGet
+	FcConfigFileInfoIterInit
+	FcConfigFileInfoIterNext
 	FcConfigFilename
 	FcConfigGetBlanks
 	FcConfigGetCache
@@ -57,6 +60,7 @@ EXPORTS
 	FcConfigGetSysRoot
 	FcConfigHome
 	FcConfigParseAndLoad
+	FcConfigParseAndLoadFromMemory
 	FcConfigReference
 	FcConfigSetCurrent
 	FcConfigSetRescanInterval
@@ -67,6 +71,7 @@ EXPORTS
 	FcConfigUptoDate
 	FcDefaultSubstitute
 	FcDirCacheClean
+	FcDirCacheCreateUUID
 	FcDirCacheLoad
 	FcDirCacheLoadFile
 	FcDirCacheRead
@@ -95,6 +100,7 @@ EXPORTS
 	FcFreeTypeCharSet
 	FcFreeTypeCharSetAndSpacing
 	FcFreeTypeQuery
+	FcFreeTypeQueryAll
 	FcFreeTypeQueryFace
 	FcGetDefaultLangs
 	FcGetLangs
@@ -169,6 +175,7 @@ EXPORTS
 	FcPatternGetMatrix
 	FcPatternGetRange
 	FcPatternGetString
+	FcPatternGetWithBinding
 	FcPatternHash
 	FcPatternPrint
 	FcPatternReference
@@ -211,6 +218,8 @@ EXPORTS
 	FcValuePrint
 	FcValueSave
 	FcWeightFromOpenType
+	FcWeightFromOpenTypeDouble
 	FcWeightToOpenType
+	FcWeightToOpenTypeDouble
 LIBRARY libfontconfig-1.dll
-VERSION 10.4
+VERSION 12.1

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

@@ -17,14 +17,14 @@ old_library='libcairo-gobject.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -R/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib -L/home/vagrant/rcairo.win64/vendor/local/lib /home/vagrant/rcairo.win64/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo.win64/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo.win64/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo.win64/vendor/local/lib/libxml2.la /home/vagrant/rcairo.win64/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win64/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz -L/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libffi.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libiconv.la'
+dependency_libs=' -R/home/vagrant/ruby-gnome2/glib2/vendor/local/lib -L/home/vagrant/rcairo/vendor/local/lib /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la /home/vagrant/rcairo/vendor/local/lib/libfreetype.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz -L/home/vagrant/ruby-gnome2/glib2/vendor/local/lib /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libgobject-2.0.la -L/home/vagrant/rcairo.win64/vendor/local/lib /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libffi.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libpcre.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2/glib2/vendor/local/lib/libiconv.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libcairo-gobject.
-current=11512
-age=11510
+current=11514
+age=11512
 revision=0
 
 # Is this an already installed library?
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

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

@@ -17,14 +17,14 @@ old_library='libcairo-script-interpreter.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib /home/vagrant/rcairo.win64/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo.win64/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo.win64/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo.win64/vendor/local/lib/libxml2.la -lws2_32 /home/vagrant/rcairo.win64/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win64/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib /home/vagrant/rcairo/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la -lws2_32 /home/vagrant/rcairo/vendor/local/lib/libfreetype.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libcairo-script-interpreter.
-current=11512
-age=11510
+current=11514
+age=11512
 revision=0
 
 # Is this an already installed library?
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

data/vendor/local/lib/libcairo.la

@@ -17,14 +17,14 @@ old_library='libcairo.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib -lpthread /home/vagrant/rcairo.win64/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo.win64/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo.win64/vendor/local/lib/libxml2.la -lws2_32 /home/vagrant/rcairo.win64/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win64/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib -lpthread /home/vagrant/rcairo/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la -lws2_32 /home/vagrant/rcairo/vendor/local/lib/libfreetype.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libcairo.
-current=11512
-age=11510
+current=11514
+age=11512
 revision=0
 
 # Is this an already installed library?
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

data/vendor/local/lib/libfontconfig.la

@@ -17,15 +17,15 @@ old_library=''
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib /home/vagrant/rcairo.win64/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win64/vendor/local/lib/libpng16.la /home/vagrant/rcairo.win64/vendor/local/lib/libxml2.la -lz -lws2_32'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib /home/vagrant/rcairo/vendor/local/lib/libfreetype.la /home/vagrant/rcairo/vendor/local/lib/libpng16.la /home/vagrant/rcairo/vendor/local/lib/libxml2.la -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
 # Version information for libfontconfig.
-current=10
-age=9
-revision=4
+current=12
+age=11
+revision=1
 
 # Is this an already installed library?
 installed=yes
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

data/vendor/local/lib/libfreetype.la

@@ -17,7 +17,7 @@ old_library='libfreetype.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib /home/vagrant/rcairo.win64/vendor/local/lib/libpng16.la -lz'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib /home/vagrant/rcairo/vendor/local/lib/libpng16.la -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

data/vendor/local/lib/libpixman-1.la

@@ -17,7 +17,7 @@ old_library='libpixman-1.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

data/vendor/local/lib/libpng.la

@@ -17,7 +17,7 @@ old_library='libpng16.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib -lz'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

data/vendor/local/lib/libpng16.la

@@ -17,7 +17,7 @@ old_library='libpng16.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib -lz'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'

data/vendor/local/lib/libxml2.la

@@ -17,7 +17,7 @@ old_library='libxml2.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/vagrant/rcairo.win64/vendor/local/lib -lz -lws2_32'
+dependency_libs=' -L/home/vagrant/rcairo/vendor/local/lib -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/vagrant/rcairo.win64/vendor/local/lib'
+libdir='/home/vagrant/rcairo/vendor/local/lib'