--- a/open-src/lib/fontconfig/Makefile Wed May 13 11:14:20 2015 -0700
+++ b/open-src/lib/fontconfig/Makefile Mon May 04 13:42:14 2015 -0700
@@ -75,7 +75,7 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
arial-narrow.conf.patch \
- cjk-fonts.conf.patch \
+ cjk-fonts.conf.patch,-p1 \
Makefile.am.0.patch \
bitmap-hacks.patch \
6447517.patch \
--- a/open-src/lib/fontconfig/cjk-fonts.conf.patch Wed May 13 11:14:20 2015 -0700
+++ b/open-src/lib/fontconfig/cjk-fonts.conf.patch Mon May 04 13:42:14 2015 -0700
@@ -1,6 +1,7 @@
-diff -urp -x '*~' -x '*.orig' conf.d/40-nonlatin.conf conf.d/40-nonlatin.conf
---- conf.d/40-nonlatin.conf 2009-06-28 10:48:47.000000000 -0700
-+++ conf.d/40-nonlatin.conf 2010-05-10 15:09:19.723829150 -0700
+diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
+index a875db0..b8efa09 100644
+--- a/conf.d/40-nonlatin.conf
++++ b/conf.d/40-nonlatin.conf
@@ -18,6 +18,17 @@
<family>Zar</family>
<family>Titr</family>
@@ -43,9 +44,10 @@
<family>NSimSun</family>
<family>ZYSong18030</family>
<family>FreeMono</family>
-diff -urp -x '*~' -x '*.orig' conf.d/45-latin.conf conf.d/45-latin.conf
---- conf.d/45-latin.conf 2009-11-16 09:24:52.000000000 -0800
-+++ conf.d/45-latin.conf 2010-05-10 15:09:19.724150949 -0700
+diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
+index 7e41264..85cb11e 100644
+--- a/conf.d/45-latin.conf
++++ b/conf.d/45-latin.conf
@@ -10,6 +10,7 @@
Serif faces
-->
@@ -70,9 +72,10 @@
<family>Bitstream Vera Sans Mono</family>
<family>DejaVu Sans Mono</family>
<family>Liberation Mono</family>
-diff -urp -x '*~' -x '*.orig' conf.d/65-nonlatin.conf conf.d/65-nonlatin.conf
---- conf.d/65-nonlatin.conf 2009-11-16 09:24:52.000000000 -0800
-+++ conf.d/65-nonlatin.conf 2010-05-10 15:09:19.724709053 -0700
+diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
+index 53ac064..3816f9b 100644
+--- a/conf.d/65-nonlatin.conf
++++ b/conf.d/65-nonlatin.conf
@@ -4,6 +4,7 @@
<alias>
<family>serif</family>
@@ -111,11 +114,12 @@
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>AR PL Zenkai Uni</family>
-@@ -64,11 +71,13 @@
+@@ -64,11 +71,14 @@
<family>Lohit Telugu</family>
<family>Lohit Oriya</family>
<family>LKLUG</family>
+ <family>SunDotum</family>
++ <family>Gothic</family>
</prefer>
</alias>
<alias>
@@ -125,7 +129,7 @@
<family>Nachlieli</family> <!-- hebrew -->
<family>Lucida Sans Unicode</family>
<family>Yudit Unicode</family>
-@@ -99,19 +108,23 @@
+@@ -99,19 +109,23 @@
<!-- chinese fonts are actually serifed -->
<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
<family>PMingLiu</family> <!-- han (zh-tw) -->
@@ -155,11 +159,12 @@
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ＭＳ ゴシック</family>
-@@ -138,17 +151,23 @@
+@@ -138,17 +152,24 @@
<family>Lohit Telugu</family>
<family>Lohit Oriya</family>
<family>LKLUG</family>
+ <family>SunDotum</family>
++ <family>Gothic</family>
</prefer>
</alias>
<alias>
@@ -180,7 +185,7 @@
<family>AR PL KaitiM GB</family>
<family>MS Gothic</family> <!-- han (ja) -->
<family>UmePlus Gothic</family> <!-- han (ja) -->
-@@ -160,8 +179,6 @@
+@@ -160,8 +181,6 @@
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
@@ -189,13 +194,14 @@
<family>Baekmuk Batang</family> <!-- hangul -->
<family>Baekmuk Dotum</family>
<family>Baekmuk Gulim</family>
-@@ -190,6 +207,9 @@
+@@ -190,6 +209,10 @@
<family>Lohit Telugu</family>
<family>Lohit Oriya</family>
<family>LKLUG</family>
+ <family>SunDotumChe</family>
+ <family>UnBatang</family>
+ <family>UnDotum</family>
++ <family>Gothic</family>
</prefer>
</alias>
</fontconfig>