external/fontconfig/StaticLibrary_fontconfig.mk | 2 ++ sc/ucalc_setup.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit ec4642ad202d7684b61fbe609a37a937f9c4ef20 Author: Tor Lillqvist <[email protected]> AuthorDate: Tue Mar 11 07:43:13 2025 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:34:16 2025 +0100 Ignore two more warnings from MSVC in fontconfig Change-Id: If949c2c73d2caa25f150691e3af2dc5b5c73b943 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194580 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/fontconfig/StaticLibrary_fontconfig.mk b/external/fontconfig/StaticLibrary_fontconfig.mk index b8fa09f3c79f..963e30a5b3cd 100644 --- a/external/fontconfig/StaticLibrary_fontconfig.mk +++ b/external/fontconfig/StaticLibrary_fontconfig.mk @@ -28,6 +28,8 @@ $(eval $(call gb_StaticLibrary_add_defs,fontconfig,\ -wd4200 \ -wd4245 \ -wd4267 \ + -wd4456 \ + -wd4457 \ -wd4701 \ -wd4703 \ -DHAVE_CONFIG_H \ commit 9c4dfc5600ae60e532b749ee02ec0f6e1014f5c9 Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Mar 3 15:18:24 2025 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:34:04 2025 +0100 Using the avmedia library is not optional in Library_sc.mk either Change-Id: Iff278fe5682bbfa04952bf4917765fa07c9835e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194579 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/ucalc_setup.mk b/sc/ucalc_setup.mk index 63351a87aa28..42687a1d1ee4 100644 --- a/sc/ucalc_setup.mk +++ b/sc/ucalc_setup.mk @@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc$(1),\ )) $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc$(1), \ - $(call gb_Helper_optional,AVMEDIA,avmedia) \ + avmedia \ basegfx \ comphelper \ cppu \
