Module Name: src
Committed By: maya
Date: Thu Aug 30 05:39:21 UTC 2018
Modified Files:
src/distrib/sets/lists/xetc: mi
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
Log Message:
revert my own commit from a while back. Do allow matching bitmap fonts.
Not all bitmap fonts are bad, apparently.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.5 -r1.6 \
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.30 src/distrib/sets/lists/xetc/mi:1.31
--- src/distrib/sets/lists/xetc/mi:1.30 Thu Mar 29 04:43:55 2018
+++ src/distrib/sets/lists/xetc/mi Thu Aug 30 05:39:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.30 2018/03/29 04:43:55 snj Exp $
+# $NetBSD: mi,v 1.31 2018/08/30 05:39:21 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -74,7 +74,7 @@
./etc/fonts/conf.d/65-fonts-persian.conf -unknown- xorg
./etc/fonts/conf.d/65-nonlatin.conf -unknown- xorg
./etc/fonts/conf.d/69-unifont.conf -unknown- xorg
-./etc/fonts/conf.d/70-no-bitmaps.conf -unknown- xorg
+./etc/fonts/conf.d/70-no-bitmaps.conf -unknown- obsolete
./etc/fonts/conf.d/80-delicious.conf -unknown- xorg
./etc/fonts/conf.d/90-synthetic.conf -unknown- xorg
./etc/fonts/fonts.conf -unknown- xorg
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.5 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.6
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.5 Tue Aug 29 15:50:57 2017
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Thu Aug 30 05:39:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/08/29 15:50:57 maya Exp $
+# $NetBSD: Makefile,v 1.6 2018/08/30 05:39:21 maya Exp $
.include <bsd.own.mk>
@@ -18,7 +18,6 @@ FONTCONFIG_LINKS= \
65-fonts-persian.conf \
65-nonlatin.conf \
69-unifont.conf \
- 70-no-bitmaps.conf \
80-delicious.conf \
90-synthetic.conf
