sw/CppunitTest_sw_txtexport.mk | 2 ++
sw/CppunitTest_sw_txtimport.mk | 2 ++
sw/CppunitTest_sw_uwriter.mk | 2 ++
sw/CppunitTest_sw_xhtmlexport.mk | 2 ++
4 files changed, 8 insertions(+)
New commits:
commit de4e5ab60ceebd285b98adacc886a15e8f83ecb8
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Nov 24 16:39:35 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Nov 24 19:01:18 2023 +0100
sw: fix --without-fonts build
See
<https://lists.freedesktop.org/archives/libreoffice/2023-November/091236.html>,
those builds were using system fonts intentionally, leave that setup
unchanged.
Change-Id: Ie5b754743c2f4a97e85dbd9e24e4b6a1047cc5aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159933
Reviewed-by: Dan Horák <d...@danny.cz>
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/CppunitTest_sw_txtexport.mk b/sw/CppunitTest_sw_txtexport.mk
index c0e716a9ccdc..8f6c0b469e0f 100644
--- a/sw/CppunitTest_sw_txtexport.mk
+++ b/sw/CppunitTest_sw_txtexport.mk
@@ -61,6 +61,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_txtexport,services))
$(eval $(call gb_CppunitTest_use_configuration,sw_txtexport))
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_txtexport,abort))
+endif
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_txtimport.mk b/sw/CppunitTest_sw_txtimport.mk
index fc9955eb596d..1f1cc01a4109 100644
--- a/sw/CppunitTest_sw_txtimport.mk
+++ b/sw/CppunitTest_sw_txtimport.mk
@@ -61,6 +61,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_txtimport,services))
$(eval $(call gb_CppunitTest_use_configuration,sw_txtimport))
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_txtimport,abort))
+endif
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index 80bf14a8195c..60bd744447d2 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -108,6 +108,8 @@ $(eval $(call gb_CppunitTest_use_components,sw_uwriter,\
$(eval $(call gb_CppunitTest_use_configuration,sw_uwriter))
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_uwriter,abort))
+endif
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_xhtmlexport.mk b/sw/CppunitTest_sw_xhtmlexport.mk
index b9532c69bf13..12202216c3a1 100644
--- a/sw/CppunitTest_sw_xhtmlexport.mk
+++ b/sw/CppunitTest_sw_xhtmlexport.mk
@@ -69,6 +69,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_xhtmlexport, \
svx \
))
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
$(eval $(call
gb_CppunitTest_set_non_application_font_use,sw_xhtmlexport,abort))
+endif
# vim: set noet sw=4 ts=4:
