21281597 Update fontconfig to the latest version available
22113343 update xterm to 320
--- a/open-src/app/xterm/Makefile Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/app/xterm/Makefile Mon Dec 07 09:50:45 2015 -0800
@@ -2,7 +2,7 @@
#
# xterm - terminal emulator for X
#
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -40,20 +40,24 @@
MODULE_PKGCLASS=Applications/System Utilities
MODULE_PKGCLASS_SET=yes
+# ARC cases that covered this module
+# PSARC/2015/308 xterm 318
+MODULE_ARC_CASES += PSARC/2015/308
+
# Package metadata
UPSTREAM = Thomas Dickey
UPSTREAM_URL = http://invisible-island.net/xterm/
UPSTREAM_SET = yes
MODULE_DESC = the xterm terminal emulator application
-ORACLE_TPNO = 15694
+ORACLE_TPNO = 23284
# Version number (used in path names)
-MODULE_VERSION=297
+MODULE_VERSION=320
# Checksums for upstream tarball
-TARBALL_MD5 = 45610ae6fe90cf086fcd75b9cb97bbaf
-TARBALL_SHA1 = 64b1531ee31f0a5880cc5e44c245887264b6f587
-TARBALL_SHA256= a2dc32a9a8401a2d3d2ae99844ba9cd9f81f0bc930870ebef783a9bcf165d179
+TARBALL_MD5 = 0d7f0e6390d132ae59876b3870e5783d
+TARBALL_SHA1 = b1d2a1698430eb96530aa7c7bb7a6c562dcecf72
+TARBALL_SHA256= a60dbb574334c081425fa30f011cd9f571e3be7a91e2a84e252461798bce24a7
# Source tarball
SOURCE_URL=ftp://invisible-island.net/xterm/$(SOURCE_TARBALL_NAME:.tar.gz=.tgz)
--- a/open-src/lib/fontconfig/6447517.patch Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/6447517.patch Mon Dec 07 09:50:45 2015 -0800
@@ -9,19 +9,19 @@
diff -urp -x '*~' -x '*.orig' src/fcxml.c src/fcxml.c
---- src/fcxml.c 2009-11-16 14:46:18.000000000 -0800
-+++ src/fcxml.c 2010-05-10 15:00:04.697920803 -0700
-@@ -2456,6 +2456,9 @@ FcConfigParseAndLoad (FcConfig *conf
+--- a/src/fcxml.c Thu Jun 18 09:18:07 2015
++++ b/src/fcxml.c Thu Jun 18 09:19:31 2015
+@@ -3226,6 +3226,9 @@
void *buf;
#endif
-
-+ char *cur_locale = setlocale (LC_NUMERIC, NULL);
+
++ char *cur_locale = setlocale (LC_NUMERIC, NULL);
+ setlocale (LC_NUMERIC, "C");
+
- filename = FcConfigFilename (name);
- if (!filename)
- goto bail0;
-@@ -2555,6 +2558,7 @@ bail1:
+ #ifdef _WIN32
+ if (!pGetSystemWindowsDirectory)
+ {
+@@ -3346,6 +3349,7 @@
close (fd);
fd = -1;
bail0:
--- a/open-src/lib/fontconfig/7026635.patch Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/7026635.patch Mon Dec 07 09:50:45 2015 -0800
@@ -1,26 +1,31 @@
diff -urp -x '*~' -x '*.orig' conf.d.org/40-nonlatin.conf conf.d/40-nonlatin.conf
---- conf.d.org/40-nonlatin.conf 2011-03-25 13:12:24.744168764 +0900
-+++ conf.d/40-nonlatin.conf 2011-03-25 13:19:51.327797456 +0900
-@@ -20,6 +20,7 @@
- <family>Jadid</family>
- <family>HG-PMinchoL-Sun</family>
- <family>HG-MinchoL-Sun</family>
+--- a/conf.d/40-nonlatin.conf Wed Jun 17 14:47:39 2015
++++ b/conf.d/40-nonlatin.conf Thu Jun 18 09:25:51 2015
+@@ -46,6 +46,10 @@
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+ <family>Sun-Michou</family>
- <family>IPAPMincho</family>
- <family>IPAMincho</family>
- <family>Sazanami Mincho</family>
-@@ -56,6 +57,7 @@
- <family>Terafik</family>
- <family>HG-PGothicB-Sun</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>HG-MinchoL-Sun</family>
+ <default><family>serif</family></default>
+ </alias>
+@@ -180,6 +184,10 @@
<family>HG-GothicB-Sun</family>
+ <default><family>sans-serif</family></default>
+ </alias>
++ <alias>
+ <family>Sun-Gothic</family>
++ <default><family>sans-serif</family></default>
++ </alias>
+ <alias>
<family>IPAPGothic</family>
- <family>IPAGothic</family>
- <family>Sazanami Gothic</family>
-diff -urp -x '*~' -x '*.orig' conf.d.org/65-nonlatin.conf conf.d/65-nonlatin.conf
---- conf.d.org/65-nonlatin.conf 2011-03-25 13:12:24.814795645 +0900
-+++ conf.d/65-nonlatin.conf 2011-03-25 13:19:51.348025208 +0900
-@@ -33,6 +33,7 @@
+ <default><family>sans-serif</family></default>
+--- a/conf.d/65-nonlatin.conf Thu Jun 18 09:30:39 2015
++++ b/conf.d/65-nonlatin.conf Thu Jun 18 09:32:31 2015
+@@ -32,6 +32,7 @@
<family>MgOpen Canonica</family>
<family>HG-PMinchoL-Sun</family>
<family>HG-MinchoL-Sun</family>
@@ -28,7 +33,7 @@
<family>IPAMonaMincho</family>
<family>IPAPMincho</family>
<family>IPAMincho</family>
-@@ -112,6 +113,7 @@
+@@ -113,6 +114,7 @@
<family>VL Gothic</family>
<family>HG-PGothicB-Sun</family>
<family>HG-GothicB-Sun</family>
@@ -36,7 +41,7 @@
<family>IPAMonaGothic</family>
<family>IPAPGothic</family>
<family>IPAGothic</family>
-@@ -162,6 +164,7 @@
+@@ -165,6 +167,7 @@
<family>VL Gothic</family>
<family>HG-GothicB-Sun</family>
<family>HG-MinchoL-Sun</family>
--- a/open-src/lib/fontconfig/90-sun-prefer-bitmap.conf Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/90-sun-prefer-bitmap.conf Mon Dec 07 09:50:45 2015 -0800
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
-Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -51,6 +51,8 @@
</test>
<test name="family">
<string>FZSongTi</string>
+ </test>
+ <test name="family">
<string>FZMingTi</string>
</test>
<test name="pixelsize" compare="more_eq">
@@ -69,6 +71,8 @@
</test>
<test name="family">
<string>SunDotum</string>
+ </test>
+ <test name="family">
<string>SunDotumChe</string>
</test>
<test name="pixelsize" compare="more_eq">
@@ -88,8 +92,14 @@
</test>
<test name="family">
<string>HG-GothicB-Sun</string>
+ </test>
+ <test name="family">
<string>HG-PGothicB-Sun</string>
+ </test>
+ <test name="family">
<string>HG-MinchoL-Sun</string>
+ </test>
+ <test name="family">
<string>HG-PMinchoL-Sun</string>
</test>
<test name="pixelsize" compare="more_eq">
@@ -109,9 +119,17 @@
</test>
<test name="family">
<string>MS Gothic</string>
+ </test>
+ <test name="family">
<string>MS PGothic</string>
+ </test>
+ <test name="family">
<string>MS UI Gothic</string>
+ </test>
+ <test name="family">
<string>MS Mincho</string>
+ </test>
+ <test name="family">
<string>MS PMincho</string>
</test>
<test name="pixelsize" compare="more_eq">
@@ -128,9 +146,17 @@
<match target="font">
<test name="family">
<string>IPAGothic</string>
+ </test>
+ <test name="family">
<string>IPAPGothic</string>
+ </test>
+ <test name="family">
<string>IPAUIGothic</string>
+ </test>
+ <test name="family">
<string>IPAMincho</string>
+ </test>
+ <test name="family">
<string>IPAPMincho</string>
</test>
<edit name="globaladvance" mode="assign">
@@ -147,9 +173,17 @@
</test>
<test name="family">
<string>IPAGothic</string>
+ </test>
+ <test name="family">
<string>IPAPGothic</string>
+ </test>
+ <test name="family">
<string>IPAUIGothic</string>
+ </test>
+ <test name="family">
<string>IPAMincho</string>
+ </test>
+ <test name="family">
<string>IPAPMincho</string>
</test>
<test name="pixelsize" compare="more_eq">
@@ -172,9 +206,17 @@
</test>
<test name="family">
<string>IPAGothic</string>
+ </test>
+ <test name="family">
<string>IPAPGothic</string>
+ </test>
+ <test name="family">
<string>IPAUIGothic</string>
+ </test>
+ <test name="family">
<string>IPAMincho</string>
+ </test>
+ <test name="family">
<string>IPAPMincho</string>
</test>
<test name="pixelsize" compare="more_eq">
@@ -197,9 +239,17 @@
</test>
<test name="family">
<string>IPAGothic</string>
+ </test>
+ <test name="family">
<string>IPAPGothic</string>
+ </test>
+ <test name="family">
<string>IPAUIGothic</string>
+ </test>
+ <test name="family">
<string>IPAMincho</string>
+ </test>
+ <test name="family">
<string>IPAPMincho</string>
</test>
<test name="pixelsize" compare="more_eq">
@@ -226,6 +276,8 @@
</test>
<test name="family">
<string>Sazanami Gothic</string>
+ </test>
+ <test name="family">
<string>Sazanami Mincho</string>
</test>
<test name="pixelsize" compare="more_eq">
--- a/open-src/lib/fontconfig/Makefile Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/Makefile Mon Dec 07 09:50:45 2015 -0800
@@ -54,6 +54,8 @@
MODULE_ARC_CASES += PSARC/2010/162
# PSARC/2015/035 Moving fontconfig utilities to LP64 by default
MODULE_ARC_CASES += PSARC/2015/035
+# PSARC/2015/527 Fontconfig 2.11.94
+MODULE_ARC_CASES += PSARC/2015/527
# Package metadata
UPSTREAM = fontconfig
@@ -61,14 +63,15 @@
UPSTREAM_SET = yes
GIT_URL = $(FDO_GIT_URL)/fontconfig
GIT_URL_SET = yes
-ORACLE_TPNO = 12113
+ORACLE_TPNO = 23955
# Version number (used in path names)
-MODULE_VERSION=2.8.0
+MODULE_VERSION=2.11.94
# Checksums for upstream tarball
-TARBALL_MD5 = 77e15a92006ddc2adbb06f840d591c0e
-TARBALL_SHA1 = 570fb55eb14f2c92a7b470b941e9d35dbfafa716
+TARBALL_MD5 = 479be870c7f83f15f87bac085b61d641
+TARBALL_SHA1 = 3748d8a2b9cf8052dbd003f524d829157f1ead83
+TARBALL_SHA256 = 73f6d323c7bcfbde25d78397675191d55b8f4139132c6a9444410f3a2d8a9a95
# Source tarball
SOURCE_TARBALL_NAME=fontconfig-$(MODULE_VERSION).tar.gz
@@ -83,17 +86,18 @@
arial-narrow.conf.patch \
cjk-fonts.conf.patch,-p1 \
Makefile.am.0.patch \
- bitmap-hacks.patch \
- 6447517.patch \
+ bitmap-hacks.patch,-p1 \
+ 6447517.patch,-p1 \
6770058.patch \
- 7026635.patch \
- 7058808.patch
+ 7026635.patch,-p1 \
+ 7058808.patch \
+ font-links.patch
# Library name (used for specfiles/mapfiles)
LIBNAME=fontconfig
# Man pages to apply Sun footer to & attributes to list
-FONTCONFIG_CMDS = fc-cache fc-list fc-query fc-cat fc-match fc-scan
+FONTCONFIG_CMDS = fc-cache fc-list fc-query fc-cat fc-match fc-scan fc-pattern fc-validate
SUNTOUCHED_MANPAGES = $(FONTCONFIG_CMDS:%=%/%.1) doc/*.3 doc/*.5
MODULE_STABILITY=Volatile
LIB_MAN_SUFFIX=3fontconfig
@@ -114,6 +118,8 @@
SUNTOUCH_MAN_FLAGS_fc-cat.1 = $(SUNTOUCH_MAN_FLAGS_CMDS)
SUNTOUCH_MAN_FLAGS_fc-match.1 = $(SUNTOUCH_MAN_FLAGS_CMDS)
SUNTOUCH_MAN_FLAGS_fc-scan.1 = $(SUNTOUCH_MAN_FLAGS_CMDS)
+SUNTOUCH_MAN_FLAGS_fc-pattern.1 = $(SUNTOUCH_MAN_FLAGS_CMDS)
+SUNTOUCH_MAN_FLAGS_fc-validate.1= $(SUNTOUCH_MAN_FLAGS_CMDS)
# pkg-config files to update
FIX_PC_FILES=fontconfig.pc.in
@@ -125,7 +131,9 @@
# Additional command line options to GNU autoconf configure script
MODULE_CONFIG_OPTS = \
--bindir='$${exec_prefix}/bin/$(BINSUBDIR)' \
- --with-confdir=/etc/fonts \
+ --with-baseconfigdir='/etc/fonts' \
+ --with-templatedir='/etc/fonts/conf.avail' \
+ --with-xmldir='/etc/fonts' \
--with-default-fonts='/usr/share/fonts' \
--with-add-fonts='/etc/X11/fontpath.d,/usr/share/ghostscript/fonts,/usr/X11/lib/X11/fonts' \
--with-cache-dir=/var/cache/fontconfig
--- a/open-src/lib/fontconfig/Makefile.am.0.patch Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/Makefile.am.0.patch Mon Dec 07 09:50:45 2015 -0800
@@ -1,13 +1,12 @@
-diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2009-11-16 09:24:52.000000000 -0800
-+++ Makefile.am 2010-05-10 15:15:11.378520724 -0700
-@@ -104,16 +104,6 @@ install-data-local: fonts.conf
- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+--- Makefile.am Thu Jun 18 09:00:13 2015
++++ Makefile.am Thu Jun 18 09:00:43 2015
+@@ -116,16 +116,6 @@
+ echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+ $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
fi; fi
- @(if $(RUN_FC_CACHE_TEST); then \
-- echo " $(bindir)/fc-cache -s -f -v"; \
-- $(bindir)/fc-cache -s -f -v; \
+- echo "fc-cache$(EXEEXT) -s -f -v"; \
+- fc-cache/fc-cache$(EXEEXT) -s -f -v; \
- else \
- echo "***"; \
- echo "*** Warning: fonts.cache not built"; \
--- a/open-src/lib/fontconfig/arial-narrow.conf.patch Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/arial-narrow.conf.patch Mon Dec 07 09:50:45 2015 -0800
@@ -1,17 +1,28 @@
-diff -urp -x '*~' -x '*.orig' conf.d/30-metric-aliases.conf conf.d/30-metric-aliases.conf
---- conf.d/30-metric-aliases.conf 2009-11-16 09:24:52.000000000 -0800
-+++ conf.d/30-metric-aliases.conf 2010-05-10 15:09:19.723404099 -0700
-@@ -207,5 +207,13 @@
+--- conf.d/30-metric-aliases.conf Wed Nov 5 20:13:44 2014
++++ conf.d/30-metric-aliases.conf Fri Jul 31 11:22:23 2015
+@@ -600,7 +600,7 @@
+ <accept>
+ <family>Carlito</family>
</accept>
- </alias>
+- </alias>
++ </alias>
-+ <!-- StarOffice formerly included Arial Narrow - Solaris includes Arial Narrow MT instead. -->
-+ <alias>
-+ <family>Arial Narrow</family>
-+ <accept>
-+ <family>Arial Narrow MT</family>
-+ <family>Nimbus Sans L Condensed</family>
-+ </accept>
-+ </alias>
+ <alias binding="same">
+ <family>Symbol</family>
+@@ -607,6 +607,15 @@
+ <accept>
+ <family>SymbolNeu</family>
+ </accept>
+- </alias>
++ </alias>
++ <!-- StarOffice formerly included Arial Narrow - Solaris includes Arial Narrow MT instead. -->
++ <alias>
++ <family>Arial Narrow</family>
++ <accept>
++ <family>Arial Narrow MT</family>
++ <family>Nimbus Sans L Condensed</family>
++ </accept>
++ </alias>
++
</fontconfig>
--- a/open-src/lib/fontconfig/bitmap-hacks.patch Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/bitmap-hacks.patch Mon Dec 07 09:50:45 2015 -0800
@@ -5,10 +5,9 @@
specific size) instead of scalable fonts when a close match is found and
anti-aliasing is not requested.
-diff -urp -x '*~' -x '*.orig' src/fcmatch.c src/fcmatch.c
---- src/fcmatch.c 2010-05-10 15:00:04.208294425 -0700
-+++ src/fcmatch.c 2010-05-10 15:00:04.449154429 -0700
-@@ -168,6 +168,15 @@ FcCompareSize (FcValue *value1, FcValue
+--- a/src/fcmatch.c Thu Jun 18 09:03:11 2015
++++ b/src/fcmatch.c Thu Jun 18 09:15:24 2015
+@@ -183,6 +183,15 @@
if (v2 == 0)
return 0;
v = v2 - v1;
@@ -24,7 +23,7 @@
if (v < 0)
v = -v;
return v;
-@@ -430,6 +439,47 @@ FcFontRenderPrepare (FcConfig *confi
+@@ -623,6 +632,46 @@
return new;
}
@@ -68,25 +67,24 @@
+ }
+}
+
-+
static FcPattern *
- FcFontSetMatchInternal (FcConfig *config,
- FcFontSet **sets,
-@@ -444,6 +494,8 @@ FcFontSetMatchInternal (FcConfig *con
+ FcFontSetMatchInternal (FcFontSet **sets,
+ int nsets,
+@@ -636,6 +685,8 @@
int i;
int set;
+ FcChangeFormat ( p );
+
- for (i = 0; i < NUM_MATCH_VALUES; i++)
+ for (i = 0; i < PRI_END; i++)
bestscore[i] = 0;
best = 0;
-@@ -672,6 +724,8 @@ FcFontSetSort (FcConfig *config,
+@@ -876,6 +927,8 @@
FcBool *patternLangSat;
FcValue patternLang;
+ FcChangeFormat ( p );
+
- if (FcDebug () & FC_DBG_MATCH)
- {
- printf ("Sort ");
+ assert (sets != NULL);
+ assert (p != NULL);
+ assert (result != NULL);
--- a/open-src/lib/fontconfig/cjk-fonts.conf.patch Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/cjk-fonts.conf.patch Mon Dec 07 09:50:45 2015 -0800
@@ -1,81 +1,147 @@
-diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
-index a875db0..b8efa09 100644
---- a/conf.d/40-nonlatin.conf
-+++ b/conf.d/40-nonlatin.conf
-@@ -18,6 +18,17 @@
- <family>Zar</family>
- <family>Titr</family>
- <family>Jadid</family>
+--- a/conf.d/40-nonlatin.conf Mon Jan 20 00:14:19 2014
++++ b/conf.d/40-nonlatin.conf Wed Jun 17 14:47:39 2015
+@@ -42,6 +42,50 @@
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+ <family>HG-PMinchoL-Sun</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>HG-MinchoL-Sun</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>IPAPMincho</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>IPAMincho</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>Sazanami Mincho</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>Sazanami Gothic</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>FZSongTi</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>FZMingTi</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>KacstQurn</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>SunDotum</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
+ <family>AR PL ShanHeiSun Uni</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
<family>Kochi Mincho</family>
- <family>AR PL SungtiL GB</family>
- <family>AR PL Mingti2L Big5</family>
-@@ -43,6 +54,15 @@
- <family>Roya</family>
- <family>Koodak</family>
- <family>Terafik</family>
+ <default><family>serif</family></default>
+ </alias>
+@@ -129,6 +173,42 @@
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+ <family>HG-PGothicB-Sun</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>HG-GothicB-Sun</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>IPAPGothic</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>IPAGothic</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>Sazanami Gothic</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>FZSongTi</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>FZMingTi</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>KacstQurn</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
+ <family>SunDotum</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
<family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>AR PL KaitiM Big5</family>
-@@ -61,6 +81,7 @@
+ <default><family>sans-serif</family></default>
+ </alias>
+@@ -180,6 +260,10 @@
Monospace faces
-->
- <alias>
+ <alias>
+ <family>SunDotumChe</family>
++ <default><family>monospace</family></default>
++ </alias>
++ <alias>
<family>NSimSun</family>
- <family>ZYSong18030</family>
- <family>FreeMono</family>
-diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
-index 7e41264..85cb11e 100644
---- a/conf.d/45-latin.conf
-+++ b/conf.d/45-latin.conf
-@@ -10,6 +10,7 @@
+ <default><family>monospace</family></default>
+ </alias>
+--- a/conf.d/45-latin.conf Wed Jun 17 14:57:49 2015
++++ b/conf.g/45-latin.conf Wed Jun 17 14:58:57 2015
+@@ -10,6 +10,10 @@
Serif faces
-->
<alias>
+ <family>Lucida Bright</family>
++ <default><family>serif</family></default>
++ </alias>
++ <alias>
<family>Bitstream Vera Serif</family>
- <family>DejaVu Serif</family>
- <family>Liberation Serif</family>
-@@ -25,6 +26,7 @@
+ <default><family>serif</family></default>
+ </alias>
+@@ -65,6 +69,10 @@
Sans-serif faces
-->
<alias>
+ <family>Lucida Sans Typewriter</family>
++ <default><family>sans-serif</family></default>
++ </alias>
++ <alias>
<family>Bitstream Vera Sans</family>
- <family>DejaVu Sans</family>
- <family>Liberation Sans</family>
-@@ -41,6 +43,7 @@
+ <default><family>sans-serif</family></default>
+ </alias>
+@@ -116,6 +124,10 @@
Monospace faces
-->
<alias>
+ <family>Lucida Sans Typewriter</family>
++ <default><family>monospace</family></default>
++ </alias>
++ <alias>
<family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- <family>Liberation Mono</family>
-diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf
-index 53ac064..3816f9b 100644
---- a/conf.d/65-nonlatin.conf
-+++ b/conf.d/65-nonlatin.conf
+ <default><family>monospace</family></default>
+ </alias>
+--- a/conf.d/65-nonlatin.conf Wed Jun 17 14:59:41 2015
++++ b/conf.d/65-nonlatin.conf Thu Jun 18 08:54:54 2015
@@ -4,6 +4,7 @@
<alias>
<family>serif</family>
@@ -84,8 +150,8 @@
<family>Artsounk</family> <!-- armenian -->
<family>BPG UTF8 M</family> <!-- georgian -->
<family>Kinnari</family> <!-- thai -->
-@@ -27,17 +28,23 @@
- <family>UmePlus P Gothic</family> <!-- han (ja) -->
+@@ -26,17 +27,23 @@
+ <family>MS Mincho</family> <!-- han (ja) -->
<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
<family>PMingLiu</family> <!-- han (zh-tw) -->
- <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
@@ -146,20 +212,20 @@
<family>IPAGothic</family>
<family>Sazanami Gothic</family>
- <family>Kochi Gothic</family>
-+ <family>FZSongTi</family>
-+ <family>FZMingTi</family>
-+ <family>KacstQurn</family>
++ <family>FZSongTi</family>
++ <family>FZMingTi</family>
++ <family>KacstQurn</family>
<family>AR PL KaitiM GB</family>
<family>AR PL KaitiM Big5</family>
- <family>AR PL ShanHeiSun Uni</family>
+ <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
-+ <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
-+ <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
-+ <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
++ <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
++ <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
++ <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ＭＳ ゴシック</family>
-@@ -138,17 +152,24 @@
+@@ -139,17 +153,24 @@
<family>Lohit Telugu</family>
<family>Lohit Oriya</family>
<family>LKLUG</family>
@@ -180,28 +246,27 @@
<family>Sazanami Gothic</family>
- <family>Kochi Gothic</family>
+ <family>FZSongTi</family>
-+ <family>FZMingTi</family>
-+ <family>KacstQurn</family>
++ <family>FZMingTi</family>
++ <family>KacstQurn</family>
<family>AR PL KaitiM GB</family>
<family>MS Gothic</family> <!-- han (ja) -->
<family>UmePlus Gothic</family> <!-- han (ja) -->
-@@ -160,8 +181,6 @@
- <family>AR PL SungtiL GB</family>
- <family>AR PL Mingti2L Big5</family>
+@@ -163,7 +184,6 @@
<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
-- <family>UnBatang</family>
-- <family>UnDotum</family>
- <family>Baekmuk Batang</family> <!-- hangul -->
- <family>Baekmuk Dotum</family>
- <family>Baekmuk Gulim</family>
-@@ -190,6 +209,10 @@
+ <family>NanumGothicCoding</family> <!-- hangul (ko) -->
+ <family>NanumGothic</family> <!-- hangul (ko) -->
+- <family>UnDotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+ <family>TlwgTypo</family> <!-- thai -->
+@@ -191,6 +211,10 @@
<family>Lohit Telugu</family>
<family>Lohit Oriya</family>
<family>LKLUG</family>
+ <family>SunDotumChe</family>
-+ <family>UnBatang</family>
-+ <family>UnDotum</family>
-+ <family>Gothic</family>
++ <family>UnBatang</family>
++ <family>UnDotum</family>
++ <family>Gothic</family>
</prefer>
</alias>
</fontconfig>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/fontconfig/font-links.patch Mon Dec 07 09:50:45 2015 -0800
@@ -0,0 +1,14 @@
+--- conf.d/Makefile.am Wed Oct 28 08:06:32 2015
++++ conf.d/Makefile.am Wed Oct 28 08:07:46 2015
+@@ -88,9 +88,9 @@
+ @(echo cd $(DESTDIR)$(configdir); \
+ cd $(DESTDIR)$(configdir); \
+ for i in $(CONF_LINKS); do \
+- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
++ echo $(RM) $$i";" ln -s ../conf.avail/$$i .; \
+ $(RM) $$i; \
+- ln -s $(templatedir)/$$i .; \
++ ln -s ../conf.avail/$$i .; \
+ done)
+ uninstall-local:
+ @(echo cd $(DESTDIR)$(configdir); \
--- a/open-src/lib/fontconfig/libfontconfig.3lib Wed Dec 02 11:37:07 2015 -0800
+++ b/open-src/lib/fontconfig/libfontconfig.3lib Mon Dec 07 09:50:45 2015 -0800
@@ -1,5 +1,5 @@
'\" t
-.\" Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
.\" copy of this software and associated documentation files (the "Software"),
@@ -41,95 +41,105 @@
.TS
lw(2.750000i) lw(2.750000i).
-FcAtomicCreate FcGetLangs
-FcAtomicDeleteNew FcGetVersion
-FcAtomicDestroy FcInit
-FcAtomicLock FcInitBringUptoDate
-FcAtomicNewFile FcInitLoadConfig
-FcAtomicOrigFile FcInitLoadConfigAndFonts
-FcAtomicReplaceOrig FcInitReinitialize
-FcAtomicUnlock FcIsLower
-FcBlanksAdd FcIsUpper
-FcBlanksCreate FcLangGetCharSet
-FcBlanksDestroy FcLangSetAdd
-FcBlanksIsMember FcLangSetCompare
-FcCacheCopySet FcLangSetContains
-FcCacheDir FcLangSetCopy
-FcCacheNumFont FcLangSetCreate
-FcCacheNumSubdir FcLangSetDestroy
-FcCacheSubdir FcLangSetEqual
-FcCharSetAddChar FcLangSetGetLangs
-FcCharSetCopy FcLangSetHash
-FcCharSetCount FcLangSetHasLang
-FcCharSetCoverage FcMatrixCopy
-FcCharSetCreate FcMatrixEqual
-FcCharSetDestroy FcMatrixInit
-FcCharSetEqual FcMatrixMultiply
-FcCharSetFirstPage FcMatrixRotate
-FcCharSetHasChar FcMatrixScale
-FcCharSetIntersect FcMatrixShear
-FcCharSetIntersectCount FcNameConstant
-FcCharSetIsSubset FcNameGetConstant
-FcCharSetMerge FcNameGetObjectType
-FcCharSetNew FcNameParse
-FcCharSetNextPage FcNameRegisterConstants
-FcCharSetSubtract FcNameRegisterObjectTypes
-FcCharSetSubtractCount FcNameUnparse
-FcCharSetUnion FcNameUnregisterConstants
-FcConfigAppFontAddDir FcNameUnregisterObjectTypes
-FcConfigAppFontAddFile FcObjectSetAdd
-FcConfigAppFontClear FcObjectSetBuild
-FcConfigBuildFonts FcObjectSetCreate
-FcConfigCreate FcObjectSetDestroy
-FcConfigDestroy FcPatternAdd-Type
-FcConfigEnableHome FcPatternAdd
-FcConfigFilename FcPatternAddWeak
-FcConfigGetBlanks FcPatternBuild
-FcConfigGetCache FcPatternCreate
-FcConfigGetCacheDirs FcPatternDel
-FcConfigGetConfigDirs FcPatternDestroy
-FcConfigGetConfigFiles FcPatternDuplicate
-FcConfigGetCurrent FcPatternEqual
-FcConfigGetFontDirs FcPatternEqualSubset
-FcConfigGetFonts FcPatternFilter
-FcConfigGetRescanInterval FcPatternFormat
-FcConfigHome FcPatternGet-Type
-FcConfigParseAndLoad FcPatternGet
-FcConfigReference FcPatternHash
-FcConfigSetCurrent FcPatternPrint
-FcConfigSetRescanInterval FcPatternReference
-FcConfigSubstitute FcPatternRemove
-FcConfigSubstituteWithPat FcStrBasename
-FcConfigUptoDate FcStrCmp
-FcDefaultSubstitute FcStrCmpIgnoreCase
-FcDirCacheLoad FcStrCopy
-FcDirCacheLoadFile FcStrCopyFilename
-FcDirCacheRead FcStrDirname
-FcDirCacheUnlink FcStrDowncase
-FcDirCacheUnload FcStrFree
-FcDirCacheValid FcStrListCreate
-FcDirSave FcStrListDone
-FcDirScan FcStrListNext
-FcFileIsDir FcStrPlus
-FcFileScan FcStrSetAdd
-FcFini FcStrSetAddFilename
-FcFontList FcStrSetCreate
-FcFontMatch FcStrSetDel
-FcFontRenderPrepare FcStrSetDestroy
-FcFontSetAdd FcStrSetEqual
-FcFontSetCreate FcStrSetMember
-FcFontSetDestroy FcStrStr
-FcFontSetList FcStrStrIgnoreCase
-FcFontSetMatch FcToLower
-FcFontSetPrint FcUcs4ToUtf8
-FcFontSetSort FcUtf16Len
-FcFontSetSortDestroy FcUtf16ToUcs4
-FcFontSort FcUtf8Len
-FcFreeTypeCharIndex FcUtf8ToUcs4
-FcFreeTypeCharSet FcValueDestroy
-FcFreeTypeCharSetAndSpacing FcValueEqual
-FcFreeTypeQuery FcValuePrint
-FcFreeTypeQueryFace FcValueSave
+FcAtomicCreate FcInitBringUptoDate
+FcAtomicDeleteNew FcInitLoadConfig
+FcAtomicDestroy FcInitLoadConfigAndFonts
+FcAtomicLock FcInitReinitialize
+FcAtomicNewFile FcIsLower
+FcAtomicOrigFile FcIsUpper
+FcAtomicReplaceOrig FcLangGetCharSet
+FcAtomicUnlock FcLangNormalize
+FcBlanksAdd FcLangSetAdd
+FcBlanksCreate FcLangSetCompare
+FcBlanksDestroy FcLangSetContains
+FcBlanksIsMember FcLangSetCopy
+FcCacheCopySet FcLangSetCreate
+FcCacheCreateTagFile FcLangSetDel
+FcCacheDir FcLangSetDestroy
+FcCacheNumFont FcLangSetEqual
+FcCacheNumSubdir FcLangSetGetLangs
+FcCacheSubdir FcLangSetHasLang
+FcCharSetAddChar FcLangSetHash
+FcCharSetCopy FcLangSetSubtract
+FcCharSetCount FcLangSetUnion
+FcCharSetCoverage FcMatrixCopy
+FcCharSetCreate FcMatrixEqual
+FcCharSetDelChar FcMatrixInit
+FcCharSetDestroy FcMatrixMultiply
+FcCharSetEqual FcMatrixRotate
+FcCharSetFirstPage FcMatrixScale
+FcCharSetHasChar FcMatrixShear
+FcCharSetIntersect FcNameConstant
+FcCharSetIntersectCount FcNameGetConstant
+FcCharSetIsSubset FcNameGetObjectType
+FcCharSetMerge FcNameParse
+FcCharSetNew FcNameRegisterConstants
+FcCharSetNextPage FcNameRegisterObjectTypes
+FcCharSetSubtract FcNameUnparse
+FcCharSetSubtractCount FcNameUnregisterConstants
+FcCharSetUnion FcNameUnregisterObjectTypes
+FcConfigAppFontAddDir FcObjectSetAdd
+FcConfigAppFontAddFile FcObjectSetBuild
+FcConfigAppFontClear FcObjectSetCreate
+FcConfigBuildFonts FcObjectSetDestroy
+FcConfigCreate FcPatternAdd-Type
+FcConfigDestroy FcPatternAdd
+FcConfigEnableHome FcPatternAddWeak
+FcConfigFilename FcPatternBuild
+FcConfigGetBlanks FcPatternCreate
+FcConfigGetCache FcPatternDel
+FcConfigGetCacheDirs FcPatternDestroy
+FcConfigGetConfigDirs FcPatternDuplicate
+FcConfigGetConfigFiles FcPatternEqual
+FcConfigGetCurrent FcPatternEqualSubset
+FcConfigGetFontDirs FcPatternFilter
+FcConfigGetFonts FcPatternFormat
+FcConfigGetRescanInterval FcPatternGet-Type
+FcConfigGetSysRoot FcPatternGet
+FcConfigHome FcPatternHash
+FcConfigParseAndLoad FcPatternPrint
+FcConfigReference FcPatternReference
+FcConfigSetCurrent FcPatternRemove
+FcConfigSetRescanInterval FcRangeCopy
+FcConfigSetSysRoot FcRangeCreateDouble
+FcConfigSubstitute FcRangeCreateInteger
+FcConfigSubstituteWithPat FcRangeDestroy
+FcConfigUptoDate FcRangeGetDouble
+FcDefaultSubstitute FcStrBasename
+FcDirCacheClean FcStrCmp
+FcDirCacheLoad FcStrCmpIgnoreCase
+FcDirCacheLoadFile FcStrCopy
+FcDirCacheRead FcStrCopyFilename
+FcDirCacheRescan FcStrDirname
+FcDirCacheUnlink FcStrDowncase
+FcDirCacheUnload FcStrFree
+FcDirCacheValid FcStrListCreate
+FcDirSave FcStrListDone
+FcDirScan FcStrListFirst
+FcFileIsDir FcStrListNext
+FcFileScan FcStrPlus
+FcFini FcStrSetAdd
+FcFontList FcStrSetAddFilename
+FcFontMatch FcStrSetCreate
+FcFontRenderPrepare FcStrSetDel
+FcFontSetAdd FcStrSetDestroy
+FcFontSetCreate FcStrSetEqual
+FcFontSetDestroy FcStrSetMember
+FcFontSetList FcStrStr
+FcFontSetMatch FcStrStrIgnoreCase
+FcFontSetPrint FcToLower
+FcFontSetSort FcUcs4ToUtf8
+FcFontSetSortDestroy FcUtf16Len
+FcFontSort FcUtf16ToUcs4
+FcFreeTypeCharIndex FcUtf8Len
+FcFreeTypeCharSet FcUtf8ToUcs4
+FcFreeTypeCharSetAndSpacing FcValueDestroy
+FcFreeTypeQuery FcValueEqual
+FcFreeTypeQueryFace FcValuePrint
+FcGetDefaultLangs FcValueSave
+FcGetLangs FcWeightFromOpenType
+FcGetVersion FcWeightToOpenType
+FcInit
.TE
.SH FILES
.PD 0
@@ -164,8 +174,10 @@
.BR fc-cat (1),
.BR fc-list (1),
.BR fc-match (1),
+.BR fc-pattern (1),
.BR fc-query (1),
.BR fc-scan (1),
-.BR fonts.conf (4)
+.BR fc-validate (1),
+.BR fonts.conf (5)
.SH LICENSE
.\" Makefile will append license from COPYING file in fontconfig src here
--- a/pkg/manifests/system-library-fontconfig.p5m Wed Dec 02 11:37:07 2015 -0800
+++ b/pkg/manifests/system-library-fontconfig.p5m Mon Dec 07 09:50:45 2015 -0800
@@ -28,12 +28,15 @@
dir path=etc/fonts/conf.avail
file path=etc/fonts/conf.avail/10-autohint.conf
file path=etc/fonts/conf.avail/10-no-sub-pixel.conf
+file path=etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
file path=etc/fonts/conf.avail/10-sub-pixel-bgr.conf
file path=etc/fonts/conf.avail/10-sub-pixel-rgb.conf
file path=etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
file path=etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
file path=etc/fonts/conf.avail/10-unhinted.conf
-file path=etc/fonts/conf.avail/20-fix-globaladvance.conf
+file path=etc/fonts/conf.avail/11-lcdfilter-default.conf
+file path=etc/fonts/conf.avail/11-lcdfilter-legacy.conf
+file path=etc/fonts/conf.avail/11-lcdfilter-light.conf
file path=etc/fonts/conf.avail/20-indic.conf
file path=etc/fonts/conf.avail/20-unhint-small-vera.conf
file path=etc/fonts/conf.avail/25-unhint-nonlatin.conf
@@ -56,8 +59,8 @@
file path=etc/fonts/conf.avail/90-sun-prefer-bitmap.conf
file path=etc/fonts/conf.avail/90-synthetic.conf
dir path=etc/fonts/conf.d
-link path=etc/fonts/conf.d/20-fix-globaladvance.conf \
- target=../conf.avail/20-fix-globaladvance.conf
+link path=etc/fonts/conf.d/10-scale-bitmap-fonts.conf \
+ target=../conf.avail/10-scale-bitmap-fonts.conf
link path=etc/fonts/conf.d/20-indic.conf target=../conf.avail/20-indic.conf
link path=etc/fonts/conf.d/20-unhint-small-vera.conf \
target=../conf.avail/20-unhint-small-vera.conf
@@ -97,20 +100,26 @@
file path=usr/bin/$(ARCH32)/fc-cat
file path=usr/bin/$(ARCH32)/fc-list
file path=usr/bin/$(ARCH32)/fc-match
+file path=usr/bin/$(ARCH32)/fc-pattern
file path=usr/bin/$(ARCH32)/fc-query
file path=usr/bin/$(ARCH32)/fc-scan
+file path=usr/bin/$(ARCH32)/fc-validate
file path=usr/bin/$(ARCH64)/fc-cache
file path=usr/bin/$(ARCH64)/fc-cat
file path=usr/bin/$(ARCH64)/fc-list
file path=usr/bin/$(ARCH64)/fc-match
+file path=usr/bin/$(ARCH64)/fc-pattern
file path=usr/bin/$(ARCH64)/fc-query
file path=usr/bin/$(ARCH64)/fc-scan
+file path=usr/bin/$(ARCH64)/fc-validate
link path=usr/bin/fc-cache target=$(ARCH64)/fc-cache
link path=usr/bin/fc-cat target=$(ARCH64)/fc-cat
link path=usr/bin/fc-list target=$(ARCH64)/fc-list
link path=usr/bin/fc-match target=$(ARCH64)/fc-match
+link path=usr/bin/fc-pattern target=$(ARCH64)/fc-pattern
link path=usr/bin/fc-query target=$(ARCH64)/fc-query
link path=usr/bin/fc-scan target=$(ARCH64)/fc-scan
+link path=usr/bin/fc-validate target=$(ARCH64)/fc-validate
dir path=usr/include/fontconfig
file path=usr/include/fontconfig/fcfreetype.h
file path=usr/include/fontconfig/fcprivate.h
@@ -138,6 +147,7 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcblanksismember.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccachecopyset.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccachedir.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccachenumfont.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html
@@ -147,6 +157,7 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetcount.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetequal.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
@@ -177,18 +188,22 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetsysroot.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfighome.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigreference.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetsysroot.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacheread.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
@@ -214,6 +229,7 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcgetlangs.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcgetversion.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcinit.html
@@ -224,16 +240,20 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcislower.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcisupper.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fclangnormalize.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetadd.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetdel.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetequal.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsethash.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fclangsetunion.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html
@@ -272,6 +292,11 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcrangecopy.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcrangecreatedouble.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcrangecreateinteger.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcrangedestroy.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcrangegetdouble.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
@@ -282,6 +307,7 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrfree.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrlistfirst.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrplus.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html
@@ -303,6 +329,8 @@
file path=usr/share/doc/fontconfig/fontconfig-devel/fcvalueequal.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcvalueprint.html
file path=usr/share/doc/fontconfig/fontconfig-devel/fcvaluesave.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcweightfromopentype.html
+file path=usr/share/doc/fontconfig/fontconfig-devel/fcweighttoopentype.html
file path=usr/share/doc/fontconfig/fontconfig-devel/ln12.html
file path=usr/share/doc/fontconfig/fontconfig-devel/t1.html
file path=usr/share/doc/fontconfig/fontconfig-devel/x102.html
@@ -315,8 +343,10 @@
file path=usr/share/man/man1/fc-cat.1
file path=usr/share/man/man1/fc-list.1
file path=usr/share/man/man1/fc-match.1
+file path=usr/share/man/man1/fc-pattern.1
file path=usr/share/man/man1/fc-query.1
file path=usr/share/man/man1/fc-scan.1
+file path=usr/share/man/man1/fc-validate.1
file path=usr/share/man/man3/FcAtomicCreate.3
file path=usr/share/man/man3/FcAtomicDeleteNew.3
file path=usr/share/man/man3/FcAtomicDestroy.3
@@ -330,6 +360,7 @@
file path=usr/share/man/man3/FcBlanksDestroy.3
file path=usr/share/man/man3/FcBlanksIsMember.3
file path=usr/share/man/man3/FcCacheCopySet.3
+file path=usr/share/man/man3/FcCacheCreateTagFile.3
file path=usr/share/man/man3/FcCacheDir.3
file path=usr/share/man/man3/FcCacheNumFont.3
file path=usr/share/man/man3/FcCacheNumSubdir.3
@@ -339,6 +370,7 @@
file path=usr/share/man/man3/FcCharSetCount.3
file path=usr/share/man/man3/FcCharSetCoverage.3
file path=usr/share/man/man3/FcCharSetCreate.3
+file path=usr/share/man/man3/FcCharSetDelChar.3
file path=usr/share/man/man3/FcCharSetDestroy.3
file path=usr/share/man/man3/FcCharSetEqual.3
file path=usr/share/man/man3/FcCharSetFirstPage.3
@@ -369,18 +401,22 @@
file path=usr/share/man/man3/FcConfigGetFontDirs.3
file path=usr/share/man/man3/FcConfigGetFonts.3
file path=usr/share/man/man3/FcConfigGetRescanInterval.3
+file path=usr/share/man/man3/FcConfigGetSysRoot.3
file path=usr/share/man/man3/FcConfigHome.3
file path=usr/share/man/man3/FcConfigParseAndLoad.3
file path=usr/share/man/man3/FcConfigReference.3
file path=usr/share/man/man3/FcConfigSetCurrent.3
file path=usr/share/man/man3/FcConfigSetRescanInterval.3
+file path=usr/share/man/man3/FcConfigSetSysRoot.3
file path=usr/share/man/man3/FcConfigSubstitute.3
file path=usr/share/man/man3/FcConfigSubstituteWithPat.3
file path=usr/share/man/man3/FcConfigUptoDate.3
file path=usr/share/man/man3/FcDefaultSubstitute.3
+file path=usr/share/man/man3/FcDirCacheClean.3
file path=usr/share/man/man3/FcDirCacheLoad.3
file path=usr/share/man/man3/FcDirCacheLoadFile.3
file path=usr/share/man/man3/FcDirCacheRead.3
+file path=usr/share/man/man3/FcDirCacheRescan.3
file path=usr/share/man/man3/FcDirCacheUnlink.3
file path=usr/share/man/man3/FcDirCacheUnload.3
file path=usr/share/man/man3/FcDirCacheValid.3
@@ -406,6 +442,7 @@
file path=usr/share/man/man3/FcFreeTypeCharSetAndSpacing.3
file path=usr/share/man/man3/FcFreeTypeQuery.3
file path=usr/share/man/man3/FcFreeTypeQueryFace.3
+file path=usr/share/man/man3/FcGetDefaultLangs.3
file path=usr/share/man/man3/FcGetLangs.3
file path=usr/share/man/man3/FcGetVersion.3
file path=usr/share/man/man3/FcInit.3
@@ -416,16 +453,20 @@
file path=usr/share/man/man3/FcIsLower.3
file path=usr/share/man/man3/FcIsUpper.3
file path=usr/share/man/man3/FcLangGetCharSet.3
+file path=usr/share/man/man3/FcLangNormalize.3
file path=usr/share/man/man3/FcLangSetAdd.3
file path=usr/share/man/man3/FcLangSetCompare.3
file path=usr/share/man/man3/FcLangSetContains.3
file path=usr/share/man/man3/FcLangSetCopy.3
file path=usr/share/man/man3/FcLangSetCreate.3
+file path=usr/share/man/man3/FcLangSetDel.3
file path=usr/share/man/man3/FcLangSetDestroy.3
file path=usr/share/man/man3/FcLangSetEqual.3
file path=usr/share/man/man3/FcLangSetGetLangs.3
file path=usr/share/man/man3/FcLangSetHasLang.3
file path=usr/share/man/man3/FcLangSetHash.3
+file path=usr/share/man/man3/FcLangSetSubtract.3
+file path=usr/share/man/man3/FcLangSetUnion.3
file path=usr/share/man/man3/FcMatrixCopy.3
file path=usr/share/man/man3/FcMatrixEqual.3
file path=usr/share/man/man3/FcMatrixInit.3
@@ -464,6 +505,11 @@
file path=usr/share/man/man3/FcPatternPrint.3
file path=usr/share/man/man3/FcPatternReference.3
file path=usr/share/man/man3/FcPatternRemove.3
+file path=usr/share/man/man3/FcRangeCopy.3
+file path=usr/share/man/man3/FcRangeCreateDouble.3
+file path=usr/share/man/man3/FcRangeCreateInteger.3
+file path=usr/share/man/man3/FcRangeDestroy.3
+file path=usr/share/man/man3/FcRangeGetDouble.3
file path=usr/share/man/man3/FcStrBasename.3
file path=usr/share/man/man3/FcStrCmp.3
file path=usr/share/man/man3/FcStrCmpIgnoreCase.3
@@ -474,6 +520,7 @@
file path=usr/share/man/man3/FcStrFree.3
file path=usr/share/man/man3/FcStrListCreate.3
file path=usr/share/man/man3/FcStrListDone.3
+file path=usr/share/man/man3/FcStrListFirst.3
file path=usr/share/man/man3/FcStrListNext.3
file path=usr/share/man/man3/FcStrPlus.3
file path=usr/share/man/man3/FcStrSetAdd.3
@@ -495,6 +542,8 @@
file path=usr/share/man/man3/FcValueEqual.3
file path=usr/share/man/man3/FcValuePrint.3
file path=usr/share/man/man3/FcValueSave.3
+file path=usr/share/man/man3/FcWeightFromOpenType.3
+file path=usr/share/man/man3/FcWeightToOpenType.3
file path=usr/share/man/man3lib/libfontconfig.3lib
file path=usr/share/man/man5/fonts-conf.5
link path=usr/share/man/man5/fonts.conf.5 target=fonts-conf.5