Module Name: src
Committed By: mrg
Date: Thu Jan 19 06:29:10 UTC 2023
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
src/external/mit/xorg/lib/fontconfig/src: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
updates for fontconfig 2.14.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/tools/fc-cache/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.40 src/distrib/sets/lists/xetc/mi:1.41
--- src/distrib/sets/lists/xetc/mi:1.40 Sat Jan 9 02:40:44 2021
+++ src/distrib/sets/lists/xetc/mi Thu Jan 19 06:29:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.40 2021/01/09 02:40:44 uki Exp $
+# $NetBSD: mi,v 1.41 2023/01/19 06:29:10 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -25,6 +25,8 @@
./etc/X11/xinit/xinitrc xetc-xinit-etc xorg
./etc/X11/xsm/system.xsm xetc-xfm-etc xorg
./etc/drirc xetc-dri-etc xorg
+./etc/fonts/conf.avail/05-reset-dirs-sample.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.avail/09-autohint-if-no-hinting.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/10-autohint.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/10-hinting-full.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/10-hinting-medium.conf xetc-fontconfig-etc xorg
@@ -45,9 +47,11 @@
./etc/fonts/conf.avail/25-unhint-nonlatin.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/30-metric-aliases.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/30-urw-aliases.conf xetc-obsolete obsolete
+./etc/fonts/conf.avail/35-lang-normalize.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/40-nonlatin.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/45-generic.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/45-latin.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.avail/48-spacing.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/49-sansserif.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/50-user.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/51-local.conf xetc-fontconfig-etc xorg
@@ -64,6 +68,7 @@
./etc/fonts/conf.avail/90-synthetic.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/10-hinting-slight.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/10-scale-bitmap-fonts.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.d/11-lcdfilter-default.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/20-fix-globaladvance.conf xetc-obsolete obsolete
./etc/fonts/conf.d/20-unhint-small-vera.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/30-metric-aliases.conf xetc-fontconfig-etc xorg
@@ -71,6 +76,7 @@
./etc/fonts/conf.d/40-nonlatin.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/45-generic.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/45-latin.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.d/48-spacing.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/49-sansserif.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/50-user.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/51-local.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.11 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.12
--- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.11 Sat Oct 10 09:17:33 2020
+++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Thu Jan 19 06:29:10 2023
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<!-- /etc/fonts/fonts.conf file to configure system font access -->
<fontconfig>
+ <description>Default configuration file</description>
<!--
DO NOT EDIT THIS FILE.
@@ -11,8 +12,8 @@
The intent of this standard configuration file is to be adequate for
most environments. If you have a reasonably normal environment and
have found problems with this configuration, they are probably
- things that others will also want fixed. Please submit any
- problems to the fontconfig bugzilla system located at fontconfig.org
+ things that others will also want fixed. Please submit any problems
+ to the fontconfig issue tracking system located at fontconfig.org
Note that the normal 'make install' procedure for fontconfig is to
replace any existing fonts.conf file with the new version. Place
@@ -64,11 +65,22 @@
<string>sans-serif</string>
</edit>
</match>
+<!--
+ Accept alternate 'system ui' spelling, replacing it with 'system-ui'
+-->
+ <match target="pattern">
+ <test qual="any" name="family">
+ <string>system ui</string>
+ </test>
+ <edit name="family" mode="assign" binding="same">
+ <string>system-ui</string>
+ </edit>
+ </match>
<!--
Load local system customization file
-->
- <include ignore_missing="yes">conf.d</include>
+ <include ignore_missing="yes">/etc/fonts/conf.d</include>
<!-- Font cache directory list -->
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.8 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.9
--- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.8 Sat Oct 10 09:17:33 2020
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Thu Jan 19 06:29:10 2023
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2020/10/10 09:17:33 nia Exp $
+# $NetBSD: Makefile,v 1.9 2023/01/19 06:29:10 mrg Exp $
.include <bsd.own.mk>
.PATH: . ${X11SRCDIR.fontconfig}/conf.d
CONFIGFILES= \
+ 05-reset-dirs-sample.conf \
+ 09-autohint-if-no-hinting.conf \
10-autohint.conf \
10-hinting-full.conf \
10-hinting-medium.conf \
@@ -22,9 +24,11 @@ CONFIGFILES= \
20-unhint-small-vera.conf \
25-unhint-nonlatin.conf \
30-metric-aliases.conf \
+ 35-lang-normalize.conf \
40-nonlatin.conf \
45-generic.conf \
45-latin.conf \
+ 48-spacing.conf \
49-sansserif.conf \
50-user.conf \
51-local.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.8 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.9
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.8 Sat Oct 10 09:17:33 2020
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Thu Jan 19 06:29:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/10/10 09:17:33 nia Exp $
+# $NetBSD: Makefile,v 1.9 2023/01/19 06:29:10 mrg Exp $
.include <bsd.own.mk>
@@ -6,11 +6,13 @@
FONTCONFIG_LINKS= \
10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
+ 11-lcdfilter-default.conf \
20-unhint-small-vera.conf \
30-metric-aliases.conf \
40-nonlatin.conf \
45-generic.conf \
45-latin.conf \
+ 48-spacing.conf \
49-sansserif.conf \
50-user.conf \
51-local.conf \
@@ -32,5 +34,3 @@ CONFIGSYMLINKS+=${CONFAVAILDIR}/${_conff
.include <bsd.x11.mk>
.include <bsd.prog.mk>
-
-# obsolete 30-urw-aliases.conf
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.25 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.26
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.25 Sun Mar 24 10:39:45 2019
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Jan 19 06:29:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/03/24 10:39:45 kre Exp $
+# $NetBSD: Makefile,v 1.26 2023/01/19 06:29:10 mrg Exp $
.include <bsd.own.mk>
@@ -267,9 +267,10 @@ TEMPLATEDIR=${FONTCONFIG_PATH}/fontconfi
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -DFONTCONFIG_PATH='"${FONTCONFIG_PATH}"' \
- -DFC_DEFAULT_FONTS='"${X11FONTDIR}"' \
+ -DFC_DEFAULT_FONTS='"<dir>${X11FONTDIR}</dir>"' \
-DFC_TEMPLATEDIR='"${X11FONTDIR}"' \
-DFC_CACHEDIR='"/var/cache/fontconfig"' \
+ -DCONFIGDIR='"${FONTCONFIG_PATH}/conf.d"' \
-DHAVE_FT_BITMAP_SIZE_Y_PPEM \
-DHAVE_FT_GET_BDF_PROPERTY \
-DHAVE_FT_GET_NEXT_CHAR \
@@ -277,7 +278,9 @@ CPPFLAGS+= -DFONTCONFIG_PATH='"${FONTCON
-DHAVE_FT_GET_X11_FONT_FORMAT \
-DHAVE_FT_HAS_PS_GLYPH_NAMES \
-DHAVE_EXPAT -DXFREE86_FT2 -DHAVE_INTTYPES_H \
- -DHAVE_STDINT_H -DHAVE_RANDOM
+ -DHAVE_STDINT_H -DHAVE_RANDOM \
+ -DHAVE_STRUCT_STAT_ST_MTIM \
+ -DHAVE_FT_DONE_MM_VAR
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
@@ -288,6 +291,9 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
-I. \
-I${X11SRCDIR.${LIB}}
+CPPFLAGS.fccache.c+= -Wno-error=discarded-qualifiers
+CPPFLAGS.fccfg.c+= -Wno-error=discarded-qualifiers
+
.include "Makefile.fcarch"
CLEANFILES+= fcarch.h
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.19 src/external/mit/xorg/tools/fc-cache/Makefile:1.20
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.19 Thu Feb 24 06:34:32 2022
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Jan 19 06:29:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/02/24 06:34:32 martin Exp $
+# $NetBSD: Makefile,v 1.20 2023/01/19 06:29:10 mrg Exp $
.include <bsd.hostinit.mk>
@@ -94,6 +94,7 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
-DFC_TEMPLATEDIR='"${DESTDIR}${X11FONTDIR}"' \
-DFC_CACHEDIR='"${DESTDIR}/var/cache/fontconfig"' \
+ -DCONFIGDIR='"${DESTDIR}/etc/fonts/conf.d"' \
-DFC_GPERF_SIZE_T=unsigned \
-DFC_NO_MT=1 \
-DALIGNOF_VOID_P=8 \
@@ -110,7 +111,8 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \
-DHAVE_MKSTEMP \
-DHAVE_SCANDIR \
- -DFLEXIBLE_ARRAY_MEMBER="/**/"
+ -DFLEXIBLE_ARRAY_MEMBER="/**/" \
+ -DHAVE_DIRENT_H -DHAVE_UNISTD_H
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
-I${FREETYPE}/include -I${FREETYPE}/include/freetype \
