Hi, this diff updates nextcloudclient to version 2.6.2 https://github.com/nextcloud/desktop/releases
ok? feedback? -- Adriano Barbosa
Index: Makefile =================================================================== RCS file: /cvs/ports/net/nextcloudclient/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 17 Nov 2019 06:59:30 -0000 1.2 +++ Makefile 25 Dec 2019 12:35:26 -0000 @@ -2,7 +2,7 @@ COMMENT = desktop sync client for Nextcloud -V = 2.6.1 +V = 2.6.2 DISTNAME = nextcloudclient-${V} GH_ACCOUNT = nextcloud Index: distinfo =================================================================== RCS file: /cvs/ports/net/nextcloudclient/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ distinfo 25 Dec 2019 12:35:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (nextcloudclient-2.6.1.tar.gz) = gvWR3citbDn0jprBbnMgybU0Lt43g4vYnhl3ZV8kguo= -SIZE (nextcloudclient-2.6.1.tar.gz) = 18947504 +SHA256 (nextcloudclient-2.6.2.tar.gz) = u8tlkxNINiJmQLEI2nrT2wYUF2geLYQ7w3Gx1pf7BVE= +SIZE (nextcloudclient-2.6.2.tar.gz) = 18982053 Index: patches/patch-src_gui_CMakeLists_txt =================================================================== RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_gui_CMakeLists_txt --- patches/patch-src_gui_CMakeLists_txt 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ patches/patch-src_gui_CMakeLists_txt 25 Dec 2019 12:35:26 -0000 @@ -3,23 +3,27 @@ $OpenBSD: patch-src_gui_CMakeLists_txt,v Index: src/gui/CMakeLists.txt --- src/gui/CMakeLists.txt.orig +++ src/gui/CMakeLists.txt -@@ -39,11 +39,8 @@ set(client_UI_SRCS +@@ -35,14 +35,12 @@ set(client_UI_SRCS + addcertificatedialog.ui + proxyauthdialog.ui + mnemonicdialog.ui +- wizard/flow2authwidget.ui + wizard/owncloudadvancedsetuppage.ui 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 -@@ -108,23 +105,16 @@ set(client_SRCS +@@ -108,24 +106,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 @@ -39,7 +43,7 @@ Index: src/gui/CMakeLists.txt wizard/slideshow.cpp ) -@@ -310,7 +300,7 @@ else() +@@ -298,7 +289,7 @@ else() endif() add_library(updater STATIC ${updater_SRCS}) Index: patches/patch-src_gui_application_cpp =================================================================== RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_application_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_gui_application_cpp --- patches/patch-src_gui_application_cpp 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ patches/patch-src_gui_application_cpp 25 Dec 2019 12:35:26 -0000 @@ -16,4 +16,4 @@ Index: src/gui/application.cpp - // Cleanup at Quit. connect(this, &QCoreApplication::aboutToQuit, this, &Application::slotCleanup); - } + Index: patches/patch-src_gui_wizard_owncloudsetuppage_cpp =================================================================== RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_wizard_owncloudsetuppage_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_gui_wizard_owncloudsetuppage_cpp --- patches/patch-src_gui_wizard_owncloudsetuppage_cpp 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ patches/patch-src_gui_wizard_owncloudsetuppage_cpp 25 Dec 2019 12:35:26 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-src_gui_wizard_ownclouds Index: src/gui/wizard/owncloudsetuppage.cpp --- src/gui/wizard/owncloudsetuppage.cpp.orig +++ src/gui/wizard/owncloudsetuppage.cpp -@@ -158,7 +158,7 @@ void OwncloudSetupPage::slotLogin() +@@ -144,7 +144,7 @@ void OwncloudSetupPage::slotLogin() void OwncloudSetupPage::slotGotoProviderList() { _ocWizard->setRegistration(true); @@ -12,7 +12,7 @@ Index: src/gui/wizard/owncloudsetuppage. _authTypeKnown = true; _checking = false; emit completeChanged(); -@@ -273,12 +273,8 @@ int OwncloudSetupPage::nextId() const +@@ -259,12 +259,8 @@ int OwncloudSetupPage::nextId() const return WizardCommon::Page_HttpCreds; case DetermineAuthTypeJob::OAuth: return WizardCommon::Page_OAuthCreds; Index: patches/patch-src_gui_wizard_owncloudwizard_cpp =================================================================== RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_wizard_owncloudwizard_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_gui_wizard_owncloudwizard_cpp --- patches/patch-src_gui_wizard_owncloudwizard_cpp 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ patches/patch-src_gui_wizard_owncloudwizard_cpp 25 Dec 2019 12:35:26 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-src_gui_wizard_owncloudw Index: src/gui/wizard/owncloudwizard.cpp --- src/gui/wizard/owncloudwizard.cpp.orig +++ src/gui/wizard/owncloudwizard.cpp -@@ -26,8 +26,6 @@ +@@ -27,8 +27,6 @@ #endif #include "wizard/owncloudadvancedsetuppage.h" #include "wizard/owncloudwizardresultpage.h" @@ -12,7 +12,7 @@ Index: src/gui/wizard/owncloudwizard.cpp #include "QProgressIndicator.h" -@@ -46,14 +44,12 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) +@@ -47,14 +45,12 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) , _setupPage(new OwncloudSetupPage(this)) , _httpCredsPage(new OwncloudHttpCredsPage(this)) , _browserCredsPage(new OwncloudOAuthCredsPage) @@ -27,7 +27,7 @@ Index: src/gui/wizard/owncloudwizard.cpp , _setupLog() , _registration(false) { -@@ -61,13 +57,11 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) +@@ -62,13 +58,11 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) setPage(WizardCommon::Page_ServerSetup, _setupPage); setPage(WizardCommon::Page_HttpCreds, _httpCredsPage); setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage); @@ -41,7 +41,7 @@ Index: src/gui/wizard/owncloudwizard.cpp connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished); -@@ -79,11 +73,9 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) +@@ -80,11 +74,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); @@ -53,7 +53,20 @@ Index: src/gui/wizard/owncloudwizard.cpp connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders, this, &OwncloudWizard::createLocalAndRemoteFolders); connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration); -@@ -168,20 +160,12 @@ void OwncloudWizard::successfulStep() +@@ -106,12 +98,8 @@ 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); +- connect(this, &OwncloudWizard::styleChanged, _flow2CredsPage, &Flow2AuthCredsPage::slotStyleChanged); + + customizeStyle(); +- +- // allow Flow2 page to poll on window activation +- connect(this, &OwncloudWizard::onActivate, _flow2CredsPage, &Flow2AuthCredsPage::slotPollNow); + } + + void OwncloudWizard::setAccount(AccountPtr account) +@@ -180,20 +168,12 @@ void OwncloudWizard::successfulStep() _browserCredsPage->setConnected(); break; @@ -74,7 +87,7 @@ Index: src/gui/wizard/owncloudwizard.cpp case WizardCommon::Page_AdvancedSetup: _advancedSetupPage->directoriesCreated(); break; -@@ -205,10 +189,6 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob: +@@ -217,10 +197,6 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob: #endif if (type == DetermineAuthTypeJob::OAuth) { _credentialsPage = _browserCredsPage; @@ -85,7 +98,7 @@ Index: src/gui/wizard/owncloudwizard.cpp } else { // try Basic auth even for "Unknown" _credentialsPage = _httpCredsPage; } -@@ -233,7 +213,7 @@ void OwncloudWizard::slotCurrentPageChanged(int id) +@@ -245,7 +221,7 @@ void OwncloudWizard::slotCurrentPageChanged(int id) } setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup); Index: patches/patch-src_gui_wizard_owncloudwizard_h =================================================================== RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_wizard_owncloudwizard_h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_gui_wizard_owncloudwizard_h --- patches/patch-src_gui_wizard_owncloudwizard_h 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ patches/patch-src_gui_wizard_owncloudwizard_h 25 Dec 2019 12:35:26 -0000 @@ -12,7 +12,7 @@ Index: src/gui/wizard/owncloudwizard.h /** * @brief The OwncloudWizard class -@@ -105,11 +103,9 @@ signals: (private) +@@ -114,11 +112,9 @@ signals: (private) #ifndef NO_SHIBBOLETH OwncloudShibbolethCredsPage *_shibbolethCredsPage; #endif Index: patches/patch-src_libsync_networkjobs_cpp =================================================================== RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_libsync_networkjobs_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_libsync_networkjobs_cpp --- patches/patch-src_libsync_networkjobs_cpp 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ patches/patch-src_libsync_networkjobs_cpp 25 Dec 2019 12:35:26 -0000 @@ -3,7 +3,25 @@ $OpenBSD: patch-src_libsync_networkjobs_ Index: src/libsync/networkjobs.cpp --- src/libsync/networkjobs.cpp.orig +++ src/libsync/networkjobs.cpp -@@ -922,12 +922,12 @@ void DetermineAuthTypeJob::checkBothDone() +@@ -921,7 +921,7 @@ void DetermineAuthTypeJob::start() + }); + connect(oldFlowRequired, &JsonApiJob::jsonReceived, this, [this](const QJsonDocument &json, int statusCode) { + if (statusCode == 200) { +- _resultOldFlow = LoginFlowV2; ++ _resultOldFlow = Basic; + + auto data = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject(); + auto gs = data.value("globalscale"); +@@ -929,7 +929,7 @@ void DetermineAuthTypeJob::start() + auto flow = gs.toObject().value("desktoplogin"); + if (flow != QJsonValue::Undefined) { + if (flow.toInt() == 1) { +- _resultOldFlow = WebViewFlow; ++ _resultOldFlow = Basic; + } + } + } +@@ -955,17 +955,12 @@ void DetermineAuthTypeJob::checkAllDone() // WebViewFlow > OAuth > Shib > Basic if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) { @@ -14,6 +32,11 @@ Index: src/libsync/networkjobs.cpp // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) { - result = LoginFlowV2; +- } +- +- // If we determined that we need the webview flow (GS for example) then we switch to that +- if (_resultOldFlow == WebViewFlow) { +- result = WebViewFlow; + result = Basic; } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 16 Nov 2019 10:27:43 -0000 1.1.1.1 +++ pkg/PLIST 25 Dec 2019 12:35:26 -0000 @@ -68,6 +68,7 @@ share/nextcloud/i18n/client_id.qm share/nextcloud/i18n/client_is.qm share/nextcloud/i18n/client_it.qm share/nextcloud/i18n/client_ja.qm +share/nextcloud/i18n/client_ko.qm share/nextcloud/i18n/client_lt_LT.qm share/nextcloud/i18n/client_lv.qm share/nextcloud/i18n/client_nb_NO.qm