summaryrefslogtreecommitdiffstats
path: root/Repository.mk
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-02-16 14:07:34 +0100
committerAndras Timar <andras.timar@collabora.com>2021-08-24 14:50:53 +0200
commit16005bc2f2fa01e95d8a4863e336cac96a78433e (patch)
treefd2424294665a1cbac56831715bc0b84b9440541 /Repository.mk
parenttdf#143619 validation circle anchor is special (diff)
downloadcore-16005bc2f2fa01e95d8a4863e336cac96a78433e.tar.gz
core-16005bc2f2fa01e95d8a4863e336cac96a78433e.zip
tdf#101630 - gdrive support w/oAuth and Drive API v3
LibreOffice is only using drive.file scope, so can only see files it owns/that were created by LibreOffice. In addition, also store the refresh token in LO's password-store if the user enabled persistent storage, removing the need to to the copy'n'paste dance to grant access each time LO is launched. related tdf#115643 also store the refresh token for onedrive consolidate the fallback-auth provides for onedrive/gdrive into one, they are all the same login in browser, then copy code method that ultimately should be changed to having LO listen on local port for the code Change-Id: I97e3843682c302d2884e35ece6e72bc3a07e2539 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119572 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 73041de9563c9a973d1b5394c6e5520a7d799980) fix install with --disable-cmis Change-Id: I51430a860a0b5047b566ed8184f0f563ec54f288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119661 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 299b72e4c9ad239d747e47eaf004400f5a590695) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120544
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk
index e056cbfce29f..2149816fe461 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -432,7 +432,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ucpexpand1 \
ucpext \
ucpimage \
- ucpcmis1 \
+ $(if $(ENABLE_LIBCMIS),ucpcmis1) \
ucptdoc1 \
unordf \
unoxml \