aboutsummaryrefslogtreecommitdiffstats
path: root/community/nextcloud-client
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-10-19 17:58:15 +0200
committerRasmus Thomsen <oss@cogitri.dev>2019-10-20 18:28:19 +0200
commitc7eac975226151d7336b9f083cdb4542800adffe (patch)
treedb962df9e6926801264b6522b1996fd5c1d11a01 /community/nextcloud-client
parentb3553abc60cd45495f8a252a5a06ca25c6749952 (diff)
downloadaports-c7eac975226151d7336b9f083cdb4542800adffe.tar.bz2
aports-c7eac975226151d7336b9f083cdb4542800adffe.tar.xz
community/nextcloud-client: use QtWebEngine again now that it works
Diffstat (limited to 'community/nextcloud-client')
-rw-r--r--community/nextcloud-client/APKBUILD10
-rw-r--r--community/nextcloud-client/remove-qtwebengine.patch312
2 files changed, 4 insertions, 318 deletions
diff --git a/community/nextcloud-client/APKBUILD b/community/nextcloud-client/APKBUILD
index 94ea77469d..92b85ad72c 100644
--- a/community/nextcloud-client/APKBUILD
+++ b/community/nextcloud-client/APKBUILD
@@ -2,17 +2,16 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=nextcloud-client
pkgver=2.6.0_p1
-pkgrel=1
+pkgrel=2
pkgdesc="Nextcloud Desktop Client"
url="https://github.com/nextcloud/desktop"
arch="all"
license="GPL-2.0-only"
makedepends="$depends_dev cmake doxygen qt5-qttools-dev qt5-qtkeychain-dev
- graphviz extra-cmake-modules kio-dev"
+ graphviz extra-cmake-modules kio-dev qt5-qtwebengine-dev"
subpackages="$pkgname-dev $pkgname-dolphin"
options="!check" # no testsuite
-source="$pkgname-$pkgver.tar.gz::https://github.com/nextcloud/desktop/archive/v${pkgver/_p/-fix}.tar.gz
- remove-qtwebengine.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/nextcloud/desktop/archive/v${pkgver/_p/-fix}.tar.gz"
builddir="$srcdir/desktop-${pkgver/_p/-fix}"
build() {
@@ -41,5 +40,4 @@ dolphin() {
mv "$pkgdir"/usr/share/kservices5 "$subpkgdir"/usr/share/
}
-sha512sums="be02ba30e927ab8e025684b602493e549a01ba0f49b66c6a9df98f9627f7fa40ea4c3bc15aa0e057769653478f9b7b222cbe2de52d46f71c611d07912a399c55 nextcloud-client-2.6.0_p1.tar.gz
-c45945cea087d6651078edc0d6315d8fa5c5229afbda2fb3a6f934e66c021d94d835bb9c07e0a1066dd6e89fabbb34b566acba5841e460a480e8a45bd7c687cf remove-qtwebengine.patch"
+sha512sums="be02ba30e927ab8e025684b602493e549a01ba0f49b66c6a9df98f9627f7fa40ea4c3bc15aa0e057769653478f9b7b222cbe2de52d46f71c611d07912a399c55 nextcloud-client-2.6.0_p1.tar.gz"
diff --git a/community/nextcloud-client/remove-qtwebengine.patch b/community/nextcloud-client/remove-qtwebengine.patch
deleted file mode 100644
index 09133a1eb6..0000000000
--- a/community/nextcloud-client/remove-qtwebengine.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e14c97e..f6c4180 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,7 +4,7 @@ endif()
-
- set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
-
--find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-+find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent REQUIRED)
- if (Qt5Core_VERSION VERSION_LESS 5.9.0)
- message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
- endif()
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index e806beb..e56a811 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -39,11 +39,8 @@ set(client_UI_SRCS
- wizard/owncloudconnectionmethoddialog.ui
- wizard/owncloudhttpcredspage.ui
- wizard/owncloudoauthcredspage.ui
-- wizard/flow2authcredspage.ui
-- wizard/flow2authwidget.ui
- wizard/owncloudsetupnocredspage.ui
- wizard/owncloudwizardresultpage.ui
-- wizard/webview.ui
- )
-
- set(client_SRCS
-@@ -107,23 +104,16 @@ set(client_SRCS
- creds/credentialsfactory.cpp
- creds/httpcredentialsgui.cpp
- creds/oauth.cpp
-- creds/flow2auth.cpp
-- creds/webflowcredentials.cpp
-- creds/webflowcredentialsdialog.cpp
- wizard/postfixlineedit.cpp
- wizard/abstractcredswizardpage.cpp
- wizard/owncloudadvancedsetuppage.cpp
- 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
-- wizard/webviewpage.cpp
-- wizard/webview.cpp
- wizard/slideshow.cpp
- )
-
-@@ -306,7 +296,7 @@ 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)
- target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
- set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
-index ca00a4e..25e6a8b 100644
---- a/src/gui/accountmanager.cpp
-+++ b/src/gui/accountmanager.cpp
-@@ -253,20 +253,6 @@ 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);
-- }
-- }
--
- qCInfo(lcAccountManager) << "Account for" << acc->url() << "using auth type" << authType;
-
- acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
-diff --git a/src/gui/creds/credentialsfactory.cpp b/src/gui/creds/credentialsfactory.cpp
-index 6062f70..52e003b 100644
---- a/src/gui/creds/credentialsfactory.cpp
-+++ b/src/gui/creds/credentialsfactory.cpp
-@@ -21,7 +21,6 @@
- #ifndef NO_SHIBBOLETH
- #include "creds/shibbolethcredentials.h"
- #endif
--#include "creds/webflowcredentials.h"
-
- namespace OCC {
-
-@@ -40,8 +39,6 @@ namespace CredentialsFactory {
- } else if (type == "shibboleth") {
- return new ShibbolethCredentials;
- #endif
-- } else if (type == "webflow") {
-- return new WebFlowCredentials;
- } else {
- qCWarning(lcGuiCredentials, "Unknown credentials type: %s", qPrintable(type));
- return new DummyCredentials;
-diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
-index 3d20344..5785cad 100644
---- a/src/gui/owncloudsetupwizard.cpp
-+++ b/src/gui/owncloudsetupwizard.cpp
-@@ -408,7 +408,7 @@ void OwncloudSetupWizard::slotAuthError()
- }
-
- _ocWizard->show();
-- if (_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds || _ocWizard->currentId() == WizardCommon::Page_OAuthCreds || _ocWizard->currentId() == WizardCommon::Page_Flow2AuthCreds) {
-+ if (_ocWizard->currentId() == WizardCommon::Page_ShibbolethCreds || _ocWizard->currentId() == WizardCommon::Page_OAuthCreds) {
- _ocWizard->back();
- }
- _ocWizard->displayError(errorMsg, _ocWizard->currentId() == WizardCommon::Page_ServerSetup && checkDowngradeAdvised(reply));
-diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
-index 3a956b0..8b32b5b 100644
---- a/src/gui/wizard/owncloudsetuppage.cpp
-+++ b/src/gui/wizard/owncloudsetuppage.cpp
-@@ -143,7 +143,7 @@ void OwncloudSetupPage::slotLogin()
- void OwncloudSetupPage::slotGotoProviderList()
- {
- _ocWizard->setRegistration(true);
-- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
-+ _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::OAuth);
- _authTypeKnown = true;
- _checking = false;
- emit completeChanged();
-@@ -258,12 +258,8 @@ int OwncloudSetupPage::nextId() const
- return WizardCommon::Page_HttpCreds;
- case DetermineAuthTypeJob::OAuth:
- return WizardCommon::Page_OAuthCreds;
-- case DetermineAuthTypeJob::LoginFlowV2:
-- return WizardCommon::Page_Flow2AuthCreds;
- case DetermineAuthTypeJob::Shibboleth:
- return WizardCommon::Page_ShibbolethCreds;
-- case DetermineAuthTypeJob::WebViewFlow:
-- return WizardCommon::Page_WebView;
- }
- return WizardCommon::Page_HttpCreds;
- }
-diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
-index e4dda0f..370302c 100644
---- a/src/gui/wizard/owncloudwizard.cpp
-+++ b/src/gui/wizard/owncloudwizard.cpp
-@@ -26,8 +26,6 @@
- #endif
- #include "wizard/owncloudadvancedsetuppage.h"
- #include "wizard/owncloudwizardresultpage.h"
--#include "wizard/webviewpage.h"
--#include "wizard/flow2authcredspage.h"
-
- #include "QProgressIndicator.h"
-
-@@ -46,14 +44,12 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
- , _setupPage(new OwncloudSetupPage(this))
- , _httpCredsPage(new OwncloudHttpCredsPage(this))
- , _browserCredsPage(new OwncloudOAuthCredsPage)
-- , _flow2CredsPage(new Flow2AuthCredsPage)
- #ifndef NO_SHIBBOLETH
- , _shibbolethCredsPage(new OwncloudShibbolethCredsPage)
- #endif
- , _advancedSetupPage(new OwncloudAdvancedSetupPage)
- , _resultPage(new OwncloudWizardResultPage)
- , _credentialsPage(nullptr)
-- , _webViewPage(new WebViewPage(this))
- , _setupLog()
- , _registration(false)
- {
-@@ -61,13 +57,11 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
- setPage(WizardCommon::Page_ServerSetup, _setupPage);
- setPage(WizardCommon::Page_HttpCreds, _httpCredsPage);
- setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage);
-- setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
- #ifndef NO_SHIBBOLETH
- setPage(WizardCommon::Page_ShibbolethCreds, _shibbolethCredsPage);
- #endif
- setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
- setPage(WizardCommon::Page_Result, _resultPage);
-- setPage(WizardCommon::Page_WebView, _webViewPage);
-
- connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
-
-@@ -79,11 +73,9 @@ 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);
-- connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
- #ifndef NO_SHIBBOLETH
- connect(_shibbolethCredsPage, &OwncloudShibbolethCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
- #endif
-- connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
- connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
- this, &OwncloudWizard::createLocalAndRemoteFolders);
- connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
-@@ -168,20 +160,12 @@ void OwncloudWizard::successfulStep()
- _browserCredsPage->setConnected();
- break;
-
-- case WizardCommon::Page_Flow2AuthCreds:
-- _flow2CredsPage->setConnected();
-- break;
--
- #ifndef NO_SHIBBOLETH
- case WizardCommon::Page_ShibbolethCreds:
- _shibbolethCredsPage->setConnected();
- break;
- #endif
-
-- case WizardCommon::Page_WebView:
-- _webViewPage->setConnected();
-- break;
--
- case WizardCommon::Page_AdvancedSetup:
- _advancedSetupPage->directoriesCreated();
- break;
-@@ -205,10 +189,6 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob::AuthType type)
- #endif
- if (type == DetermineAuthTypeJob::OAuth) {
- _credentialsPage = _browserCredsPage;
-- } else if (type == DetermineAuthTypeJob::LoginFlowV2) {
-- _credentialsPage = _flow2CredsPage;
-- } else if (type == DetermineAuthTypeJob::WebViewFlow) {
-- _credentialsPage = _webViewPage;
- } else { // try Basic auth even for "Unknown"
- _credentialsPage = _httpCredsPage;
- }
-@@ -233,7 +213,7 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
- }
-
- setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
-- if (id == WizardCommon::Page_AdvancedSetup && (_credentialsPage == _browserCredsPage || _credentialsPage == _flow2CredsPage)) {
-+ if (id == WizardCommon::Page_AdvancedSetup) {
- // 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 c1d290d..1e32077 100644
---- a/src/gui/wizard/owncloudwizard.h
-+++ b/src/gui/wizard/owncloudwizard.h
-@@ -39,8 +39,6 @@ class OwncloudAdvancedSetupPage;
- class OwncloudWizardResultPage;
- class AbstractCredentials;
- class AbstractCredentialsWizardPage;
--class WebViewPage;
--class Flow2AuthCredsPage;
-
- /**
- * @brief The OwncloudWizard class
-@@ -105,11 +103,9 @@ private:
- #ifndef NO_SHIBBOLETH
- OwncloudShibbolethCredsPage *_shibbolethCredsPage;
- #endif
-- Flow2AuthCredsPage *_flow2CredsPage;
- OwncloudAdvancedSetupPage *_advancedSetupPage;
- OwncloudWizardResultPage *_resultPage;
- AbstractCredentialsWizardPage *_credentialsPage;
-- WebViewPage *_webViewPage;
-
- QStringList _setupLog;
-
-diff --git a/src/gui/wizard/owncloudwizardcommon.h b/src/gui/wizard/owncloudwizardcommon.h
-index d1f7c08..c55ed04 100644
---- a/src/gui/wizard/owncloudwizardcommon.h
-+++ b/src/gui/wizard/owncloudwizardcommon.h
-@@ -38,8 +38,6 @@ namespace WizardCommon {
- Page_HttpCreds,
- Page_ShibbolethCreds,
- Page_OAuthCreds,
-- Page_Flow2AuthCreds,
-- Page_WebView,
- Page_AdvancedSetup,
- Page_Result
- };
-diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
-index c178895..eab4723 100644
---- a/src/libsync/networkjobs.cpp
-+++ b/src/libsync/networkjobs.cpp
-@@ -922,12 +922,12 @@ void DetermineAuthTypeJob::checkBothDone()
-
- // WebViewFlow > OAuth > Shib > Basic
- if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
-- result = WebViewFlow;
-+ result = Basic;
- }
-
- // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
- if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
-- result = LoginFlowV2;
-+ result = Basic;
- }
-
- qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
-diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h
-index d0829b4..925ace0 100644
---- a/src/libsync/networkjobs.h
-+++ b/src/libsync/networkjobs.h
-@@ -412,8 +412,6 @@ public:
- Basic, // also the catch-all fallback for backwards compatibility reasons
- OAuth,
- Shibboleth,
-- WebViewFlow,
-- LoginFlowV2
- };
-
- explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr);