external/freetype/StaticLibrary_freetype.mk | 3 +++ postprocess/Module_postprocess.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit 5d73b9971fb1ffb65809993d347cd04b3388a7ef Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Mar 31 09:01:48 2025 +0300 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:34:42 2025 +0100 We seem to need postprocess_fontconfig also for CODA-W, for make check In that case, USE_HEADLESS_CODE will be non-empty, even if USING_X11 and DISABLE_GUI are empty. Change-Id: I553407737395789acef2380e0b1edb824bbcbad8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194582 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 56ecd75db150..79643e086bc4 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_l10n_targets,postprocess,\ # contain content from at least one of external/more_fonts/fc_local.snippet # (conditional on MORE_FONTS in BUILD_TYPE) and # extras/source/truetype/symbol/fc_local.snippet (unconditional): -ifneq ($(USING_X11)$(DISABLE_GUI)$(filter ANDROID EMSCRIPTEN,$(OS)),) +ifneq ($(USE_HEADLESS_CODE)$(USING_X11)$(DISABLE_GUI)$(filter ANDROID EMSCRIPTEN,$(OS)),) $(eval $(call gb_Module_add_targets,postprocess, \ CustomTarget_fontconfig \ Package_fontconfig \ commit 15ee9f539cdd82e8262b96b024b18d00ab4347af Author: Tor Lillqvist <[email protected]> AuthorDate: Tue Mar 11 07:55:56 2025 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:34:29 2025 +0100 Avoid MSVC warnings in freetype Change-Id: I525c6dfdbf60ea7b464d8ddb4d765865ca94180d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194581 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/freetype/StaticLibrary_freetype.mk b/external/freetype/StaticLibrary_freetype.mk index 9e3413959ce5..c76f8613ef69 100644 --- a/external/freetype/StaticLibrary_freetype.mk +++ b/external/freetype/StaticLibrary_freetype.mk @@ -17,6 +17,9 @@ $(eval $(call gb_StaticLibrary_set_include,freetype,\ )) $(eval $(call gb_StaticLibrary_add_defs,freetype,\ + -wd4005 \ + -wd4267 \ + -DDLG_STATIC \ -DZ_PREFIX \ -DFT2_BUILD_LIBRARY \ -DFT_DEBUG_LOGGING \
