# HG changeset patch
# User Michael Goffioul <michael.goffioul@gmail.com>
# Date 1374632973 14400
# Node ID 33ba1ba990572160e68b042395d7cc29400a0829
# Parent  8d294e37ce659e8651245ec8ec39abea3d578ecc
Update fontconfig to 2.10.93 (required by current Pango)

diff -r 8d294e37ce65 -r 33ba1ba99057 index.html
--- a/index.html	Tue Jul 23 22:29:33 2013 -0400
+++ b/index.html	Tue Jul 23 22:29:33 2013 -0400
@@ -1150,7 +1150,7 @@
     </tr>
     <tr>
         <td id="fontconfig-package">fontconfig</td>
-        <td id="fontconfig-version">2.10.1</td>
+        <td id="fontconfig-version">2.10.93</td>
         <td id="fontconfig-website"><a href="http://fontconfig.org/">fontconfig</a></td>
     </tr>
     <tr>
diff -r 8d294e37ce65 -r 33ba1ba99057 src/fontconfig.mk
--- a/src/fontconfig.mk	Tue Jul 23 22:29:33 2013 -0400
+++ b/src/fontconfig.mk	Tue Jul 23 22:29:33 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := fontconfig
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := c51c9865047a9546f41cedefbf955cc9bd846517
+$(PKG)_CHECKSUM := 78a87be2a59b0c803bfd69cdafc85cbc31381d3a
 $(PKG)_SUBDIR   := fontconfig-$($(PKG)_VERSION)
 $(PKG)_FILE     := fontconfig-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://fontconfig.org/release/$($(PKG)_FILE)
diff -r 8d294e37ce65 -r 33ba1ba99057 src/msvc-fontconfig-1.patch
--- a/src/msvc-fontconfig-1.patch	Tue Jul 23 22:29:33 2013 -0400
+++ b/src/msvc-fontconfig-1.patch	Tue Jul 23 22:29:33 2013 -0400
@@ -1,7 +1,7 @@
-diff -ur fontconfig-2.10.1-orig/fc-cache/fc-cache.c fontconfig-2.10.1/fc-cache/fc-cache.c
---- fontconfig-2.10.1-orig/fc-cache/fc-cache.c	2012-07-23 22:01:32 -0400
-+++ fontconfig-2.10.1/fc-cache/fc-cache.c	2013-06-25 10:47:29 -0400
-@@ -80,6 +80,17 @@
+diff -ur fontconfig-2.10.93-orig/fc-cache/fc-cache.c fontconfig-2.10.93/fc-cache/fc-cache.c
+--- fontconfig-2.10.93-orig/fc-cache/fc-cache.c	2013-04-03 23:09:46 -0400
++++ fontconfig-2.10.93/fc-cache/fc-cache.c	2013-07-22 23:39:46 -0400
+@@ -81,6 +81,17 @@
  #endif
  #endif
  
