summaryrefslogtreecommitdiffstats
path: root/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff')
-rw-r--r--source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff42
1 files changed, 33 insertions, 9 deletions
diff --git a/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
index 6d8fa176f..99d6574f1 100644
--- a/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
+++ b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
@@ -1,12 +1,5 @@
-Since this fontconfig change [1], we get warnings in 44-wqy-zenhei.conf
-like this: "Having multiple values in <test> isn't supported and may
-not work as expected" - let's fix that...
-
-[1] http://cgit.freedesktop.org/fontconfig/commit/?id=2837c63876b9b
-
-diff -Nur wqy-zenhei.orig/44-wqy-zenhei.conf wqy-zenhei/44-wqy-zenhei.conf
---- wqy-zenhei.orig/44-wqy-zenhei.conf 2009-05-17 15:25:41.000000000 -0500
-+++ wqy-zenhei/44-wqy-zenhei.conf 2013-02-25 19:00:36.870491434 -0600
+--- ./44-wqy-zenhei.conf.orig 2009-01-09 17:36:40.000000000 -0600
++++ ./44-wqy-zenhei.conf 2017-04-30 16:32:33.135746412 -0500
@@ -6,7 +6,11 @@
<match target="font">
<test qual="any" name="family">
@@ -19,3 +12,34 @@ diff -Nur wqy-zenhei.orig/44-wqy-zenhei.conf wqy-zenhei/44-wqy-zenhei.conf
<string>文泉驛正黑</string>
</test>
<edit name="globaladvance"><bool>false</bool></edit>
+@@ -22,24 +26,27 @@
+ <alias>
+ <family>serif</family>
+ <prefer>
+- <family>Bitstream Vera Serif</family>
++ <family>Liberation Serif</family>
+ <family>DejaVu Serif</family>
++ <family>Bitstream Vera Serif</family>
+ <family>WenQuanYi Zen Hei</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+- <family>Bitstream Vera Sans</family>
++ <family>Liberation Sans</family>
+ <family>DejaVu Sans</family>
++ <family>Bitstream Vera Sans</family>
+ <family>WenQuanYi Zen Hei</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+- <family>Bitstream Vera Sans Mono</family>
++ <family>Liberation Sans Mono</family>
+ <family>DejaVu Sans Mono</family>
++ <family>Bitstream Vera Sans Mono</family>
+ <family>WenQuanYi Zen Hei Mono</family>
+ </prefer>
+ </alias>