Repository.mk | 4 +--- desktop/Module_desktop.mk | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-)
New commits: commit 6979ea8b9eba992a822339096adb73c52c27f723 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Dec 13 20:06:29 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Dec 14 21:19:38 2025 +0100 build soffice launcher regardless of USING_X11 Change-Id: Id705465b3ce55322b157cc5590023671a191d527 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195610 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/Repository.mk b/Repository.mk index 79eceddda888..3fb9bfc052b2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1118,9 +1118,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\ $(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \ $(if $(and $(filter-out EMSCRIPTEN HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\ - $(if $(DISABLE_GUI),, \ - desktop_soffice_sh \ - ) \ + desktop_soffice_sh \ ) \ readlicense_oo_files \ readlicense_oo_license \ diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index b9efdf0b0011..adda4bdceb06 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -49,7 +49,13 @@ $(eval $(call gb_Module_add_targets,desktop,\ $(if $(filter MACOSX,$(OS)),CustomTarget_soffice) \ )) -ifeq ($(USING_X11),TRUE) +ifneq (,$(filter-out EMSCRIPTEN HAIKU MACOSX WNT,$(OS))) +$(eval $(call gb_Module_add_targets,desktop,\ + Package_soffice_sh \ +)) +endif + +ifeq ($(USING_X11), TRUE) $(eval $(call gb_Module_add_targets,desktop,\ Package_sbase_sh \ Package_scalc_sh \ @@ -57,7 +63,6 @@ $(eval $(call gb_Module_add_targets,desktop,\ Package_simpress_sh \ Package_smath_sh \ Package_swriter_sh \ - Package_soffice_sh \ )) endif endif # DESKTOP
