Hi.
Update for nextcloudclient v3.1.0.
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.1.0
--
Adriano Barbosa
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 31 Oct 2020 06:42:58 -0000 1.11
+++ Makefile 14 Dec 2020 15:04:54 -0000
@@ -2,7 +2,7 @@
COMMENT = desktop sync client for Nextcloud
-V = 3.0.3
+V = 3.1.0
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
@@ -25,6 +25,7 @@ WANTLIB += ${COMPILER_LIBCXX} Qt5Concurr
WANTLIB += Qt5Network Qt5Qml Qt5Quick Qt5QuickControls2 Qt5Svg
WANTLIB += Qt5Widgets Qt5Xml c crypto m qt5keychain sqlite3 ssl
WANTLIB += z lib/inotify/inotify
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl secret-1
MODULES = devel/cmake \
x11/qt5
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 31 Oct 2020 06:42:58 -0000 1.9
+++ distinfo 14 Dec 2020 15:04:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.0.3.tar.gz) = q9Ah/wbssmciGiIdv4tO/TvY5BgFPMSba2+qKQcXxtg=
-SIZE (nextcloudclient-3.0.3.tar.gz) = 19202718
+SHA256 (nextcloudclient-3.1.0.tar.gz) = EbigPdtPjGDs/81zjNzV1nOPkmhoCdofgevv+XqZ4xQ=
+SIZE (nextcloudclient-3.1.0.tar.gz) = 19265221
Index: patches/patch-src_csync_std_c_private_h
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_csync_std_c_private_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_csync_std_c_private_h
--- patches/patch-src_csync_std_c_private_h 16 Nov 2019 10:27:43 -0000 1.1.1.1
+++ patches/patch-src_csync_std_c_private_h 14 Dec 2020 15:04:54 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_csync_std_c_private_
Index: src/csync/std/c_private.h
--- src/csync/std/c_private.h.orig
+++ src/csync/std/c_private.h
-@@ -156,7 +156,7 @@ typedef char mbchar_t;
+@@ -156,7 +156,7 @@ typedef char mbchar_t; // NOLINT this is som
#endif
/* FIXME: Implement TLS for OS X */
Index: patches/patch-src_gui_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_gui_CMakeLists_txt
--- patches/patch-src_gui_CMakeLists_txt 27 Aug 2020 18:19:09 -0000 1.4
+++ patches/patch-src_gui_CMakeLists_txt 14 Dec 2020 15:04:54 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-src_gui_CMakeLists_txt,v
Index: src/gui/CMakeLists.txt
--- src/gui/CMakeLists.txt.orig
+++ src/gui/CMakeLists.txt
-@@ -40,14 +40,12 @@ set(client_UI_SRCS
- mnemonicdialog.ui
+@@ -46,14 +46,12 @@ set(client_UI_SRCS
+ tray/ActivityActionButton.qml
tray/Window.qml
tray/UserLine.qml
- wizard/flow2authwidget.ui
@@ -18,7 +18,7 @@ Index: src/gui/CMakeLists.txt
)
set(client_SRCS
-@@ -111,23 +109,16 @@ set(client_SRCS
+@@ -119,23 +117,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
)
-@@ -314,7 +305,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPE
+@@ -328,7 +319,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::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} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate 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_accountmanager_cpp
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_accountmanager_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_gui_accountmanager_cpp
--- patches/patch-src_gui_accountmanager_cpp 16 Nov 2019 10:27:43 -0000 1.1.1.1
+++ patches/patch-src_gui_accountmanager_cpp 14 Dec 2020 15:04:54 -0000
@@ -12,7 +12,7 @@ Index: src/gui/accountmanager.cpp
- authType = "webflow";
- settings.setValue(QLatin1String(authTypeC), authType);
-
-- foreach(QString key, settings.childKeys()) {
+- for (const QString &key : settings.childKeys()) {
- if (!key.startsWith("http_"))
- continue;
- auto newkey = QString::fromLatin1("webflow_").append(key.mid(5));
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.4
diff -u -p -r1.4 patch-src_gui_wizard_owncloudsetuppage_cpp
--- patches/patch-src_gui_wizard_owncloudsetuppage_cpp 4 Oct 2020 15:48:32 -0000 1.4
+++ patches/patch-src_gui_wizard_owncloudsetuppage_cpp 14 Dec 2020 15:04:54 -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
-@@ -139,7 +139,7 @@ void OwncloudSetupPage::slotLogin()
+@@ -148,7 +148,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();
-@@ -258,12 +258,8 @@ int OwncloudSetupPage::nextId() const
+@@ -268,12 +268,8 @@ int OwncloudSetupPage::nextId() const
return WizardCommon::Page_HttpCreds;
case DetermineAuthTypeJob::OAuth:
return WizardCommon::Page_OAuthCreds;
Index: patches/patch-src_libsync_networkjobs_cpp
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_libsync_networkjobs_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_libsync_networkjobs_cpp
--- patches/patch-src_libsync_networkjobs_cpp 27 Aug 2020 18:19:09 -0000 1.4
+++ patches/patch-src_libsync_networkjobs_cpp 14 Dec 2020 15:04:54 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_libsync_networkjobs_
Index: src/libsync/networkjobs.cpp
--- src/libsync/networkjobs.cpp.orig
+++ src/libsync/networkjobs.cpp
-@@ -932,7 +932,7 @@ void DetermineAuthTypeJob::start()
+@@ -929,7 +929,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");
-@@ -940,7 +940,7 @@ void DetermineAuthTypeJob::start()
+@@ -937,7 +937,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
}
}
}
-@@ -966,17 +966,12 @@ void DetermineAuthTypeJob::checkAllDone()
+@@ -963,17 +963,12 @@ void DetermineAuthTypeJob::checkAllDone()
// WebViewFlow > OAuth > Shib > Basic
if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
