external/fontconfig/Module_fontconfig.mk | 1 + include/LibreOfficeKit/LibreOfficeKitInit.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit d30a759567c437b501101099fc3786ea87691e15 Author: Andras Timar <[email protected]> AuthorDate: Wed Dec 3 23:17:53 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 17 07:26:52 2026 +0100 fontconfig conf files for macOS app Change-Id: Icfa932f9ee481eaec8e19e46f15cd00b2bdd8806 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197440 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/external/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk index b99b954bf827..123c3ab453d1 100644 --- a/external/fontconfig/Module_fontconfig.mk +++ b/external/fontconfig/Module_fontconfig.mk @@ -24,6 +24,7 @@ else $(eval $(call gb_Module_add_targets,fontconfig,\ ExternalProject_fontconfig \ $(if $(filter EMSCRIPTEN,$(OS)),ExternalPackage_fontconfig_data) \ + $(if $(filter MACOSX,$(OS)),ExternalPackage_fontconfig_data) \ $(if $(filter FONTCONFIG,$(BUILD_TYPE)),ExternalPackage_fontconfig) \ )) commit f90f0c129bf8ebfcb05a0c45270c6c7d1e89b171 Author: Andras Timar <[email protected]> AuthorDate: Tue Dec 2 22:42:28 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 17 07:26:41 2026 +0100 typo: LUB -> LIB Change-Id: I6a433aa37dad11b1e5a2b4124d3af51836598e29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197439 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index f989c6294cfe..28cb38cb3657 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -218,7 +218,7 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib ) strncpy(imp_lib + partial_length, SOFFICEAPP_LIB, imp_lib_size - partial_length); struct stat st; - // If SOFFICEAPP_LUB exists but is ridiculously small, it is the + // If SOFFICEAPP_LIB exists but is ridiculously small, it is the // one-line text stub as in the --enable-mergedlib case. if (stat(imp_lib, &st) == 0 && st.st_size > 1000) {
