solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 ---- 1 file changed, 4 deletions(-)
New commits: commit 2854c1a37d60990e319c7218c58f24eb2c807c97 Author: Xisco Fauli <[email protected]> AuthorDate: Sun Apr 18 19:10:20 2021 +0200 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Tue Apr 20 11:24:53 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 <[email protected]> (cherry picked from commit 6064446f828f8cd612f7d6660153b2eb1139239b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114191 Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 2b258e8c5e0bd12af1ecea76be99bb384327fda9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114274 Reviewed-by: Michael Stahl <[email protected]> Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Adolfo Jayme Barrientos <[email protected]> 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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
