Hi.
Update for net/nextcloudclient v3.2.0.
Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.2.0
- Previous patches are not needed anymore as x11/qt5/qtwebengine is
now available (at least for amd64, aarch64 and i386);
- The remaining patches should be included in future releases:
https://github.com/nextcloud/desktop/issues/3080
https://github.com/nextcloud/desktop/pull/3059
Thank you for testing.
--
Adriano Barbosa
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 20 Feb 2021 06:57:51 -0000 1.15
+++ Makefile 14 Apr 2021 13:32:09 -0000
@@ -2,7 +2,7 @@
COMMENT = desktop sync client for Nextcloud
-V = 3.1.3
+V = 3.2.0
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
@@ -23,8 +23,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2
-WANTLIB += Qt5Svg Qt5WebSockets Qt5Widgets Qt5Xml c crypto gio-2.0
-WANTLIB += glib-2.0 gobject-2.0 intl m qt5keychain secret-1 sqlite3
+WANTLIB += Qt5Svg Qt5WebEngine Qt5WebSockets Qt5Widgets Qt5Xml c crypto
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m qt5keychain secret-1 sqlite3
WANTLIB += ssl z lib/inotify/inotify
MODULES = devel/cmake \
@@ -44,14 +44,20 @@ LIB_DEPENDS = databases/sqlite3 \
security/qtkeychain \
x11/qt5/qtsvg \
x11/qt5/qtquickcontrols2 \
+ x11/qt5/qtwebengine \
x11/qt5/qtwebsockets
CONFIGURE_ARGS = -DBUILD_SHELL_INTEGRATION_NAUTILUS=OFF \
-DBUILD_SHELL_INTEGRATION_DOLPHIN=OFF \
-DBUILD_SHELL_INTEGRATION=OFF \
-DUNIT_TESTING=ON \
- -DWITH_CRASHREPORTER=OFF \
- -DNO_SHIBBOLETH=ON
+ -DWITH_CRASHREPORTER=OFF
+
+# Disable Doxygen
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+
+# Disable SharedMime
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_SharedMimeInfo=ON
# Do not install under /etc/Nextcloud
CONFIGURE_ARGS += -DSYSCONF_INSTALL_DIR=${SYSCONFDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 20 Feb 2021 06:57:51 -0000 1.13
+++ distinfo 14 Apr 2021 13:32:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.1.3.tar.gz) = LjANtZQva6Btcvlrr3CxLSEOZuK4naH3E46K5aKJGts=
-SIZE (nextcloudclient-3.1.3.tar.gz) = 19552683
+SHA256 (nextcloudclient-3.2.0.tar.gz) = 2hGVsx/sCXASHBVn882vO5CD1GcnJ3EWqY5c0n9XqmA=
+SIZE (nextcloudclient-3.2.0.tar.gz) = 15214108
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 14 Apr 2021 13:32:09 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -187,10 +187,8 @@ if(BUILD_CLIENT)
+ find_package(Sparkle)
+ endif()
+
+- if(UNIX)
++ if(UNIX AND NOT APPLE)
+ find_package(INotify REQUIRED)
+- else()
+- find_package(INotify)
+ endif()
+ find_package(Sphinx)
+ find_package(PdfLatex)
Index: patches/patch-cmake_modules_FindINotify_cmake
===================================================================
RCS file: patches/patch-cmake_modules_FindINotify_cmake
diff -N patches/patch-cmake_modules_FindINotify_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_modules_FindINotify_cmake 14 Apr 2021 13:32:09 -0000
@@ -0,0 +1,94 @@
+$OpenBSD$
+
+Index: cmake/modules/FindINotify.cmake
+--- cmake/modules/FindINotify.cmake.orig
++++ cmake/modules/FindINotify.cmake
+@@ -1,30 +1,62 @@
+-# (c) 2014 Copyright ownCloud GmbH
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING* file.
++#.rst:
++# FindInotify
++# --------------
++#
++# Try to find inotify on this system. This finds:
++# - libinotify on Unix like systems, or
++# - the kernel's inotify on Linux systems.
++#
++# This will define the following variables:
++#
++# ``Inotify_FOUND``
++# True if inotify is available
++# ``Inotify_LIBRARIES``
++# This has to be passed to target_link_libraries()
++# ``Inotify_INCLUDE_DIRS``
++# This has to be passed to target_include_directories()
++#
++# On Linux, the libraries and include directories are empty,
++# even though ``Inotify_FOUND`` may be set to TRUE. This is because
++# no special includes or libraries are needed. On other systems
++# these may be needed to use inotify.
++#
++# Since 5.32.0.
+
+-# This module defines
+-# INOTIFY_INCLUDE_DIR, where to find inotify.h, etc.
+-# INOTIFY_LIBRARY_DIR, the directory holding the inotify library.
+-# INOTIFY_FOUND, If false, do not try to use inotify.
+-# also defined, but not for general use are
+-# INOTIFY_LIBRARY, where to find the inotify library.
++#=============================================================================
++# SPDX-FileCopyrightText: 2016 Tobias C. Berner <[email protected]>
++# SPDX-FileCopyrightText: 2017 Adriaan de Groot <[email protected]>
++#
++# SPDX-License-Identifier: BSD-2-Clause
++#=============================================================================
+
+-find_path(INOTIFY_INCLUDE_DIR sys/inotify.h
+- PATH_SUFFIXES inotify)
+-mark_as_advanced(INOTIFY_INCLUDE_DIR)
++find_path(Inotify_INCLUDE_DIRS sys/inotify.h)
+
+-find_library(INOTIFY_LIBRARY inotify PATH_SUFFIXES lib/inotify)
++if(Inotify_INCLUDE_DIRS)
++# On Linux there is no library to link against, on the BSDs there is.
++# On the BSD's, inotify is implemented through a library, libinotify.
++ if( CMAKE_SYSTEM_NAME MATCHES "Linux")
++ set(Inotify_FOUND TRUE)
++ set(Inotify_LIBRARIES "")
++ set(Inotify_INCLUDE_DIRS "")
++ else()
++ find_library(Inotify_LIBRARIES NAMES inotify)
++ include(FindPackageHandleStandardArgs)
++ find_package_handle_standard_args(Inotify
++ FOUND_VAR
++ Inotify_FOUND
++ REQUIRED_VARS
++ Inotify_LIBRARIES
++ Inotify_INCLUDE_DIRS
++ )
++ mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
++ include(FeatureSummary)
++ set_package_properties(Inotify PROPERTIES
++ URL "https://github.com/libinotify-kqueue/";
++ DESCRIPTION "inotify API on the *BSD family of operating systems."
++ )
++ endif()
++else()
++ set(Inotify_FOUND FALSE)
++endif()
+
+-get_filename_component(INOTIFY_LIBRARY_DIR ${INOTIFY_LIBRARY} PATH)
+-mark_as_advanced(INOTIFY_LIBRARY_DIR)
+-
+-# all listed variables are TRUE
+-# handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR INOTIFY_LIBRARY_DIR)
+-
+-IF(INOTIFY_FOUND)
+- SET(INotify_INCLUDE_DIRS ${INOTIFY_INCLUDE_DIR})
+- SET(INotify_LIBRARY_DIRS ${INOTIFY_LIBRARY_DIR})
+-ENDIF(INOTIFY_FOUND)
+-
++mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 27 Aug 2020 18:19:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2020/08/27 18:19:09 rsadowski Exp $
-
-Index: src/CMakeLists.txt
---- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -4,7 +4,7 @@ endif()
-
- set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
-
--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_csync_ConfigureChecks_cmake
===================================================================
RCS file: patches/patch-src_csync_ConfigureChecks_cmake
diff -N patches/patch-src_csync_ConfigureChecks_cmake
--- patches/patch-src_csync_ConfigureChecks_cmake 10 Mar 2020 13:11:36 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_csync_ConfigureChecks_cmake,v 1.2 2020/03/10 13:11:36 kirby Exp $
-
-Index: src/csync/ConfigureChecks.cmake
---- src/csync/ConfigureChecks.cmake.orig
-+++ src/csync/ConfigureChecks.cmake
-@@ -15,7 +15,7 @@ set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR})
- set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR})
-
- # HEADER FILES
--check_include_file(argp.h HAVE_ARGP_H)
-+#check_include_file(argp.h HAVE_ARGP_H)
-
- # FUNCTIONS
- if (NOT LINUX)
Index: patches/patch-src_csync_std_c_private_h
===================================================================
RCS file: patches/patch-src_csync_std_c_private_h
diff -N patches/patch-src_csync_std_c_private_h
--- patches/patch-src_csync_std_c_private_h 19 Dec 2020 19:34:21 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_csync_std_c_private_h,v 1.2 2020/12/19 19:34:21 rsadowski Exp $
-
-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; // NOLINT this is som
- #endif
-
- /* FIXME: Implement TLS for OS X */
--#if defined(__GNUC__) && !defined(__APPLE__)
-+#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__OpenBSD__)
- # define CSYNC_THREAD __thread
- #elif defined(_MSC_VER)
- # define CSYNC_THREAD __declspec(thread)
Index: patches/patch-src_gui_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_gui_CMakeLists_txt
diff -N patches/patch-src_gui_CMakeLists_txt
--- patches/patch-src_gui_CMakeLists_txt 19 Dec 2020 19:34:21 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-$OpenBSD: patch-src_gui_CMakeLists_txt,v 1.5 2020/12/19 19:34:21 rsadowski Exp $
-
-Index: src/gui/CMakeLists.txt
---- src/gui/CMakeLists.txt.orig
-+++ src/gui/CMakeLists.txt
-@@ -46,14 +46,12 @@ set(client_UI_SRCS
- tray/ActivityActionButton.qml
- tray/Window.qml
- tray/UserLine.qml
-- wizard/flow2authwidget.ui
- wizard/owncloudadvancedsetuppage.ui
- wizard/owncloudconnectionmethoddialog.ui
- wizard/owncloudhttpcredspage.ui
- wizard/owncloudoauthcredspage.ui
- wizard/owncloudsetupnocredspage.ui
- wizard/owncloudwizardresultpage.ui
-- wizard/webview.ui
- )
-
- set(client_SRCS
-@@ -119,23 +117,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
- )
-
-@@ -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::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: patches/patch-src_gui_accountmanager_cpp
diff -N patches/patch-src_gui_accountmanager_cpp
--- patches/patch-src_gui_accountmanager_cpp 19 Dec 2020 19:34:21 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_gui_accountmanager_cpp,v 1.2 2020/12/19 19:34:21 rsadowski Exp $
-
-Index: src/gui/accountmanager.cpp
---- src/gui/accountmanager.cpp.orig
-+++ src/gui/accountmanager.cpp
-@@ -253,20 +253,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings
- acc->setUrl(urlConfig.toUrl());
- }
-
-- // Migrate to webflow
-- if (authType == QLatin1String("http")) {
-- authType = "webflow";
-- settings.setValue(QLatin1String(authTypeC), authType);
--
-- for (const 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();
Index: patches/patch-src_gui_creds_credentialsfactory_cpp
===================================================================
RCS file: patches/patch-src_gui_creds_credentialsfactory_cpp
diff -N patches/patch-src_gui_creds_credentialsfactory_cpp
--- patches/patch-src_gui_creds_credentialsfactory_cpp 16 Nov 2019 10:27:43 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_gui_creds_credentialsfactory_cpp,v 1.1.1.1 2019/11/16 10:27:43 rsadowski Exp $
-
-Index: src/gui/creds/credentialsfactory.cpp
---- src/gui/creds/credentialsfactory.cpp.orig
-+++ 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;
Index: patches/patch-src_gui_wizard_owncloudsetuppage_cpp
===================================================================
RCS file: patches/patch-src_gui_wizard_owncloudsetuppage_cpp
diff -N patches/patch-src_gui_wizard_owncloudsetuppage_cpp
--- patches/patch-src_gui_wizard_owncloudsetuppage_cpp 19 Dec 2020 19:34:21 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_gui_wizard_owncloudsetuppage_cpp,v 1.5 2020/12/19 19:34:21 rsadowski Exp $
-
-Index: src/gui/wizard/owncloudsetuppage.cpp
---- src/gui/wizard/owncloudsetuppage.cpp.orig
-+++ src/gui/wizard/owncloudsetuppage.cpp
-@@ -148,7 +148,7 @@ void OwncloudSetupPage::slotLogin()
- void OwncloudSetupPage::slotGotoProviderList()
- {
- _ocWizard->setRegistration(true);
-- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
-+ _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::Basic);
- _authTypeKnown = true;
- _checking = false;
- emit completeChanged();
-@@ -268,12 +268,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;
- }
Index: patches/patch-src_gui_wizard_owncloudwizard_cpp
===================================================================
RCS file: patches/patch-src_gui_wizard_owncloudwizard_cpp
diff -N patches/patch-src_gui_wizard_owncloudwizard_cpp
--- patches/patch-src_gui_wizard_owncloudwizard_cpp 27 Aug 2020 18:19:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-$OpenBSD: patch-src_gui_wizard_owncloudwizard_cpp,v 1.3 2020/08/27 18:19:09 rsadowski Exp $
-
-Index: src/gui/wizard/owncloudwizard.cpp
---- src/gui/wizard/owncloudwizard.cpp.orig
-+++ src/gui/wizard/owncloudwizard.cpp
-@@ -27,8 +27,6 @@
- #endif
- #include "wizard/owncloudadvancedsetuppage.h"
- #include "wizard/owncloudwizardresultpage.h"
--#include "wizard/webviewpage.h"
--#include "wizard/flow2authcredspage.h"
-
- #include "QProgressIndicator.h"
-
-@@ -50,22 +48,18 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
- #ifndef NO_SHIBBOLETH
- , _shibbolethCredsPage(new OwncloudShibbolethCredsPage)
- #endif
-- , _flow2CredsPage(new Flow2AuthCredsPage)
- , _advancedSetupPage(new OwncloudAdvancedSetupPage)
- , _resultPage(new OwncloudWizardResultPage)
-- , _webViewPage(new WebViewPage(this))
- {
- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
- 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);
-
-@@ -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);
-- 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);
-@@ -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);
-- 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)
-@@ -177,20 +165,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;
-@@ -214,10 +194,6 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob:
- #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;
- }
-@@ -242,7 +218,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 && (_credentialsPage == _browserCredsPage)) {
- // 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);
Index: patches/patch-src_gui_wizard_owncloudwizard_h
===================================================================
RCS file: patches/patch-src_gui_wizard_owncloudwizard_h
diff -N patches/patch-src_gui_wizard_owncloudwizard_h
--- patches/patch-src_gui_wizard_owncloudwizard_h 27 Aug 2020 18:19:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_gui_wizard_owncloudwizard_h,v 1.3 2020/08/27 18:19:09 rsadowski Exp $
-
-Index: src/gui/wizard/owncloudwizard.h
---- src/gui/wizard/owncloudwizard.h.orig
-+++ 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
-@@ -114,11 +112,9 @@ signals: (private)
- #ifndef NO_SHIBBOLETH
- OwncloudShibbolethCredsPage *_shibbolethCredsPage;
- #endif
-- Flow2AuthCredsPage *_flow2CredsPage;
- OwncloudAdvancedSetupPage *_advancedSetupPage;
- OwncloudWizardResultPage *_resultPage;
- AbstractCredentialsWizardPage *_credentialsPage = nullptr;
-- WebViewPage *_webViewPage;
-
- QStringList _setupLog;
-
Index: patches/patch-src_libsync_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_libsync_CMakeLists_txt
diff -N patches/patch-src_libsync_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libsync_CMakeLists_txt 14 Apr 2021 13:32:09 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: src/libsync/CMakeLists.txt
+--- src/libsync/CMakeLists.txt.orig
++++ src/libsync/CMakeLists.txt
+@@ -11,12 +11,6 @@ if ( APPLE )
+ )
+ endif()
+
+-IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD")
+- list(APPEND OS_SPECIFIC_LINK_LIBRARIES
+- inotify
+- )
+-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD")
+-
+ set(libsync_SRCS
+ account.cpp
+ pushnotifications.cpp
+@@ -135,10 +129,9 @@ if (NOT TOKEN_AUTH_ONLY)
+ target_link_libraries(${synclib_NAME} PUBLIC Qt5::Widgets Qt5::Svg qt5keychain)
+ endif()
+
+-if(INOTIFY_FOUND)
+- target_include_directories(${synclib_NAME} PRIVATE ${INOTIFY_INCLUDE_DIR})
+- link_directories(${INOTIFY_LIBRARY_DIR})
+- target_link_libraries(${synclib_NAME} ${INOTIFY_LIBRARY} )
++if(Inotify_FOUND)
++ target_include_directories(${synclib_NAME} PRIVATE ${Inotify_INCLUDE_DIRS})
++ target_link_libraries(${synclib_NAME} PUBLIC ${Inotify_LIBRARIES})
+ endif()
+
+ GENERATE_EXPORT_HEADER( ${synclib_NAME}
Index: patches/patch-src_libsync_networkjobs_cpp
===================================================================
RCS file: patches/patch-src_libsync_networkjobs_cpp
diff -N patches/patch-src_libsync_networkjobs_cpp
--- patches/patch-src_libsync_networkjobs_cpp 19 Dec 2020 19:34:22 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-src_libsync_networkjobs_cpp,v 1.5 2020/12/19 19:34:22 rsadowski Exp $
-
-Index: src/libsync/networkjobs.cpp
---- src/libsync/networkjobs.cpp.orig
-+++ src/libsync/networkjobs.cpp
-@@ -929,7 +929,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");
-@@ -937,7 +937,7 @@ void DetermineAuthTypeJob::start()
- auto flow = gs.toObject().value("desktoplogin");
- if (flow != QJsonValue::Undefined) {
- if (flow.toInt() == 1) {
-- _resultOldFlow = WebViewFlow;
-+ _resultOldFlow = Basic;
- }
- }
- }
-@@ -963,17 +963,12 @@ void DetermineAuthTypeJob::checkAllDone()
-
- // 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;
-- }
--
-- // If we determined that we need the webview flow (GS for example) then we switch to that
-- if (_resultOldFlow == WebViewFlow) {
-- result = WebViewFlow;
-+ result = Basic;
- }
-
- qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
Index: patches/patch-src_libsync_networkjobs_h
===================================================================
RCS file: patches/patch-src_libsync_networkjobs_h
diff -N patches/patch-src_libsync_networkjobs_h
--- patches/patch-src_libsync_networkjobs_h 27 Aug 2020 18:19:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_libsync_networkjobs_h,v 1.2 2020/08/27 18:19:09 rsadowski Exp $
-
-Index: src/libsync/networkjobs.h
---- src/libsync/networkjobs.h.orig
-+++ src/libsync/networkjobs.h
-@@ -425,8 +425,6 @@ class OWNCLOUDSYNC_EXPORT DetermineAuthTypeJob : publi
- Basic, // also the catch-all fallback for backwards compatibility reasons
- OAuth,
- Shibboleth,
-- WebViewFlow,
-- LoginFlowV2
- };
-
- explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 28 Jan 2021 20:23:01 -0000 1.6
+++ pkg/PLIST 14 Apr 2021 13:32:09 -0000
@@ -13,9 +13,9 @@ include/nextcloudsync/mirall/progressdis
include/nextcloudsync/mirall/syncengine.h
include/nextcloudsync/mirall/syncfileitem.h
include/nextcloudsync/mirall/syncresult.h
+lib/libnextcloud_csync.so.0
+lib/libnextcloud_csync.so.3.2.0
@lib lib/libnextcloudsync.so.${LIBnextcloudsync_VERSION}
-lib/nextcloud/
-@lib lib/nextcloud/libocsync.so.${LIBocsync_VERSION}
share/applications/com.nextcloud.desktopclient.nextcloud.desktop
share/examples/Nextcloud/
@sample ${SYSCONFDIR}/Nextcloud/
@@ -32,6 +32,7 @@ share/icons/hicolor/32x32/apps/Nextcloud
share/icons/hicolor/48x48/apps/Nextcloud.png
share/icons/hicolor/512x512/apps/Nextcloud.png
share/icons/hicolor/64x64/apps/Nextcloud.png
+share/mime/packages/nextcloud.xml
share/nextcloud/
share/nextcloud/i18n/
share/nextcloud/i18n/client_TW.qm
@@ -82,6 +83,7 @@ share/nextcloud/i18n/client_pt.qm
share/nextcloud/i18n/client_pt_BR.qm
share/nextcloud/i18n/client_ro.qm
share/nextcloud/i18n/client_ru.qm
+share/nextcloud/i18n/client_sc.qm
share/nextcloud/i18n/client_sk.qm
share/nextcloud/i18n/client_sl.qm
share/nextcloud/i18n/client_sr.qm
@@ -94,3 +96,4 @@ share/nextcloud/i18n/client_zh_HK.qm
share/nextcloud/i18n/client_zh_TW.qm
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-mime-database
