ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

build soffice launcher regardless of USING_X11

Browse Source 
Change-Id: Id705465b3ce55322b157cc5590023671a191d527
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195610
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara
2025-12-14 21:19:38 +01:00
parent 2846cc2fae
commit 6979ea8b9e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
-2
View File
@@ -1118,10 +1118,8 @@ $(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 \
) \
) \
readlicense_oo_files \
readlicense_oo_license \
$(call gb_Helper_optional,DESKTOP,setup_native_packinfo) \
desktop/Module_desktop.mk
+7 -2
View File
@@ -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