summaryrefslogtreecommitdiffstats
path: root/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-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>