external/fontconfig/UnpackedTarball_fontconfig.mk | 1 +
external/fontconfig/nowarnnoconfig.patch.1 | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
New commits:
commit e452d429ccd6a2de75f08d84d2c4cceef69e6b86
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Aug 27 09:42:10 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Aug 27 18:22:40 2025 +0200
silence fontconfig warning about no default config on macOS
Change-Id: Ida1de9b6fe7de8e5a57da741a86101917c8b5587
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190278
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk
b/external/fontconfig/UnpackedTarball_fontconfig.mk
index 0636de8655ac..622479d65a32 100644
--- a/external/fontconfig/UnpackedTarball_fontconfig.mk
+++ b/external/fontconfig/UnpackedTarball_fontconfig.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,0))
$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
external/fontconfig/fontconfig-2.12.1.patch.1 \
+ external/fontconfig/nowarnnoconfig.patch.1 \
))
ifneq ($(OS),MACOSX)
diff --git a/external/fontconfig/nowarnnoconfig.patch.1
b/external/fontconfig/nowarnnoconfig.patch.1
new file mode 100644
index 000000000000..bdfe254888a9
--- /dev/null
+++ b/external/fontconfig/nowarnnoconfig.patch.1
@@ -0,0 +1,18 @@
+--- fontconfig/src/fcinit.c
++++ fontconfig/src/fcinit.c
+@@ -108,7 +108,14 @@
+
+ FcInitDebug();
+
+- if (!FcConfigParseAndLoad (config, 0, FcTrue)) {
++#if defined(__APPLE__)
++ // macOS doesn't have a default /etc/fonts/font.conf, so silence warning
++ // about that for now
++ FcBool complain = FcFalse;
++#else
++ FcBool complain = FcTrue;
++#endif
++ if (!FcConfigParseAndLoad (config, 0, complain)) {
+ const FcChar8 *sysroot = FcConfigGetSysRoot (config);
+ FcConfig *fallback = FcInitFallbackConfigWithFilter (config,
sysroot);
+
