Module Name: src
Committed By: mrg
Date: Tue Aug 29 20:53:56 UTC 2017
Modified Files:
src/external/mit/xorg/lib/fontconfig/etc: Makefile fonts.conf
Log Message:
update fonts.conf for fontconfig 2.12.4. removes <blank> section.
add a Makefile comment about how to regenerate it.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/fontconfig/etc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/etc/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.4
--- src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.3 Mon Sep 7 21:07:03 2009
+++ src/external/mit/xorg/lib/fontconfig/etc/Makefile Tue Aug 29 20:53:56 2017
@@ -1,4 +1,18 @@
-# $NetBSD: Makefile,v 1.3 2009/09/07 21:07:03 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/29 20:53:56 mrg Exp $
+
+# When updating fontconfig, be sure to update the fonts.conf. This
+# requires running ./configure like this:
+#
+# env PKG_CONFIG_PATH=/usr/X11R7/share/pkgconfig \
+# ./configure \
+# --localstatedir=/var \
+# --with-default-fonts=/usr/X11R7/lib/X11/fonts \
+# --with-add-fonts=/usr/pkg/lib/X11/fonts,/usr/pkg/share/fonts \
+# --with-configdir=conf.d
+#
+# and then running gmake fonts.conf and copying the new file here.
+# (gmake is required here as the FC_CONFIGDIR pattern uses $(subst).)
+#
SUBDIR= conf.d conf.avail
Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.8
--- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7 Thu Jun 5 10:45:39 2014
+++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Tue Aug 29 20:53:56 2017
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- $NetBSD: fonts.conf,v 1.7 2014/06/05 10:45:39 wiz Exp $ -->
<!-- /etc/fonts/fonts.conf file to configure system font access -->
<fontconfig>
@@ -25,8 +24,7 @@
<!-- Font directory list -->
<dir>/usr/X11R7/lib/X11/fonts</dir>
- <dir>/usr/pkg/lib/X11/fonts</dir>
- <dir>/usr/pkg/share/fonts</dir>
+ <dir>/usr/pkg/lib/X11/fonts</dir> <dir>/usr/pkg/share/fonts</dir>
<dir prefix="xdg">fonts</dir>
<!-- the following element will be removed in the future -->
<dir>~/.fonts</dir>
@@ -81,72 +79,6 @@
<config>
<!--
- These are the default Unicode chars that are expected to be blank
- in fonts. All other blank chars are assumed to be broken and
- won't appear in the resulting charsets
- -->
- <blank>
- <int>0x0020</int> <!-- SPACE -->
- <int>0x00A0</int> <!-- NO-BREAK SPACE -->
- <int>0x00AD</int> <!-- SOFT HYPHEN -->
- <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
- <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
- <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
- <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
- <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
- <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
- <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
- <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
- <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
- <int>0x1680</int> <!-- OGHAM SPACE MARK -->
- <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
- <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
- <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
- <int>0x2000</int> <!-- EN QUAD -->
- <int>0x2001</int> <!-- EM QUAD -->
- <int>0x2002</int> <!-- EN SPACE -->
- <int>0x2003</int> <!-- EM SPACE -->
- <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
- <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
- <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
- <int>0x2007</int> <!-- FIGURE SPACE -->
- <int>0x2008</int> <!-- PUNCTUATION SPACE -->
- <int>0x2009</int> <!-- THIN SPACE -->
- <int>0x200A</int> <!-- HAIR SPACE -->
- <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
- <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
- <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
- <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
- <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
- <int>0x2028</int> <!-- LINE SEPARATOR -->
- <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
- <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
- <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
- <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
- <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
- <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
- <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
- <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
- <int>0x2060</int> <!-- WORD JOINER -->
- <int>0x2061</int> <!-- FUNCTION APPLICATION -->
- <int>0x2062</int> <!-- INVISIBLE TIMES -->
- <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
- <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
- <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
- <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
- <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
- <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
- <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
- <int>0x2800</int> <!-- BRAILLE PATTERN BLANK -->
- <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
- <int>0x3164</int> <!-- HANGUL FILLER -->
- <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
- <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
- <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
- <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
- <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
- </blank>
-<!--
Rescan configuration every 30 seconds when FcFontSetList is called
-->
<rescan>
