external/fontconfig/StaticLibrary_fontconfig.mk | 1 + external/fontconfig/UnpackedTarball_fontconfig.mk | 5 +++++ 2 files changed, 6 insertions(+)
New commits: commit f7bb23754eacbd6664db4d19444899a65b7838d7 Author: Tor Lillqvist <[email protected]> AuthorDate: Sun Jan 11 00:18:11 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Sun Jan 11 13:43:21 2026 +0100 Update the Windows build of fontconfig for 2.17.1 Change-Id: Ieff4d01cbd60f225a6363566b6bc29c8bb9005bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196987 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins diff --git a/external/fontconfig/StaticLibrary_fontconfig.mk b/external/fontconfig/StaticLibrary_fontconfig.mk index 0ca2a1b095da..b06e8c3ed18c 100644 --- a/external/fontconfig/StaticLibrary_fontconfig.mk +++ b/external/fontconfig/StaticLibrary_fontconfig.mk @@ -15,6 +15,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,fontconfig,fontconfig)) $(eval $(call gb_StaticLibrary_set_include,fontconfig,\ -I$(gb_UnpackedTarball_workdir)/fontconfig \ + -I$(gb_UnpackedTarball_workdir)/fontconfig/fc-lang \ -I$(gb_UnpackedTarball_workdir)/freetype/include \ -I$(gb_UnpackedTarball_workdir)/expat/lib \ $$(INCLUDE) \ diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk b/external/fontconfig/UnpackedTarball_fontconfig.mk index 0fb9557c0db8..5a6175518cf6 100644 --- a/external/fontconfig/UnpackedTarball_fontconfig.mk +++ b/external/fontconfig/UnpackedTarball_fontconfig.mk @@ -30,6 +30,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ external/fontconfig/windowsfonts.patch \ )) +$(eval $(call gb_UnpackedTarball_set_post_action,fontconfig,\ + sed -e 's/@CACHE_VERSION@/9/' < fontconfig/fontconfig.h.in > fontconfig/fontconfig.h \ +)) + + $(eval $(call gb_UnpackedTarball_add_file,fontconfig,config.h,external/fontconfig/configs/wnt_fontconfig_config.h)) $(eval $(call gb_UnpackedTarball_add_file,fontconfig,fc-case/fccase.h,external/fontconfig/configs/wnt_fontconfig_fccase.h)) $(eval $(call gb_UnpackedTarball_add_file,fontconfig,fc-lang/fclang.h,external/fontconfig/configs/wnt_fontconfig_fclang.h))
