Thanks Stuart and Landry for the help.
Corrected diff attached.
Em seg., 24 de ago. de 2020 às 09:47, Adriano Barbosa
<barbosa....@gmail.com> escreveu:
>
> The diff does not include the deleted (and unnecessary) patches. What’s the
> proper way to submit it? Could not find it on faq/doc yet (still looking
> for).
>
> Sorry for the mistake and thanks in advance.
>
> Em seg, 24 de ago de 2020 às 07:58, Adriano Barbosa <barbosa....@gmail.com>
> escreveu:
>>
>> Hi,
>>
>> update for nextcloudclient v3.0.0.
>>
>> Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.0.0
>>
>>
>>
>> OK?
>>
>>
>>
>> --
>>
>> Adriano Barbosa
>>
> --
> Adriano Barbosa
> Sent from my phone. Sorry for typos.
--
Adriano Barbosa
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 12 Jul 2020 07:02:35 -0000 1.7
+++ Makefile 24 Aug 2020 13:57:13 -0000
@@ -2,7 +2,7 @@
COMMENT = desktop sync client for Nextcloud
-V = 2.6.5
+V = 3.0.0
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
@@ -24,6 +24,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
WANTLIB += Qt5Network Qt5Widgets Qt5Xml c crypto m qt5keychain
WANTLIB += sqlite3 ssl z lib/inotify/inotify
+WANTLIB += Qt5Svg Qt5Quick Qt5QuickControls2
MODULES = devel/cmake \
x11/qt5
@@ -38,7 +39,9 @@ RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = databases/sqlite3 \
devel/libinotify \
- security/qtkeychain
+ security/qtkeychain \
+ x11/qt5/qtsvg \
+ x11/qt5/qtquickcontrols2
CONFIGURE_ARGS = -DBUILD_SHELL_INTEGRATION_NAUTILUS=OFF \
-DBUILD_SHELL_INTEGRATION_DOLPHIN=OFF \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 12 Jul 2020 07:02:35 -0000 1.5
+++ distinfo 24 Aug 2020 13:57:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-2.6.5.tar.gz) = k1OF/wcXSk2FwtTtpNBprrSqjQ5ohlss+KJMqMyIMog=
-SIZE (nextcloudclient-2.6.5.tar.gz) = 19134736
+SHA256 (nextcloudclient-3.0.0.tar.gz) = +Zv0Z8W7S2U11B8YZ0P3v8ezdqxYT4n+o+FSDSrq1/c=
+SIZE (nextcloudclient-3.0.0.tar.gz) = 19060293
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 12 Jul 2020 07:02:35 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2020/07/12 07:02:35 rsadowski Exp $
-
-- Drop Git
-- Stop searching for PdfLatex and disable docs
-- Remove APPLICATION_SHORTNAME from install path to avoid upper-case names
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -61,10 +61,6 @@ include(GNUInstallDirs)
- include(DefineInstallationPaths)
- include(GenerateExportHeader)
-
--include(GetGitRevisionDescription)
--
--get_git_head_revision(GIT_REFSPEC GIT_SHA1)
--
- add_definitions(
- -DQT_USE_QSTRINGBUILDER
- -DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
-@@ -191,7 +187,7 @@ if(BUILD_CLIENT)
- find_package(INotify)
- endif()
- find_package(Sphinx)
-- find_package(PdfLatex)
-+ #find_package(PdfLatex)
- find_package(OpenSSL 1.1 REQUIRED )
-
- find_package(ZLIB REQUIRED)
-@@ -238,8 +234,8 @@ if(BUILD_CLIENT)
- add_subdirectory(src)
- if(NOT BUILD_LIBRARIES_ONLY)
- add_subdirectory(man)
-- add_subdirectory(doc)
-- add_subdirectory(doc/dev)
-+ #add_subdirectory(doc)
-+ #add_subdirectory(doc/dev)
- if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
- add_subdirectory(admin)
- endif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 16 Nov 2019 10:27:43 -0000 1.1.1.1
+++ patches/patch-src_CMakeLists_txt 24 Aug 2020 13:57:13 -0000
@@ -7,8 +7,8 @@ Index: src/CMakeLists.txt
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()
+-find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
++find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
+
+ if(NOT TOKEN_AUTH_ONLY)
+ find_package(Qt5Keychain REQUIRED)
Index: patches/patch-src_gui_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_gui_CMakeLists_txt
--- patches/patch-src_gui_CMakeLists_txt 12 Jul 2020 07:02:35 -0000 1.3
+++ patches/patch-src_gui_CMakeLists_txt 24 Aug 2020 13:57:13 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-src_gui_CMakeLists_txt,v
Index: src/gui/CMakeLists.txt
--- src/gui/CMakeLists.txt.orig
+++ src/gui/CMakeLists.txt
-@@ -38,14 +38,12 @@ set(client_UI_SRCS
- addcertificatedialog.ui
- proxyauthdialog.ui
+@@ -40,14 +40,12 @@ set(client_UI_SRCS
mnemonicdialog.ui
+ tray/Window.qml
+ tray/UserLine.qml
- wizard/flow2authwidget.ui
wizard/owncloudadvancedsetuppage.ui
wizard/owncloudconnectionmethoddialog.ui
@@ -18,7 +18,7 @@ Index: src/gui/CMakeLists.txt
)
set(client_SRCS
-@@ -110,23 +108,16 @@ set(client_SRCS
+@@ -111,23 +109,16 @@ set(client_SRCS
creds/credentialsfactory.cpp
creds/httpcredentialsgui.cpp
creds/oauth.cpp
@@ -42,12 +42,12 @@ Index: src/gui/CMakeLists.txt
wizard/slideshow.cpp
)
-@@ -313,7 +304,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPE
+@@ -314,7 +305,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPE
set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
--target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
-+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml)
+-target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
IF(BUILD_UPDATER)
target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
Index: patches/patch-src_gui_application_cpp
===================================================================
RCS file: patches/patch-src_gui_application_cpp
diff -N patches/patch-src_gui_application_cpp
--- patches/patch-src_gui_application_cpp 12 Jul 2020 07:02:35 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_gui_application_cpp,v 1.3 2020/07/12 07:02:35 rsadowski Exp $
-
-Index: src/gui/application.cpp
---- src/gui/application.cpp.orig
-+++ src/gui/application.cpp
-@@ -260,15 +260,6 @@ Application::Application(int &argc, char **argv)
- connect(&_networkConfigurationManager, &QNetworkConfigurationManager::configurationChanged,
- this, &Application::slotSystemOnlineConfigurationChanged);
-
--#if defined(BUILD_UPDATER)
-- // Update checks
-- UpdaterScheduler *updaterScheduler = new UpdaterScheduler(this);
-- connect(updaterScheduler, &UpdaterScheduler::updaterAnnouncement,
-- _gui.data(), &ownCloudGui::slotShowTrayMessage);
-- connect(updaterScheduler, &UpdaterScheduler::requestRestart,
-- _folderManager.data(), &FolderMan::slotScheduleAppRestart);
--#endif
--
- // 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.2
diff -u -p -u -p -r1.2 patch-src_gui_wizard_owncloudsetuppage_cpp
--- patches/patch-src_gui_wizard_owncloudsetuppage_cpp 28 Dec 2019 13:48:04 -0000 1.2
+++ patches/patch-src_gui_wizard_owncloudsetuppage_cpp 24 Aug 2020 13:57:13 -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
-@@ -144,7 +144,7 @@ void OwncloudSetupPage::slotLogin()
+@@ -139,7 +139,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();
-@@ -259,12 +259,8 @@ int OwncloudSetupPage::nextId() const
+@@ -254,12 +254,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.2
diff -u -p -u -p -r1.2 patch-src_gui_wizard_owncloudwizard_cpp
--- patches/patch-src_gui_wizard_owncloudwizard_cpp 28 Dec 2019 13:48:04 -0000 1.2
+++ patches/patch-src_gui_wizard_owncloudwizard_cpp 24 Aug 2020 13:57:13 -0000
@@ -12,22 +12,16 @@ Index: src/gui/wizard/owncloudwizard.cpp
#include "QProgressIndicator.h"
-@@ -47,14 +45,12 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
- , _setupPage(new OwncloudSetupPage(this))
- , _httpCredsPage(new OwncloudHttpCredsPage(this))
- , _browserCredsPage(new OwncloudOAuthCredsPage)
-- , _flow2CredsPage(new Flow2AuthCredsPage)
+@@ -50,22 +48,18 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
#ifndef NO_SHIBBOLETH
, _shibbolethCredsPage(new OwncloudShibbolethCredsPage)
#endif
+- , _flow2CredsPage(new Flow2AuthCredsPage)
, _advancedSetupPage(new OwncloudAdvancedSetupPage)
, _resultPage(new OwncloudWizardResultPage)
- , _credentialsPage(nullptr)
- , _webViewPage(new WebViewPage(this))
- , _setupLog()
- , _registration(false)
{
-@@ -62,13 +58,11 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
+ setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setPage(WizardCommon::Page_ServerSetup, _setupPage);
setPage(WizardCommon::Page_HttpCreds, _httpCredsPage);
setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage);
@@ -41,7 +35,7 @@ Index: src/gui/wizard/owncloudwizard.cpp
connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
-@@ -80,11 +74,9 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
+@@ -77,11 +71,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 +47,7 @@ Index: src/gui/wizard/owncloudwizard.cpp
connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
this, &OwncloudWizard::createLocalAndRemoteFolders);
connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
-@@ -106,12 +98,8 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
+@@ -103,12 +95,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);
@@ -66,7 +60,7 @@ Index: src/gui/wizard/owncloudwizard.cpp
}
void OwncloudWizard::setAccount(AccountPtr account)
-@@ -180,20 +168,12 @@ void OwncloudWizard::successfulStep()
+@@ -177,20 +165,12 @@ void OwncloudWizard::successfulStep()
_browserCredsPage->setConnected();
break;
@@ -87,7 +81,7 @@ Index: src/gui/wizard/owncloudwizard.cpp
case WizardCommon::Page_AdvancedSetup:
_advancedSetupPage->directoriesCreated();
break;
-@@ -217,10 +197,6 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob:
+@@ -214,10 +194,6 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob:
#endif
if (type == DetermineAuthTypeJob::OAuth) {
_credentialsPage = _browserCredsPage;
@@ -98,7 +92,7 @@ Index: src/gui/wizard/owncloudwizard.cpp
} else { // try Basic auth even for "Unknown"
_credentialsPage = _httpCredsPage;
}
-@@ -245,7 +221,7 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
+@@ -242,7 +218,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.2
diff -u -p -u -p -r1.2 patch-src_gui_wizard_owncloudwizard_h
--- patches/patch-src_gui_wizard_owncloudwizard_h 28 Dec 2019 13:48:04 -0000 1.2
+++ patches/patch-src_gui_wizard_owncloudwizard_h 24 Aug 2020 13:57:13 -0000
@@ -19,7 +19,7 @@ Index: src/gui/wizard/owncloudwizard.h
- Flow2AuthCredsPage *_flow2CredsPage;
OwncloudAdvancedSetupPage *_advancedSetupPage;
OwncloudWizardResultPage *_resultPage;
- AbstractCredentialsWizardPage *_credentialsPage;
+ AbstractCredentialsWizardPage *_credentialsPage = nullptr;
- WebViewPage *_webViewPage;
QStringList _setupLog;
Index: patches/patch-src_libsync_networkjobs_cpp
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_libsync_networkjobs_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_libsync_networkjobs_cpp
--- patches/patch-src_libsync_networkjobs_cpp 12 Jul 2020 07:02:35 -0000 1.3
+++ patches/patch-src_libsync_networkjobs_cpp 24 Aug 2020 13:57:13 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_libsync_networkjobs_
Index: src/libsync/networkjobs.cpp
--- src/libsync/networkjobs.cpp.orig
+++ src/libsync/networkjobs.cpp
-@@ -922,7 +922,7 @@ void DetermineAuthTypeJob::start()
+@@ -932,7 +932,7 @@ void DetermineAuthTypeJob::start()
});
connect(oldFlowRequired, &JsonApiJob::jsonReceived, this, [this](const QJsonDocument &json, int statusCode) {
if (statusCode == 200) {
@@ -12,7 +12,7 @@ Index: src/libsync/networkjobs.cpp
auto data = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
auto gs = data.value("globalscale");
-@@ -930,7 +930,7 @@ void DetermineAuthTypeJob::start()
+@@ -940,7 +940,7 @@ void DetermineAuthTypeJob::start()
auto flow = gs.toObject().value("desktoplogin");
if (flow != QJsonValue::Undefined) {
if (flow.toInt() == 1) {
@@ -21,7 +21,7 @@ Index: src/libsync/networkjobs.cpp
}
}
}
-@@ -956,17 +956,12 @@ void DetermineAuthTypeJob::checkAllDone()
+@@ -966,17 +966,12 @@ void DetermineAuthTypeJob::checkAllDone()
// WebViewFlow > OAuth > Shib > Basic
if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
Index: patches/patch-src_libsync_networkjobs_h
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_libsync_networkjobs_h,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_libsync_networkjobs_h
--- patches/patch-src_libsync_networkjobs_h 16 Nov 2019 10:27:43 -0000 1.1.1.1
+++ patches/patch-src_libsync_networkjobs_h 24 Aug 2020 13:57:13 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_libsync_networkjobs_
Index: src/libsync/networkjobs.h
--- src/libsync/networkjobs.h.orig
+++ src/libsync/networkjobs.h
-@@ -412,8 +412,6 @@ class OWNCLOUDSYNC_EXPORT DetermineAuthTypeJob : publi
+@@ -425,8 +425,6 @@ class OWNCLOUDSYNC_EXPORT DetermineAuthTypeJob : publi
Basic, // also the catch-all fallback for backwards compatibility reasons
OAuth,
Shibboleth,
Index: patches/patch-test_testnextcloudpropagator_cpp
===================================================================
RCS file: patches/patch-test_testnextcloudpropagator_cpp
diff -N patches/patch-test_testnextcloudpropagator_cpp
--- patches/patch-test_testnextcloudpropagator_cpp 16 Nov 2019 10:27:43 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-test_testnextcloudpropagator_cpp,v 1.1.1.1 2019/11/16 10:27:43 rsadowski Exp $
-
-Fix build from archlinux
-
-Index: test/testnextcloudpropagator.cpp
---- test/testnextcloudpropagator.cpp.orig
-+++ 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 {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 12 Jul 2020 07:02:35 -0000 1.4
+++ pkg/PLIST 24 Aug 2020 13:57:13 -0000
@@ -37,6 +37,7 @@ share/nextcloud/i18n/
share/nextcloud/i18n/client_TW.qm
share/nextcloud/i18n/client_af.qm
share/nextcloud/i18n/client_bg.qm
+share/nextcloud/i18n/client_br.qm
share/nextcloud/i18n/client_ca.qm
share/nextcloud/i18n/client_cs.qm
share/nextcloud/i18n/client_da.qm
