Module Name: src
Committed By: nia
Date: Sat Oct 10 09:17:33 UTC 2020
Modified Files:
src/distrib/sets/lists/xetc: mi
src/external/mit/xorg/lib/fontconfig/etc: fonts.conf
src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
Added Files:
src/external/mit/xorg/lib/fontconfig/etc/conf.avail:
70-no-bitmap-webfonts.conf
Log Message:
Switch to the same hack in pkgsrc for avoiding bitmap fonts on the web
Just for consistency's sake, and making it easier to disable this if
someone wants to do that.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.38 src/distrib/sets/lists/xetc/mi:1.39
--- src/distrib/sets/lists/xetc/mi:1.38 Thu Aug 27 15:32:01 2020
+++ src/distrib/sets/lists/xetc/mi Sat Oct 10 09:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.38 2020/08/27 15:32:01 riastradh Exp $
+# $NetBSD: mi,v 1.39 2020/10/10 09:17:33 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -57,6 +57,7 @@
./etc/fonts/conf.avail/65-khmer.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/65-nonlatin.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/69-unifont.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.avail/70-no-bitmap-webfonts.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/70-no-bitmaps.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/70-yes-bitmaps.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/80-delicious.conf xetc-fontconfig-etc xorg
@@ -78,6 +79,7 @@
./etc/fonts/conf.d/65-fonts-persian.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/65-nonlatin.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/69-unifont.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.d/70-no-bitmap-webfonts.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/80-delicious.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/90-synthetic.conf xetc-fontconfig-etc xorg
./etc/fonts/fonts.conf xetc-fontconfig-etc xorg
Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.10 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.11
--- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.10 Mon Oct 5 09:16:53 2020
+++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Sat Oct 10 09:17:33 2020
@@ -66,33 +66,6 @@
</match>
<!--
- Reject X11 bitmap fonts which may be selected in place of scalable
- proportional fonts, e.g. on the web.
-
- Mostly these are included as scalable system fonts in macOS.
--->
- <selectfont>
- <rejectfont>
- <pattern>
- <patelt name="family"><string>Charter</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- <pattern>
- <patelt name="family"><string>Courier</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- <pattern>
- <patelt name="family"><string>Helvetica</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- <pattern>
- <patelt name="family"><string>Times</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- </rejectfont>
- </selectfont>
-
-<!--
Load local system customization file
-->
<include ignore_missing="yes">conf.d</include>
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.7 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.8
--- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.7 Mon Mar 11 05:05:32 2019
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Sat Oct 10 09:17:33 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2019/03/11 05:05:32 nakayama Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/10 09:17:33 nia Exp $
.include <bsd.own.mk>
-.PATH: ${X11SRCDIR.fontconfig}/conf.d
+.PATH: . ${X11SRCDIR.fontconfig}/conf.d
CONFIGFILES= \
10-autohint.conf \
10-hinting-full.conf \
@@ -34,6 +34,7 @@ CONFIGFILES= \
65-khmer.conf \
65-nonlatin.conf \
69-unifont.conf \
+ 70-no-bitmap-webfonts.conf \
70-no-bitmaps.conf \
70-yes-bitmaps.conf \
80-delicious.conf \
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.7 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.8
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.7 Fri Mar 8 09:58:24 2019
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Sat Oct 10 09:17:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/03/08 09:58:24 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/10 09:17:33 nia Exp $
.include <bsd.own.mk>
@@ -19,6 +19,7 @@ FONTCONFIG_LINKS= \
65-fonts-persian.conf \
65-nonlatin.conf \
69-unifont.conf \
+ 70-no-bitmap-webfonts.conf \
80-delicious.conf \
90-synthetic.conf
Added files:
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf
diff -u /dev/null src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf:1.1
--- /dev/null Sat Oct 10 09:17:33 2020
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf Sat Oct 10 09:17:33 2020
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!-- $NetBSD: 70-no-bitmap-webfonts.conf,v 1.1 2020/10/10 09:17:33 nia Exp $ -->
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+ Reject X11 bitmap fonts which may be selected in place of scalable
+ proportional fonts, e.g. on the web.
+
+ Mostly these are included as scalable system fonts in macOS.
+-->
+ <selectfont>
+ <rejectfont>
+ <pattern>
+ <patelt name="family"><string>Charter</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ <pattern>
+ <patelt name="family"><string>Courier</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ <pattern>
+ <patelt name="family"><string>Helvetica</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ <pattern>
+ <patelt name="family"><string>Times</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ </rejectfont>
+ </selectfont>
+</fontconfig>
