Date: Tue, 5 Nov 2013 19:40:02 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332902 - in head/x11-fonts/wqy: . files Message-ID: <201311051940.rA5Je2lP009970@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Nov 5 19:40:01 2013 New Revision: 332902 URL: http://svnweb.freebsd.org/changeset/ports/332902 Log: Fix a warning "Having multiple values in <test> isn't supported and may not work as expected" when using the latest x11-fonts/fontconfig. This is similar to r326328 (ports/181701). Reported by: Eric Camachat <eric.camachat gmail.com> Submitted by: maintainer PR: ports/182865 Modified: head/x11-fonts/wqy/Makefile head/x11-fonts/wqy/files/85-wqy.conf Modified: head/x11-fonts/wqy/Makefile ============================================================================== --- head/x11-fonts/wqy/Makefile Tue Nov 5 19:33:28 2013 (r332901) +++ head/x11-fonts/wqy/Makefile Tue Nov 5 19:40:01 2013 (r332902) @@ -3,7 +3,7 @@ PORTNAME= wqy-fonts PORTVERSION= 20100803 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= SF/wqy/wqy-bitmapfont/1.0.0-RC1:bitmapfont \ Modified: head/x11-fonts/wqy/files/85-wqy.conf ============================================================================== --- head/x11-fonts/wqy/files/85-wqy.conf Tue Nov 5 19:33:28 2013 (r332901) +++ head/x11-fonts/wqy/files/85-wqy.conf Tue Nov 5 19:40:01 2013 (r332902) @@ -2,30 +2,73 @@ <!-- $FreeBSD$ --> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> + <!-- Editing properties for all WenQuanYi fonts --> <match target="font"> - <test name="family" equal="any" compare="eq"> - <string>WenQuanYi Bitmap Song</string> - <string>Unibit</string> - <string>WenQuanYi Zen Hei</string> - <string>文泉驿正黑</string> - <string>文泉驛正黑</string> - <string>文泉驿点阵正黑</string> - <string>文泉驛點陣正黑</string> - <string>WenQuanYi Zen Hei Sharp</string> - <string>文泉驿等宽正黑</string> - <string>文泉驛等寬正黑</string> - <string>WenQuanYi Zen Hei Mono</string> - <string>文泉驿等宽微米黑</string> - <string>文泉驛等寬微米黑</string> - <string>WenQuanYi Micro Hei Mono Light</string> - <string>文泉驿等宽微米黑</string> - <string>文泉驛等寬微米黑</string> - <string>WenQuanYi Micro Hei Mono</string> - <string>文泉驿微米黑</string> - <string>文泉驛微米黑</string> - <string>WenQuanYi Micro Hei</string> - <string>WenQuanYi Micro Hei Light</string> - </test> + <or> + <test name="family" compare="eq"> + <string>WenQuanYi Bitmap Song</string> + </test> + <test name="family" compare="eq"> + <string>Unibit</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei</string> + </test> + <test name="family" compare="eq"> + <string>文泉驿正黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驛正黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驿点阵正黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驛點陣正黑</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei Sharp</string> + </test> + <test name="family" compare="eq"> + <string>文泉驿等宽正黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驛等寬正黑</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei Mono</string> + </test> + <test name="family" compare="eq"> + <string>文泉驿等宽微米黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驛等寬微米黑</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei Mono Light</string> + </test> + <test name="family" compare="eq"> + <string>文泉驿等宽微米黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驛等寬微米黑</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei Mono</string> + </test> + <test name="family" compare="eq"> + <string>文泉驿微米黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驛微米黑</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Micro Hei Light</string> + </test> + </or> <edit name="antialias"><bool>true</bool></edit> <edit name="hinting"><bool>true</bool></edit> <edit name="autohint"><bool>false</bool></edit> @@ -34,30 +77,56 @@ <edit name="globaladvance"><bool>false</bool></edit> </match> + <!-- Editing properties for bitmap fonts to avoid fuzzy display --> <match target="font"> - <test name="family" equal="any" compare="eq"> - <string>WenQuanYi Bitmap Song</string> - <string>Unibit</string> - <string>WenQuanYi Zen Hei</string> - <string>文泉驿正黑</string> - <string>文泉驛正黑</string> - </test> + <or> + <test name="family" compare="eq"> + <string>WenQuanYi Bitmap Song</string> + </test> + <test name="family" compare="eq"> + <string>Unibit</string> + </test> + <test name="family" compare="eq"> + <string>WenQuanYi Zen Hei</string> + </test> + <test name="family" compare="eq"> + <string>文泉驿正黑</string> + </test> + <test name="family" compare="eq"> + <string>文泉驛正黑</string> + </test> + </or> <test name="size" compare="less_eq"><int>16</int></test> <edit name="antialias" mode="assign"><bool>false</bool></edit> </match> + <!-- Prior use WenQuanYi Bitmap Song for Chinese Han --> <match target="pattern"> - <test name="family" equal="any" compare="eq"> - <string>serif</string> - <string>sans-serif</string> - <string>monospace</string> - </test> - <test equal="any" compare="eq" name="lang"> - <string>zh-cn</string> - <string>zh-tw</string> - <string>zh-hk</string> - <string>zh-sg</string> - </test> + <or> + <test name="family" compare="eq"> + <string>serif</string> + </test> + <test name="family" compare="eq"> + <string>sans-serif</string> + </test> + <test name="family" compare="eq"> + <string>monospace</string> + </test> + </or> + <or> + <test compare="eq" name="lang"> + <string>zh-cn</string> + </test> + <test compare="eq" name="lang"> + <string>zh-tw</string> + </test> + <test compare="eq" name="lang"> + <string>zh-hk</string> + </test> + <test compare="eq" name="lang"> + <string>zh-sg</string> + </test> + </or> <test compare="more_eq" name="pixelsize"> <double>12</double> </test>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311051940.rA5Je2lP009970>