x11-fonts/fontconfig: update to 2.14.0

PR:		266126
Exp-run by:	antoine

5 files changed, 9 insertions, 79 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index f5f265a660b5..59f91a98e2db 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	fontconfig
-DISTVERSION=	2.13.94
-PORTREVISION=	2
+DISTVERSION=	2.14.0
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://www.freedesktop.org/software/fontconfig/release/
@@ -32,7 +31,7 @@ FCADDFONTS=	${LOCALBASE}/lib/X11/fonts
 
 # To avoid circular dependency rebuild of docs (including manpages) needs to be
 # disabled as they depend on textproc/docbook-utils which requires fontconfig
-MESON_ARGS=	-Ddefault_library=both -Ddoc=disabled -Dfc-cache=disabled
+MESON_ARGS=	-Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled
 
 PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 7d2eb30f06d8..03f760779f37 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625421212
-SHA256 (fontconfig-2.13.94.tar.xz) = a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
-SIZE (fontconfig-2.13.94.tar.xz) = 1416832
+TIMESTAMP = 1661936025
+SHA256 (fontconfig-2.14.0.tar.xz) = dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac
+SIZE (fontconfig-2.14.0.tar.xz) = 1431056
diff --git a/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf b/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf
deleted file mode 100644
index 77f4f997d846..000000000000
--- a/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf
+++ /dev/null
@@ -1,62 +0,0 @@
---- conf.d/60-latin.conf.orig	2020-11-28 01:56:42 UTC
-+++ conf.d/60-latin.conf
-@@ -5,44 +5,47 @@
- 	<alias>
- 		<family>serif</family>
- 		<prefer>
-+			<family>Liberation Serif</family>
- 			<family>DejaVu Serif</family>
- 			<family>Times New Roman</family>
--			<family>Thorndale AMT</family>
- 			<family>Luxi Serif</family>
- 			<family>Nimbus Roman No9 L</family>
- 			<family>Nimbus Roman</family>
- 			<family>Times</family>
-+			<family>Thorndale AMT</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>sans-serif</family>
- 		<prefer>
-+			<family>Liberation Sans</family>
- 			<family>DejaVu Sans</family>
--			<family>Verdana</family>
- 			<family>Arial</family>
--			<family>Albany AMT</family>
- 			<family>Luxi Sans</family>
- 			<family>Nimbus Sans L</family>
- 			<family>Nimbus Sans</family>
- 			<family>Helvetica</family>
- 			<family>Lucida Sans Unicode</family>
- 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
-+			<family>Verdana</family>
- 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
-+			<family>Albany AMT</family>
- 		</prefer>
- 	</alias>
- 	<alias>
- 		<family>monospace</family>
- 		<prefer>
-+			<family>Liberation Mono</family>
- 			<family>DejaVu Sans Mono</family>
- 			<family>Inconsolata</family>
- 			<family>Andale Mono</family>
- 			<family>Courier New</family>
--			<family>Cumberland AMT</family>
- 			<family>Luxi Mono</family>
- 			<family>Nimbus Mono L</family>
- 			<family>Nimbus Mono</family>
- 			<family>Nimbus Mono PS</family>
- 			<family>Courier</family>
-+			<family>Cumberland AMT</family>
- 		</prefer>
- 	</alias>
- <!--
-@@ -63,6 +66,7 @@
- 	<alias>
- 		<family>cursive</family>
- 		<prefer>
-+			<family>Comic Neue</family>
- 			<family>ITC Zapf Chancery Std</family>
- 			<family>Zapfino</family>
- 			<family>Comic Sans MS</family>
diff --git a/x11-fonts/fontconfig/files/patch-fc-cache_meson.build b/x11-fonts/fontconfig/files/patch-fc-cache_meson.build
deleted file mode 100644
index cdb981f4abee..000000000000
--- a/x11-fonts/fontconfig/files/patch-fc-cache_meson.build
+++ /dev/null
@@ -1,10 +0,0 @@
---- fc-cache/meson.build.orig	2021-01-28 11:53:32 UTC
-+++ fc-cache/meson.build
-@@ -8,6 +8,6 @@ fccache = executable('fc-cache', ['fc-cache.c', fcstdi
- tools_man_pages += ['fc-cache']
- 
- # Do not try to execute target's fc-cache on host when cross compiling
--if not meson.is_cross_build()
-+if get_option('fc-cache').enabled() and not meson.is_cross_build()
-   meson.add_install_script(fccache, '-s', '-f', '-v')
- endif
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 58a09a8709fa..5bb87a1caaad 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -31,6 +31,7 @@ etc/fonts/conf.avail/35-lang-normalize.conf
 etc/fonts/conf.avail/40-nonlatin.conf
 etc/fonts/conf.avail/45-generic.conf
 etc/fonts/conf.avail/45-latin.conf
+etc/fonts/conf.avail/48-spacing.conf
 etc/fonts/conf.avail/49-sansserif.conf
 etc/fonts/conf.avail/50-user.conf
 etc/fonts/conf.avail/51-local.conf
@@ -46,11 +47,13 @@ etc/fonts/conf.avail/80-delicious.conf
 etc/fonts/conf.avail/90-synthetic.conf
 etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf
 etc/fonts/conf.d/10-scale-bitmap-fonts.conf
+etc/fonts/conf.d/11-lcdfilter-default.conf
 etc/fonts/conf.d/20-unhint-small-vera.conf
 etc/fonts/conf.d/30-metric-aliases.conf
 etc/fonts/conf.d/40-nonlatin.conf
 etc/fonts/conf.d/45-generic.conf
 etc/fonts/conf.d/45-latin.conf
+etc/fonts/conf.d/48-spacing.conf
 etc/fonts/conf.d/49-sansserif.conf
 etc/fonts/conf.d/50-user.conf
 etc/fonts/conf.d/51-local.conf
@@ -72,7 +75,7 @@ include/fontconfig/fontconfig.h
 lib/libfontconfig.a
 lib/libfontconfig.so
 lib/libfontconfig.so.1
-lib/libfontconfig.so.1.12.0
+lib/libfontconfig.so.1.13.0
 libdata/pkgconfig/fontconfig.pc
 man/man1/fc-cache.1.gz
 man/man1/fc-cat.1.gz