configure.ac | 5 +++--
officecfg/registry/schema/org/openoffice/Office/Update.xcs | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit fee42049da6b1cf4c7f25eccd256e307cdbcdcbf
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri Aug 23 22:17:22 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Aug 26 17:21:14 2024 +0200
related tdf#68274: switch on MAR-based auto-updater by default
On platforms built with --enable-online-update-mar, make the automatic
online update the default now.
Change-Id: I4d8355023f185b89aa25701bcc02a15986d3d969
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172335
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
(cherry picked from commit 42f677c5f67a23e0cfb4fcc664efce078718489d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172405
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 0a2d4fc5b78f..c68049302acb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1932,8 +1932,9 @@ libo_FUZZ_ARG_ENABLE(online-update,
libo_FUZZ_ARG_ENABLE(online-update-mar,
AS_HELP_STRING([--enable-online-update-mar],
- [Enable the experimental Mozilla-like online update service that will
- check for new versions of LibreOffice. Disabled by default.]),
+ [Enable the Mozilla-like online update service that will
+ check for new versions of LibreOffice. Currently only works for
+ Windows and Linux. Disabled by default.]),
,)
libo_FUZZ_ARG_WITH(online-update-mar-baseurl,
diff --git a/officecfg/registry/schema/org/openoffice/Office/Update.xcs
b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
index 6657389db6d5..1d5843fc9be9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Update.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
@@ -20,10 +20,10 @@
<prop oor:name="Enabled" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Determines if the automatic Updater is enabled
- or disabled. Defaults to false, as long as this is
- regarded experimental.</desc>
+ or disabled. Defaults to true, only active in binary
+ if compiled with MAR updater support.</desc>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Mode" oor:type="xs:int" oor:nillable="false">
<info>
