Module Name:    src
Committed By:   mrg
Date:           Tue Jun 20 02:25:20 UTC 2023

Modified Files:
        src/distrib/sets/lists/xetc: mi
        src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile

Log Message:
update for fontconfig 2.14.2.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.11 -r1.12 \
    src/external/mit/xorg/lib/fontconfig/etc/conf.avail/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.43 src/distrib/sets/lists/xetc/mi:1.44
--- src/distrib/sets/lists/xetc/mi:1.43	Sat Jan 28 05:25:18 2023
+++ src/distrib/sets/lists/xetc/mi	Tue Jun 20 02:25:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.43 2023/01/28 05:25:18 mrg Exp $
+# $NetBSD: mi,v 1.44 2023/06/20 02:25:19 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -32,10 +32,11 @@
 ./etc/fonts/conf.avail/10-hinting-medium.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/10-hinting-none.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/10-hinting-slight.conf		xetc-fontconfig-etc	xorg
-./etc/fonts/conf.avail/10-no-sub-pixel.conf		xetc-fontconfig-etc	xorg
+./etc/fonts/conf.avail/10-no-sub-pixel.conf		xetc-obsolete	obsolete
 ./etc/fonts/conf.avail/10-no-antialias.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf	xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/10-sub-pixel-bgr.conf		xetc-fontconfig-etc	xorg
+./etc/fonts/conf.avail/10-sub-pixel-none.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/10-sub-pixel-rgb.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/10-sub-pixel-vbgr.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/10-sub-pixel-vrgb.conf		xetc-fontconfig-etc	xorg

Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.11 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.12
--- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.11	Sat Jan 28 05:25:17 2023
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile	Tue Jun 20 02:25:19 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2023/01/28 05:25:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2023/06/20 02:25:19 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,7 @@ CONFIGFILES= \
 	10-hinting-none.conf \
 	10-hinting-slight.conf \
 	10-no-antialias.conf \
-	10-no-sub-pixel.conf \
+	10-sub-pixel-none.conf \
 	10-sub-pixel-bgr.conf \
 	10-sub-pixel-rgb.conf \
 	10-sub-pixel-vbgr.conf \

Reply via email to