Skip to content
Snippets Groups Projects
Commit eae4074d authored by Anna Wilcox's avatar Anna Wilcox :fox:
Browse files

Merge branch 'nextcloud-client' into 'master' 

user/nextcloud-client: bump to 2.6.3, disable update check

See merge request adelie/packages!405
parents d7573567 bce83e75
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
user/nextcloud-client/APKBUILD
+ 11
− 8
View file @ eae4074d
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=nextcloud-client
pkgver=2.5.3
pkgver=2.6.3
pkgrel=0
pkgdesc="Nextcloud desktop client"
url="https://github.com/nextcloud/desktop"
......@@ -13,7 +13,7 @@ makedepends="cmake qt5-qttools-dev qtkeychain-dev zlib-dev
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/nextcloud/desktop/archive/v$pkgver.tar.gz
no-webengine.patch
openssl.patch"
test-fix-include.patch"
builddir="$srcdir/desktop-$pkgver"
build() {
......@@ -21,11 +21,10 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_SYSCONFDIR="/etc/$pkgname" \
-DNO_SHIBBOLETH=1 \
-DWITH_CRASHREPORTER=bool:OFF \
-DUNIT_TESTING=bool:ON \
-DNO_SHIBBOLETH=bool:ON .
-DNO_SHIBBOLETH=bool:ON \
-DNO_WEBENGINE=bool:ON .
make
}
......@@ -37,8 +36,12 @@ check() {
package() {
make DESTDIR="$pkgdir" install
cat > "$pkgdir"/etc/Nextcloud/Nextcloud.conf <<-EOF
[General]
skipUpdateCheck=true
EOF
}
sha512sums="998e38278472e87e9606fad407ba7b1295594a777845c6fa7413ffb485b3a3b7a26ad8212a1161e1d695d9ecfa066e9090aa633b4ec4af84700c28bc1321b710 nextcloud-client-2.5.3.tar.gz
17e6a8437d33a2bb1305e45405aee4e23f233e00c232669a1f8317355032d88329899d3f7b65d1069cf1612029b589a575b0f64018b9b23d239a73c5f4bed2ce no-webengine.patch
e323a1074f8ac96667a420f076fdfc988e2fd97cdacd05d83ac54b467b567f5adbf635e7c4fb0414af0012b4016cc4c13441cb35ed3976bc970e514e81b65fd4 openssl.patch"
sha512sums="ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025 nextcloud-client-2.6.3.tar.gz
38dd89ca2bf67294187bb4d5c59cdf725ec3b502f23bf4a60210e85c66f6a7e00da0e0b41775bc138159bed300dc60a1f179d1d6ad3b7a27e1aadf4f0576f348 no-webengine.patch
c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f test-fix-include.patch"
user/nextcloud-client/no-webengine.patch
+ 277
− 107
View file @ eae4074d
--- desktop-2.5.2/src/CMakeLists.txt 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/CMakeLists.txt 2019-04-22 04:01:31.260028906 +0000
@@ -4,7 +4,7 @@
From 61561d454fec726741a938b81149fa0e2d7db4d6 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Mon, 24 Feb 2020 21:32:58 -0600
Subject: [PATCH] Add support for compiling without QtWebEngine (webflow /
flow2 support)
Signed-off-by: Max Rees <maxcrees@me.com>
---
CMakeLists.txt | 7 +++++++
src/CMakeLists.txt | 6 +++++-
src/gui/CMakeLists.txt | 25 +++++++++++++++-------
src/gui/accountmanager.cpp | 2 ++
src/gui/creds/credentialsfactory.cpp | 4 ++++
src/gui/wizard/owncloudsetuppage.cpp | 4 ++++
src/gui/wizard/owncloudwizard.cpp | 31 +++++++++++++++++++++++++++-
src/gui/wizard/owncloudwizard.h | 6 ++++++
src/libsync/networkjobs.cpp | 8 +++++++
9 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8e92e250..90719c222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,6 +167,13 @@ if(NO_SHIBBOLETH)
add_definitions(-DNO_SHIBBOLETH=1)
endif()
+# Disable webengine-based components
+option(NO_WEBENGINE "Build without webflow / flow2 support so QtWebEngine isn't required" OFF)
+if(NO_WEBENGINE)
+ message("Compiling without webengine")
+ add_definitions(-DNO_WEBENGINE=1)
+endif()
+
if(APPLE)
set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f854b006..881daec8e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,11 +4,15 @@ endif()
set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
......@@ -9,26 +48,35 @@
if (Qt5Core_VERSION VERSION_LESS 5.9.0)
message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
endif()
--- desktop-2.5.2/src/gui/CMakeLists.txt 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/gui/CMakeLists.txt 2019-04-22 04:15:53.230034980 +0000
@@ -40,7 +40,6 @@
wizard/owncloudoauthcredspage.ui
wizard/owncloudsetupnocredspage.ui
wizard/owncloudwizardresultpage.ui
- wizard/webview.ui
)
set(client_SRCS
@@ -103,8 +102,6 @@
+if(NOT NO_WEBENGINE)
+ find_package(Qt5 5.6 COMPONENTS WebEngineWidgets WebEngine REQUIRED)
+endif()
+
if(NOT TOKEN_AUTH_ONLY)
find_package(Qt5Keychain REQUIRED)
endif()
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 4372a9f23..d62f23d1e 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -108,24 +108,17 @@ set(client_SRCS
creds/credentialsfactory.cpp
creds/httpcredentialsgui.cpp
creds/oauth.cpp
- creds/flow2auth.cpp
creds/keychainchunk.cpp
- creds/webflowcredentials.cpp
- creds/webflowcredentialsdialog.cpp
wizard/postfixlineedit.cpp
wizard/abstractcredswizardpage.cpp
wizard/owncloudadvancedsetuppage.cpp
@@ -115,8 +112,6 @@
wizard/owncloudconnectionmethoddialog.cpp
wizard/owncloudhttpcredspage.cpp
wizard/owncloudoauthcredspage.cpp
- wizard/flow2authcredspage.cpp
- wizard/flow2authwidget.cpp
wizard/owncloudsetuppage.cpp
wizard/owncloudwizardcommon.cpp
wizard/owncloudwizard.cpp
wizard/owncloudwizardresultpage.cpp
......@@ -37,169 +85,291 @@
wizard/slideshow.cpp
)
@@ -295,7 +290,7 @@
@@ -138,6 +131,18 @@ IF(NOT NO_SHIBBOLETH)
)
endif()
+IF(NOT NO_WEBENGINE)
+ list(APPEND client_SRCS
+ creds/flow2auth.cpp
+ creds/webflowcredentials.cpp
+ creds/webflowcredentialsdialog.cpp
+ wizard/flow2authcredspage.cpp
+ wizard/flow2authwidget.cpp
+ wizard/webviewpage.cpp
+ wizard/webview.cpp
+ )
+endif()
+
set(updater_SRCS
updater/ocupdater.cpp
updater/updateinfo.cpp
@@ -298,7 +303,11 @@ else()
endif()
add_library(updater STATIC ${updater_SRCS})
-target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
+target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml)
+if(NOT NO_WEBENGINE)
+ target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
+else()
+ target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml)
+endif()
target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
--- desktop-2.5.2/src/gui/accountmanager.cpp 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/gui/accountmanager.cpp 2019-04-22 04:17:04.440035482 +0000
@@ -253,20 +253,6 @@
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index eec375180..2d7b0bc30 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -253,6 +253,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
acc->setUrl(urlConfig.toUrl());
}
- // Migrate to webflow
- if (authType == QLatin1String("http")) {
- authType = "webflow";
- settings.setValue(QLatin1String(authTypeC), authType);
-
- foreach(QString key, settings.childKeys()) {
- if (!key.startsWith("http_"))
- continue;
- auto newkey = QString::fromLatin1("webflow_").append(key.mid(5));
- settings.setValue(newkey, settings.value((key)));
- settings.remove(key);
- }
- }
-
+#ifndef NO_WEBENGINE
// Migrate to webflow
if (authType == QLatin1String("http")) {
authType = "webflow";
@@ -266,6 +267,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
settings.remove(key);
}
}
+#endif
qCInfo(lcAccountManager) << "Account for" << acc->url() << "using auth type" << authType;
acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
--- desktop-2.5.2/src/gui/creds/credentialsfactory.cpp 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/gui/creds/credentialsfactory.cpp 2019-04-22 04:23:19.590038126 +0000
@@ -21,7 +21,6 @@
diff --git a/src/gui/creds/credentialsfactory.cpp b/src/gui/creds/credentialsfactory.cpp
index 6062f70eb..723196d08 100644
--- a/src/gui/creds/credentialsfactory.cpp
+++ b/src/gui/creds/credentialsfactory.cpp
@@ -21,7 +21,9 @@
#ifndef NO_SHIBBOLETH
#include "creds/shibbolethcredentials.h"
#endif
-#include "creds/webflowcredentials.h"
+#ifndef NO_WEBENGINE
#include "creds/webflowcredentials.h"
+#endif
namespace OCC {
@@ -40,8 +39,6 @@
@@ -40,8 +42,10 @@ namespace CredentialsFactory {
} else if (type == "shibboleth") {
return new ShibbolethCredentials;
#endif
- } else if (type == "webflow") {
- return new WebFlowCredentials;
+#ifndef NO_WEBENGINE
} else if (type == "webflow") {
return new WebFlowCredentials;
+#endif
} else {
qCWarning(lcGuiCredentials, "Unknown credentials type: %s", qPrintable(type));
return new DummyCredentials;
--- desktop-2.5.2/src/gui/wizard/owncloudwizard.cpp 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/gui/wizard/owncloudwizard.cpp 2019-04-22 04:24:59.360038829 +0000
@@ -26,7 +26,6 @@
diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index 11b1fc80c..30df7cc7f 100644
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -144,7 +144,11 @@ void OwncloudSetupPage::slotLogin()
void OwncloudSetupPage::slotGotoProviderList()
{
_ocWizard->setRegistration(true);
+#ifndef NO_WEBENGINE
_ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
+#else
+ _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::Basic);
+#endif
_authTypeKnown = true;
_checking = false;
emit completeChanged();
diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index 2076136ff..8cb91e250 100644
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -27,8 +27,10 @@
#endif
#include "wizard/owncloudadvancedsetuppage.h"
#include "wizard/owncloudwizardresultpage.h"
-#include "wizard/webviewpage.h"
+#ifndef NO_WEBENGINE
#include "wizard/webviewpage.h"
#include "wizard/flow2authcredspage.h"
+#endif
#include "QProgressIndicator.h"
@@ -51,7 +50,6 @@
@@ -47,14 +49,18 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
, _setupPage(new OwncloudSetupPage(this))
, _httpCredsPage(new OwncloudHttpCredsPage(this))
, _browserCredsPage(new OwncloudOAuthCredsPage)
+#ifndef NO_WEBENGINE
, _flow2CredsPage(new Flow2AuthCredsPage)
+#endif
#ifndef NO_SHIBBOLETH
, _shibbolethCredsPage(new OwncloudShibbolethCredsPage)
#endif
, _advancedSetupPage(new OwncloudAdvancedSetupPage)
, _resultPage(new OwncloudWizardResultPage)
, _credentialsPage(nullptr)
- , _webViewPage(new WebViewPage(this))
+#ifndef NO_WEBENGINE
, _webViewPage(new WebViewPage(this))
+#endif
, _setupLog()
, _registration(false)
{
@@ -64,7 +62,6 @@
@@ -62,13 +68,17 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
setPage(WizardCommon::Page_ServerSetup, _setupPage);
setPage(WizardCommon::Page_HttpCreds, _httpCredsPage);
setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage);
+#ifndef NO_WEBENGINE
setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
+#endif
#ifndef NO_SHIBBOLETH
setPage(WizardCommon::Page_ShibbolethCreds, _shibbolethCredsPage);
#endif
setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
setPage(WizardCommon::Page_Result, _resultPage);
- setPage(WizardCommon::Page_WebView, _webViewPage);
+#ifndef NO_WEBENGINE
setPage(WizardCommon::Page_WebView, _webViewPage);
+#endif
connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
@@ -79,7 +76,6 @@
@@ -80,11 +90,15 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
connect(_setupPage, &OwncloudSetupPage::determineAuthType, this, &OwncloudWizard::determineAuthType);
connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+#ifndef NO_WEBENGINE
connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+#endif
#ifndef NO_SHIBBOLETH
connect(_shibbolethCredsPage, &OwncloudShibbolethCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
#endif
- connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+#ifndef NO_WEBENGINE
connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+#endif
connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
this, &OwncloudWizard::createLocalAndRemoteFolders);
connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
@@ -168,10 +164,6 @@
@@ -106,12 +120,16 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
// Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
connect(this, &OwncloudWizard::styleChanged, _setupPage, &OwncloudSetupPage::slotStyleChanged);
connect(this, &OwncloudWizard::styleChanged, _advancedSetupPage, &OwncloudAdvancedSetupPage::slotStyleChanged);
+#ifndef NO_WEBENGINE
connect(this, &OwncloudWizard::styleChanged, _flow2CredsPage, &Flow2AuthCredsPage::slotStyleChanged);
+#endif
customizeStyle();
+#ifndef NO_WEBENGINE
// allow Flow2 page to poll on window activation
connect(this, &OwncloudWizard::onActivate, _flow2CredsPage, &Flow2AuthCredsPage::slotPollNow);
+#endif
}
void OwncloudWizard::setAccount(AccountPtr account)
@@ -180,9 +198,11 @@ void OwncloudWizard::successfulStep()
_browserCredsPage->setConnected();
break;
+#ifndef NO_WEBENGINE
case WizardCommon::Page_Flow2AuthCreds:
_flow2CredsPage->setConnected();
break;
+#endif
#ifndef NO_SHIBBOLETH
case WizardCommon::Page_ShibbolethCreds:
@@ -190,9 +210,11 @@ void OwncloudWizard::successfulStep()
break;
#endif
- case WizardCommon::Page_WebView:
- _webViewPage->setConnected();
- break;
-
+#ifndef NO_WEBENGINE
case WizardCommon::Page_WebView:
_webViewPage->setConnected();
break;
+#endif
case WizardCommon::Page_AdvancedSetup:
_advancedSetupPage->directoriesCreated();
break;
@@ -195,8 +187,6 @@
@@ -217,10 +239,12 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob::AuthType type)
#endif
if (type == DetermineAuthTypeJob::OAuth) {
_credentialsPage = _browserCredsPage;
- } else if (type == DetermineAuthTypeJob::WebViewFlow) {
- _credentialsPage = _webViewPage;
+#ifndef NO_WEBENGINE
} else if (type == DetermineAuthTypeJob::LoginFlowV2) {
_credentialsPage = _flow2CredsPage;
} else if (type == DetermineAuthTypeJob::WebViewFlow) {
_credentialsPage = _webViewPage;
+#endif
} else { // try Basic auth even for "Unknown"
_credentialsPage = _httpCredsPage;
}
--- desktop-2.5.2/src/libsync/networkjobs.h 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/libsync/networkjobs.h 2019-04-22 05:21:11.950062594 +0000
@@ -411,8 +411,7 @@
enum AuthType {
Basic, // also the catch-all fallback for backwards compatibility reasons
OAuth,
- Shibboleth,
- WebViewFlow
+ Shibboleth
};
explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr);
--- desktop-2.5.2/src/libsync/networkjobs.cpp 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/libsync/networkjobs.cpp 2019-04-22 05:33:28.590067785 +0000
@@ -922,7 +922,7 @@
// WebViewFlow > OAuth > Shib > Basic
if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
- result = WebViewFlow;
+ result = Basic;
@@ -245,7 +269,12 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
}
qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
--- desktop-2.5.2/src/gui/wizard/owncloudsetuppage.cpp 2019-03-19 01:52:24.000000000 +0000
+++ desktop-2.5.2/src/gui/wizard/owncloudsetuppage.cpp 2019-04-22 05:32:01.750067173 +0000
@@ -143,7 +143,7 @@
void OwncloudSetupPage::slotGotoProviderList()
{
_ocWizard->setRegistration(true);
- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
+ _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::Basic);
_authTypeKnown = true;
_checking = false;
emit completeChanged();
@@ -260,8 +260,6 @@
return WizardCommon::Page_OAuthCreds;
case DetermineAuthTypeJob::Shibboleth:
return WizardCommon::Page_ShibbolethCreds;
- case DetermineAuthTypeJob::WebViewFlow:
- return WizardCommon::Page_WebView;
}
return WizardCommon::Page_HttpCreds;
}
--- desktop-2.5.2/src/gui/wizard/owncloudwizard.h 2019-03-18 21:52:24.000000000 -0400
+++ desktop-2.5.2/src/gui/wizard/owncloudwizard.h 2019-04-22 02:07:03.600081984 -0400
@@ -39,7 +39,6 @@
setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
- if (id == WizardCommon::Page_AdvancedSetup && (_credentialsPage == _browserCredsPage || _credentialsPage == _flow2CredsPage)) {
+ if (id == WizardCommon::Page_AdvancedSetup
+ && (_credentialsPage == _browserCredsPage
+#ifndef NO_WEBENGINE
+ || _credentialsPage == _flow2CredsPage
+#endif
+ )) {
// For OAuth, disable the back button in the Page_AdvancedSetup because we don't want
// to re-open the browser.
button(QWizard::BackButton)->setEnabled(false);
diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
index 3cbf89f71..2f398d416 100644
--- a/src/gui/wizard/owncloudwizard.h
+++ b/src/gui/wizard/owncloudwizard.h
@@ -39,8 +39,10 @@ class OwncloudAdvancedSetupPage;
class OwncloudWizardResultPage;
class AbstractCredentials;
class AbstractCredentialsWizardPage;
-class WebViewPage;
+#ifndef NO_WEBENGINE
class WebViewPage;
class Flow2AuthCredsPage;
+#endif
/**
* @brief The OwncloudWizard class
@@ -106,7 +105,6 @@
@@ -114,11 +116,15 @@ private:
#ifndef NO_SHIBBOLETH
OwncloudShibbolethCredsPage *_shibbolethCredsPage;
#endif
+#ifndef NO_WEBENGINE
Flow2AuthCredsPage *_flow2CredsPage;
+#endif
OwncloudAdvancedSetupPage *_advancedSetupPage;
OwncloudWizardResultPage *_resultPage;
AbstractCredentialsWizardPage *_credentialsPage;
- WebViewPage *_webViewPage;
+#ifndef NO_WEBENGINE
WebViewPage *_webViewPage;
+#endif
QStringList _setupLog;
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index 76789a8ce..73f0bed0e 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -955,12 +955,20 @@ void DetermineAuthTypeJob::checkAllDone()
// WebViewFlow > OAuth > Shib > Basic
if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
+#ifndef NO_WEBENGINE
result = WebViewFlow;
+#else
+ result = Basic;
+#endif
}
// LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
+#ifndef NO_WEBENGINE
result = LoginFlowV2;
+#else
+ result = Basic;
+#endif
}
// If we determined that we need the webview flow (GS for example) then we switch to that
--
2.25.0
user/nextcloud-client/openssl.patch deleted 100644 → 0
+ 0
− 11
View file @ d7573567
--- desktop-2.5.0-beta2/CMakeLists.txt 2018-08-24 12:54:42.000000000 +0000
+++ desktop-2.5.0-beta2/CMakeLists.txt 2018-10-03 06:19:15.840263697 +0000
@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
endif()
find_package(Sphinx)
find_package(PdfLatex)
- find_package(OpenSSL 1.1 REQUIRED )
+ find_package(OpenSSL 1.0 REQUIRED )
find_package(ZLIB REQUIRED)
find_package(GLib2)
user/nextcloud-client/test-fix-include.patch 0 → 100644
+ 22
− 0
View file @ eae4074d
From f9c6449c050cad673cf37971d9815a35e6ffb5dd Mon Sep 17 00:00:00 2001
From: tuxmaster5000 <837503+tuxmaster5000@users.noreply.github.com>
Date: Fri, 12 Oct 2018 15:56:26 +0200
Subject: [PATCH] Fix include file
---
test/testnextcloudpropagator.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp
index 6ad1a6b37..dc2e476ad 100644
--- a/test/testnextcloudpropagator.cpp
+++ b/test/testnextcloudpropagator.cpp
@@ -8,7 +8,7 @@
#include <QDebug>
#include "propagatedownload.h"
-#include "nextcloudpropagator_p.h"
+#include "owncloudpropagator_p.h"
using namespace OCC;
namespace OCC {
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment