external/fontconfig/StaticLibrary_fontconfig.mk | 1 + external/fontconfig/UnpackedTarball_fontconfig.mk | 5 +++++ external/fontconfig/windowsfonts.patch | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 170b02b7db5cc76545e55e50546577bf9c884c94 Author: Tor Lillqvist <[email protected]> AuthorDate: Fri Feb 27 16:21:02 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Fri Feb 27 17:22:00 2026 +0100 Make the windowsfonts.patch apply again Change-Id: Ia03cf197053b36bee4cac6e4a32114b7d367ead9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200638 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/fontconfig/windowsfonts.patch b/external/fontconfig/windowsfonts.patch index 3e9093b829bf..fd820cdda5ba 100644 --- a/external/fontconfig/windowsfonts.patch +++ b/external/fontconfig/windowsfonts.patch @@ -73,7 +73,7 @@ well. +extern char* appx_fonts_get_dirs(); #endif - static FcChar8 *__fc_userdir = NULL; + static void @@ -1264,6 +1264,7 @@ #endif FcChar8 *parent = NULL, *retval = NULL; commit a40a5a0813492ee19c7f1e75180c0c214e7d4ca0 Author: Tor Lillqvist <[email protected]> AuthorDate: Sun Jan 11 00:18:11 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Fri Feb 27 17:21:50 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 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200637 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/fontconfig/StaticLibrary_fontconfig.mk b/external/fontconfig/StaticLibrary_fontconfig.mk index 84f5e332a1ca..a837d5f95e86 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 1ac569ecf082..86f39ae25abe 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,fonts.conf,external/fontconfig/configs/wnt_fonts.conf)) $(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))
