From b7b8c3d2511c0868851652b60848164fd2f6eb6a Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 14 Mar 2014 06:56:19 -0700
Subject: [PATCH] Update fontconfig

---
 build/fontconfig/fontconfig.vcxproj         | 20 +++++--
 build/fontconfig/fontconfig.vcxproj.filters | 59 +++++++++++++++++----
 vendor/fontconfig                           |  2 +-
 3 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/build/fontconfig/fontconfig.vcxproj b/build/fontconfig/fontconfig.vcxproj
index 1afc3cd04..4a8b4a77f 100644
--- a/build/fontconfig/fontconfig.vcxproj
+++ b/build/fontconfig/fontconfig.vcxproj
@@ -36,37 +36,49 @@
     </InstallHeader>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcatomic.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcblanks.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fccache.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fccfg.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fccharset.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fccompat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcdbg.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c" />
-    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.cpp" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcfreetype.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcfs.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fchash.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcinit.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fclang.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fclist.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcmatch.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcmatrix.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcname.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcobjs.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcpat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcserialize.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcstr.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\fcxml.c" />
     <ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h" />
-    <ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcfreetype.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcprivate.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fontconfig.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcarch.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcatomic.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\fcftint.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\fcint.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcmutex.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjs.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjshash.gperf.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcwindows.h" />
     <ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h" />
   </ItemGroup>
 </Project>
diff --git a/build/fontconfig/fontconfig.vcxproj.filters b/build/fontconfig/fontconfig.vcxproj.filters
index e65bdc6e4..64034691c 100644
--- a/build/fontconfig/fontconfig.vcxproj.filters
+++ b/build/fontconfig/fontconfig.vcxproj.filters
@@ -38,9 +38,6 @@
     <ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -83,14 +80,23 @@
     <ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcobjs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fccompat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fchash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(FontconfigSrcDir)\win32\headers\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(FontconfigSrcDir)\win32\headers\dirent.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -103,5 +109,38 @@
     <ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcfreetype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcprivate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fontconfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcarch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcatomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcmutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcobjshash.gperf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcwindows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/vendor/fontconfig b/vendor/fontconfig
index b16b9f0b5..6c22e896d 160000
--- a/vendor/fontconfig
+++ b/vendor/fontconfig
@@ -1 +1 @@
-Subproject commit b16b9f0b51fcb3a96dbf81898cc5b0fa98937f7f
+Subproject commit 6c22e896d4593e6f28ab2ab7f3c6b8f0b0df7857