summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaichi Haradaguchi <20001722@ymail.ne.jp>2024-02-20 20:10:39 +0900
committerTaichi Haradaguchi <20001722@ymail.ne.jp>2024-02-21 01:12:16 +0100
commitbbb0663813d0476b9a654207b7006315cb417c2e (patch)
tree7aa4b64e26968d59c367b3477c6d4668228c4b60
parenttdf#153196 writerfilter: fix page style for even/odd section break (diff)
downloadcore-bbb0663813d0476b9a654207b7006315cb417c2e.tar.gz
core-bbb0663813d0476b9a654207b7006315cb417c2e.zip
Fontconfig: upgrade to release 2.15.0
Change-Id: Id50d82b4dc7c3e8000b7658a9f62efa0d6b39495 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163646 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
-rw-r--r--download.lst4
-rw-r--r--external/fontconfig/ExternalPackage_fontconfig_data.mk1
-rw-r--r--external/fontconfig/README2
3 files changed, 4 insertions, 3 deletions
diff --git a/download.lst b/download.lst
index a3bd867ab6d8..d8d440da06be 100644
--- a/download.lst
+++ b/download.lst
@@ -121,8 +121,8 @@ FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-FONTCONFIG_SHA256SUM := dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
-FONTCONFIG_TARBALL := fontconfig-2.14.2.tar.xz
+FONTCONFIG_SHA256SUM := 63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e
+FONTCONFIG_TARBALL := fontconfig-2.15.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/fontconfig/ExternalPackage_fontconfig_data.mk b/external/fontconfig/ExternalPackage_fontconfig_data.mk
index cc72312da430..63bcc8a2a3a2 100644
--- a/external/fontconfig/ExternalPackage_fontconfig_data.mk
+++ b/external/fontconfig/ExternalPackage_fontconfig_data.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fontconfig_data,$(LIBO_SHARE
conf.d/11-lcdfilter-default.conf \
conf.d/11-lcdfilter-legacy.conf \
conf.d/11-lcdfilter-light.conf \
+ conf.d/11-lcdfilter-none.conf \
conf.d/20-unhint-small-vera.conf \
conf.d/25-unhint-nonlatin.conf \
conf.d/30-metric-aliases.conf \
diff --git a/external/fontconfig/README b/external/fontconfig/README
index 318d99594d89..5a1d998ada68 100644
--- a/external/fontconfig/README
+++ b/external/fontconfig/README
@@ -1,6 +1,6 @@
This "bundled" fontconfig is usually built only in an Android build or a fuzzing build
Fontconfig is a font configuration and customization library. It is designed to locate fonts
-within the system and select them according to requirements specified by applications.
+within the system and select them according to requirements specified by applications.
From [ https://www.freedesktop.org/wiki/Software/fontconfig/ ]