Module Name: src
Committed By: martin
Date: Tue Feb 6 09:28:03 UTC 2018
Modified Files:
src/distrib/sets/lists/xetc [netbsd-8]: mi
src/external/mit/xorg/lib/fontconfig/etc/conf.d [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by maya in ticket #534):
external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile: revision 1.5
distrib/sets/lists/xetc/mi: revision 1.29
Don't fc-match bitmap fonts by default.
Now things using Helvetica won't look terrible, and will use the fallback
font instead.
Idea by jakllsch, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.6.1 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.3 -r1.3.20.1 \
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.27 src/distrib/sets/lists/xetc/mi:1.27.6.1
--- src/distrib/sets/lists/xetc/mi:1.27 Thu Dec 15 12:56:52 2016
+++ src/distrib/sets/lists/xetc/mi Tue Feb 6 09:28:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.27 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: mi,v 1.27.6.1 2018/02/06 09:28:03 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -101,6 +101,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/80-delicious.conf -unknown- xorg
./etc/fonts/conf.d/90-synthetic.conf -unknown- xorg
./etc/fonts/fonts.conf -unknown- x11
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3.20.1
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Tue Feb 6 09:28:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3.20.1 2018/02/06 09:28:03 martin Exp $
.include <bsd.own.mk>
@@ -17,6 +17,7 @@ FONTCONFIG_LINKS= \
65-fonts-persian.conf \
65-nonlatin.conf \
69-unifont.conf \
+ 70-no-bitmaps.conf \
80-delicious.conf \
90-synthetic.conf
