Repository.mk | 2 +- RepositoryExternal.mk | 2 +- external/fontconfig/Module_fontconfig.mk | 2 +- external/fontconfig/UnpackedTarball_fontconfig.mk | 1 + external/fontconfig/nowarnnoconfig.patch.1 | 18 ++++++++++++++++++ 5 files changed, 22 insertions(+), 3 deletions(-)
New commits: commit 95d41ebfb6da8fabfe172a83974749f4c79fb567 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Aug 27 09:42:10 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Nov 29 01:11:11 2025 +0100 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 <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194796 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> 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); + commit e904a25da2c120305b49daed61b7649c4b4452b0 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Aug 26 20:48:50 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Nov 29 01:11:01 2025 +0100 ENABLE_FONTCONFIG is actually not defined Change-Id: Iaabcfcab53b7c6ab9b20305d97979d0c978ec598 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194795 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/Repository.mk b/Repository.mk index e0b5bc337f00..79eceddda888 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1047,7 +1047,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ extras_fonts \ - $(if $(USING_X11)$(DISABLE_GUI)$(ENABLE_FONTCONFIG)$(filter ANDROID EMSCRIPTEN,$(OS)), \ + $(if $(USING_X11)$(DISABLE_GUI)$(filter FONTCONFIG,$(BUILD_TYPE))$(filter ANDROID EMSCRIPTEN,$(OS)), \ postprocess_fontconfig) \ $(call gb_Helper_optional,MORE_FONTS,\ fonts_alef \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 419ebfee1ec5..fe68e006919b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1371,7 +1371,7 @@ gb_ExternalProject__use_fontconfig := else # SYSTEM_FONTCONFIG -ifeq ($(ENABLE_FONTCONFIG),TRUE) +ifneq (,$(filter FONTCONFIG,$(BUILD_TYPE))) $(eval $(call gb_Helper_register_packages_for_install,ooo,\ fontconfig \ diff --git a/external/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk index 21dea02acd43..391f6dabc0fc 100644 --- a/external/fontconfig/Module_fontconfig.mk +++ b/external/fontconfig/Module_fontconfig.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,fontconfig)) $(eval $(call gb_Module_add_targets,fontconfig,\ ExternalProject_fontconfig \ $(if $(filter EMSCRIPTEN,$(OS)),ExternalPackage_fontconfig_data) \ - $(if $(filter TRUE,$(ENABLE_FONTCONFIG)),ExternalPackage_fontconfig) \ + $(if $(filter FONTCONFIG,$(BUILD_TYPE)),ExternalPackage_fontconfig) \ UnpackedTarball_fontconfig \ ))