@@ -19,21 +19,21 @@
  static void
  usage (char *program, int error)
  {
-diff -ur fontconfig-2.10.1-orig/src/Makefile.in fontconfig-2.10.1/src/Makefile.in
---- fontconfig-2.10.1-orig/src/Makefile.in	2012-07-26 22:24:51 -0400
-+++ fontconfig-2.10.1/src/Makefile.in	2013-06-25 10:47:47 -0400
-@@ -308,7 +308,7 @@
+diff -ur fontconfig-2.10.93-orig/src/Makefile.in fontconfig-2.10.93/src/Makefile.in
+--- fontconfig-2.10.93-orig/src/Makefile.in	2013-05-20 04:44:35 -0400
++++ fontconfig-2.10.93/src/Makefile.in	2013-07-22 23:39:46 -0400
+@@ -353,7 +353,7 @@
  @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def
  
  # Microsoft import library install/uninstall
 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib
 +@MS_LIB_AVAILABLE_TRUE@#noinst_DATA = fontconfig.lib
- INCLUDES = \
+ AM_CPPFLAGS = \
  	-I$(top_srcdir)					\
  	-I$(top_srcdir)/src				\
-@@ -754,9 +754,9 @@
- ../fc-lang/fclang.h:
- 	cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h
+@@ -847,9 +847,9 @@
+ 	$(AM_V_GEN) $(GPERF) -m 100 $< > $@.tmp && \
+ 	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
  
 -@ENABLE_SHARED_TRUE@install-data-local: install-ms-import-lib install-libtool-import-lib
 +@ENABLE_SHARED_TRUE@#install-data-local: install-ms-import-lib install-libtool-import-lib
@@ -43,25 +43,25 @@
  
  fcaliastail.h: fcalias.h
  
-@@ -772,10 +772,8 @@
+@@ -870,10 +870,8 @@
  	echo Generating $@
  	(echo EXPORTS; \
  	(cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
--	grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/	/' | \
+-	$(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/	/' | \
 -	sort; \
 -	echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
 -	echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
-+	grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' | \
++	$(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' | \
 +	sort) >$@
- 	@ ! grep -q FcERROR $@ || ($(RM) $@; false)
+ 	@ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -ur fontconfig-2.10.1-orig/src/fccache.c fontconfig-2.10.1/src/fccache.c
---- fontconfig-2.10.1-orig/src/fccache.c	2012-07-23 22:01:32 -0400
-+++ fontconfig-2.10.1/src/fccache.c	2013-06-25 10:47:29 -0400
-@@ -804,6 +804,12 @@
- 
+ -include $(top_srcdir)/git.mk
+diff -ur fontconfig-2.10.93-orig/src/fccache.c fontconfig-2.10.93/src/fccache.c
+--- fontconfig-2.10.93-orig/src/fccache.c	2013-04-03 23:09:46 -0400
++++ fontconfig-2.10.93/src/fccache.c	2013-07-22 23:39:46 -0400
+@@ -834,6 +834,12 @@
  #ifdef _WIN32
+ #include <direct.h>
  #define mkdir(path,mode) _mkdir(path)
 +#ifndef F_OK
 +#define F_OK 0
@@ -72,9 +72,23 @@
  #endif
  
  static FcBool
-diff -ur fontconfig-2.10.1-orig/src/fcdir.c fontconfig-2.10.1/src/fcdir.c
---- fontconfig-2.10.1-orig/src/fcdir.c	2012-07-23 22:01:32 -0400
-+++ fontconfig-2.10.1/src/fcdir.c	2013-06-25 10:47:29 -0400
+diff -ur fontconfig-2.10.93-orig/src/fccompat.c fontconfig-2.10.93/src/fccompat.c
+--- fontconfig-2.10.93-orig/src/fccompat.c	2013-04-03 23:09:46 -0400
++++ fontconfig-2.10.93/src/fccompat.c	2013-07-22 23:36:55 -0400
+@@ -72,6 +72,10 @@
+ #define FC_O_NOINHERIT 0
+ #endif
+ 
++#ifdef _MSC_VER
++typedef int mode_t;
++#endif
++
+ #if !defined (HAVE_MKOSTEMP) && !defined(HAVE_MKSTEMP) && !defined(HAVE__MKTEMP_S)
+ static int
+ mkstemp (char *template)
+diff -ur fontconfig-2.10.93-orig/src/fcdir.c fontconfig-2.10.93/src/fcdir.c
+--- fontconfig-2.10.93-orig/src/fcdir.c	2013-01-03 20:47:59 -0500
++++ fontconfig-2.10.93/src/fcdir.c	2013-07-22 23:39:46 -0400
 @@ -25,6 +25,10 @@
  #include "fcint.h"
  #include <dirent.h>
@@ -86,9 +100,9 @@
  FcBool
  FcFileIsDir (const FcChar8 *file)
  {
-diff -ur fontconfig-2.10.1-orig/src/fcformat.c fontconfig-2.10.1/src/fcformat.c
---- fontconfig-2.10.1-orig/src/fcformat.c	2012-07-23 22:01:32 -0400
-+++ fontconfig-2.10.1/src/fcformat.c	2013-06-25 10:47:29 -0400
+diff -ur fontconfig-2.10.93-orig/src/fcformat.c fontconfig-2.10.93/src/fcformat.c
+--- fontconfig-2.10.93-orig/src/fcformat.c	2013-01-03 20:47:59 -0500
++++ fontconfig-2.10.93/src/fcformat.c	2013-07-22 23:39:46 -0400
 @@ -27,6 +27,10 @@
  #include <string.h>
  #include <stdarg.h>