Merge branch '3.6' into 3.7

3 files changed, 18 insertions, 9 deletions

diff --git a/fontconfig/.footprint b/fontconfig/.footprint
index 5991c5386..f056fd464 100644
--- a/fontconfig/.footprint
+++ b/fontconfig/.footprint
@@ -1,6 +1,8 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/fonts/
 drwxr-xr-x	root/root	etc/fonts/conf.avail/
+-rw-r--r--	root/root	etc/fonts/conf.avail/05-reset-dirs-sample.conf
+-rw-r--r--	root/root	etc/fonts/conf.avail/09-autohint-if-no-hinting.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/10-autohint.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/10-hinting-full.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/10-hinting-medium.conf
@@ -19,9 +21,11 @@ drwxr-xr-x	root/root	etc/fonts/conf.avail/
 -rw-r--r--	root/root	etc/fonts/conf.avail/20-unhint-small-vera.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/25-unhint-nonlatin.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/30-metric-aliases.conf
+-rw-r--r--	root/root	etc/fonts/conf.avail/35-lang-normalize.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/40-nonlatin.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/45-generic.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/45-latin.conf
+-rw-r--r--	root/root	etc/fonts/conf.avail/48-spacing.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/49-sansserif.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/50-user.conf
 -rw-r--r--	root/root	etc/fonts/conf.avail/51-local.conf
@@ -39,11 +43,13 @@ drwxr-xr-x	root/root	etc/fonts/conf.d/
 lrwxrwxrwx	root/root	etc/fonts/conf.d/10-autohint.conf -> /etc/fonts/conf.avail/10-autohint.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/10-hinting-slight.conf -> /etc/fonts/conf.avail/10-hinting-slight.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/10-scale-bitmap-fonts.conf -> /etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
+lrwxrwxrwx	root/root	etc/fonts/conf.d/11-lcdfilter-default.conf -> /etc/fonts/conf.avail/11-lcdfilter-default.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/20-unhint-small-vera.conf -> /etc/fonts/conf.avail/20-unhint-small-vera.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/30-metric-aliases.conf -> /etc/fonts/conf.avail/30-metric-aliases.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/40-nonlatin.conf -> /etc/fonts/conf.avail/40-nonlatin.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/45-generic.conf -> /etc/fonts/conf.avail/45-generic.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/45-latin.conf -> /etc/fonts/conf.avail/45-latin.conf
+lrwxrwxrwx	root/root	etc/fonts/conf.d/48-spacing.conf -> /etc/fonts/conf.avail/48-spacing.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/49-sansserif.conf -> /etc/fonts/conf.avail/49-sansserif.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/50-user.conf -> /etc/fonts/conf.avail/50-user.conf
 lrwxrwxrwx	root/root	etc/fonts/conf.d/51-local.conf -> /etc/fonts/conf.avail/51-local.conf
@@ -150,6 +156,7 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/FcConfigGetConfigDirs.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcConfigGetConfigFiles.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcConfigGetCurrent.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/FcConfigGetFilename.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcConfigGetFontDirs.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcConfigGetFonts.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcConfigGetRescanInterval.3.gz
@@ -277,6 +284,7 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/FcRangeDestroy.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcRangeGetDouble.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcStrBasename.3.gz
+-rw-r--r--	root/root	usr/share/man/man3/FcStrBuildFilename.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcStrCmp.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcStrCmpIgnoreCase.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/FcStrCopy.3.gz
diff --git a/fontconfig/.signature b/fontconfig/.signature
index c1e2862c4..a5f5cc08e 100644
--- a/fontconfig/.signature
+++ b/fontconfig/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Vqovuga1JWg+CqcWlOMLz65THKk02CX8v8HsDcSti0oYGqaS4PMoPbVzuwnnkIIEfsekmHUQKjT0GwuHrBRaQY=
-SHA256 (Pkgfile) = c97b18ac6ed136ce7ef9445120419130333fd44c3870146fe6b0bd8e0da78c29
-SHA256 (.footprint) = 113be23e03ee5b6f4b42797ed4b56aad5182af20af1d942a075c2b7aaf6c6b23
-SHA256 (fontconfig-2.13.1.tar.bz2) = f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
+RWSE3ohX2g5d/eN8PKP/6YMTNHddjTjqsMeeJk660Ry1xk7ibdTCs670lApJTGt4ILIQguQTUfsgDpmeelwLiwe/9B4pXIZ78gA=
+SHA256 (Pkgfile) = fec320506d33fa892cc614ee2561807f36602fcdeec60fbb339b3537668f2bdc
+SHA256 (.footprint) = 9851201b2e291df7d28ca8cd9bced6bbe9430bed6f789fd3db662c5abfa3ba2d
+SHA256 (fontconfig-2.14.0.tar.xz) = dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac
diff --git a/fontconfig/Pkgfile b/fontconfig/Pkgfile
index 01d86c433..e6a9145ca 100644
--- a/fontconfig/Pkgfile
+++ b/fontconfig/Pkgfile
@@ -4,18 +4,20 @@
 # Depends on: expat freetype
 
 name=fontconfig
-version=2.13.1
+version=2.14.0
 release=1
-source=(https://fontconfig.org/release/$name-$version.tar.bz2)
+source=(https://fontconfig.org/release/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
 
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-xmldir=/etc/fonts \
-		--with-templatedir=/etc/fonts/conf.avail
+		--with-templatedir=/etc/fonts/conf.avail \
+		--disable-nls
 
 	make
 	make DESTDIR=$PKG install
@@ -27,5 +29,4 @@ build() {
 
 	rm -f $PKG/etc/fonts/conf.d/README
 	rm -r $PKG/usr/share/doc
-	rm -r $PKG/usr/share/locale
 }