solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit 6064446f828f8cd612f7d6660153b2eb1139239b
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Sun Apr 18 19:10:20 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Apr 18 21:40:07 2021 +0200
tdf#132901: do not add updatecheck to libmerged
LibreOffice crashes if "online update"
feature is not installed
Regression from c63148ba139bd6b9ae7a0f9e24e51f29e5370963
< Revert "Revert "add some libs to libmerged"" >
Change-Id: Ia18f50bc6baf830b2d3e0814645ef04283bfaa04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114247
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index dfd3ebdc227e..12fd14edf522 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -92,10 +92,6 @@ MERGE_LIBRARY_LIST := \
ucptdoc1 \
unordf \
unoxml \
- $(if $(ENABLE_ONLINE_UPDATE), \
- updatecheckui \
- updchk \
- ) \
updatefeed \
utl \
uui \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
