gentoo resync : 04.01.2022

3 files changed, 0 insertions, 500 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index c42be6095a5b..c80f2edfe87b 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,5 +1,3 @@
-AUX nextcloud-client-3.2.3-inkscape.patch 3190 BLAKE2B 432a1d418e61c982ff6f4d7a43151c5bd8ffb7d231542abc3ee42f450fad2eeed4e1d3e641ee4ac246d43174d69de4de7384516dd9a22c26a1c878ab0aa06f7e SHA512 0a92815371923bce701edd362583e11977556f17866fedf13ea48ed26e409610b80eb7a6b6181702b59250fa3868319624bdad34911746490f5a8330ad94b4a2
-AUX nextcloud-client-3.2.3-webengine.patch 15574 BLAKE2B 8cd752db888f87f075f3b69cf34e3e84fde99f3f2dec4891092d47c020b60efc49968bfee7ef8136b6e0454cc331b778fcbc2a94903b11c1cc3e587d153e3aa9 SHA512 b3ea743ab50ef8eda12a0bef8513d1563d3682c54e6af586ccf60cf7b4377e93913c4d6eb0ba1b65075203608bfa81f934dfc408b89c5bf3b84352524bc08091
 AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a
 DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
 DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch
deleted file mode 100644
index 8b02ab2a8086..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt
---- desktop-3.2.3.orig/src/gui/CMakeLists.txt	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/CMakeLists.txt	2021-07-06 19:20:34.225000546 +0200
-@@ -241,75 +241,6 @@
-     set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
- endif()
- 
--# Generate png icons from svg
--find_program(INKSCAPE
--  NAMES inkscape inkscape.exe
--  REQUIRED
--  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
--# REQUIRED keyword is only supported on CMake 3.18 and above
--if (NOT INKSCAPE)
--  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
--endif()
--
--function(generate_sized_png_from_svg icon_path size)
--  get_filename_component(icon_name_dir ${icon_path} DIRECTORY)
--  get_filename_component(icon_name_wle ${icon_path} NAME_WLE)
--
--  if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png")
--    return()
--  endif()
--
--  set(icon_output_name "${size}-${icon_name_wle}.png")
--  message(STATUS "Generate ${icon_output_name}")
--  execute_process(COMMAND
--    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
--    WORKING_DIRECTORY "${icon_name_dir}"
--    RESULT_VARIABLE
--    INKSCAPE_SIDEBAR_ERROR
--    OUTPUT_QUIET
--    ERROR_QUIET)
--
--  if (INKSCAPE_SIDEBAR_ERROR)
--    message(FATAL_ERROR
--      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
--  else()
--  endif()
--endfunction()
--
--if ((APPLICATION_ICON_SET MATCHES "PNG")
--    AND
--    (NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg"))
--  # We may have no svg application icon in when customers use PNG
--  # icons in brander, but theme.qrc expects a svg icon.
--  file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
--endif()
--
--if(APPLE)
--  set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg")
--  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16)
--  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32)
--  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64)
--  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128)
--  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256)
--endif()
--
--if(WIN32)
--  set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg")
--  generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70)
--  generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150)
--endif()
--
--set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
--generate_sized_png_from_svg(${APP_ICON_SVG} 16)
--generate_sized_png_from_svg(${APP_ICON_SVG} 24)
--generate_sized_png_from_svg(${APP_ICON_SVG} 32)
--generate_sized_png_from_svg(${APP_ICON_SVG} 48)
--generate_sized_png_from_svg(${APP_ICON_SVG} 64)
--generate_sized_png_from_svg(${APP_ICON_SVG} 128)
--generate_sized_png_from_svg(${APP_ICON_SVG} 256)
--generate_sized_png_from_svg(${APP_ICON_SVG} 512)
--generate_sized_png_from_svg(${APP_ICON_SVG} 1024)
--
- file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*")
- if(APPLE)
-     file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*")
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
deleted file mode 100644
index 8152528f30cb..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
+++ /dev/null
@@ -1,419 +0,0 @@
-diff -Naur desktop-3.2.3.orig/src/CMakeLists.txt desktop-3.2.3/src/CMakeLists.txt
---- desktop-3.2.3.orig/src/CMakeLists.txt	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/CMakeLists.txt	2021-07-07 20:26:40.620839467 +0200
-@@ -4,7 +4,13 @@
- 
- 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)
-+find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine)
-+
-+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
-+  add_compile_definitions(WITH_WEBENGINE=1)
-+endif()
-+
- get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
- message(STATUS "Using Qt ${Qt5Core_VERSION} (${QT_QMAKE_EXECUTABLE})")
- 
-diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt
---- desktop-3.2.3.orig/src/gui/CMakeLists.txt	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/CMakeLists.txt	2021-07-07 20:26:40.620839467 +0200
-@@ -128,12 +128,17 @@
-     wizard/owncloudwizardcommon.cpp
-     wizard/owncloudwizard.cpp
-     wizard/owncloudwizardresultpage.cpp
--    wizard/webviewpage.cpp
--    wizard/webview.cpp
-     wizard/slideshow.cpp
-     wizard/welcomepage.cpp
-     wizard/linklabel.cpp
--)
-+    )
-+
-+if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
-+  list(APPEND client_SRCS
-+    wizard/webviewpage.cpp
-+    wizard/webview.cpp
-+  )
-+endif()
- 
- IF(BUILD_UPDATER)
-     set(updater_SRCS
-@@ -339,9 +344,12 @@
-   Qt5::Qml
-   Qt5::Quick
-   Qt5::QuickControls2
--  Qt5::WebEngineWidgets
-   ${synclib_NAME}
--)
-+  )
-+
-+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
-+  target_link_libraries(nextcloudCore PUBLIC Qt5::WebEngineWidgets)
-+endif()
- 
- set_target_properties(nextcloudCore
-   PROPERTIES
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp desktop-3.2.3/src/gui/creds/webflowcredentials.cpp
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/creds/webflowcredentials.cpp	2021-07-07 20:26:40.618839464 +0200
-@@ -16,7 +16,9 @@
- #include "account.h"
- #include "configfile.h"
- #include "theme.h"
-+#ifdef WITH_WEBENGINE
- #include "wizard/webview.h"
-+#endif // WITH_WEBENGINE
- #include "webflowcredentialsdialog.h"
- 
- using namespace QKeychain;
-@@ -144,8 +146,12 @@
-     // Do a DetermineAuthTypeJob to make sure that the server is still using Flow2
-     auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
-     connect(job, &DetermineAuthTypeJob::authType, [this](DetermineAuthTypeJob::AuthType type) {
--        // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
-+    // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
-+#ifdef WITH_WEBENGINE
-         bool useFlow2 = (type != DetermineAuthTypeJob::WebViewFlow);
-+#else // WITH_WEBENGINE
-+        bool useFlow2 = true;
-+#endif // WITH_WEBENGINE
- 
-         _askDialog = new WebFlowCredentialsDialog(_account, useFlow2);
- 
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp	2021-07-07 20:26:40.618839464 +0200
-@@ -8,16 +8,20 @@
- #include "owncloudgui.h"
- #include "headerbanner.h"
- #include "wizard/owncloudwizardcommon.h"
-+#ifdef WITH_WEBENGINE
- #include "wizard/webview.h"
-+#endif // WITH_WEBENGINE
- #include "wizard/flow2authwidget.h"
- 
- namespace OCC {
- 
- WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent)
--    : QDialog(parent),
--      _useFlow2(useFlow2),
--      _flow2AuthWidget(nullptr),
--      _webView(nullptr)
-+    : QDialog(parent)
-+    , _useFlow2(useFlow2)
-+    , _flow2AuthWidget(nullptr)
-+#ifdef WITH_WEBENGINE
-+    , _webView(nullptr)
-+#endif // WITH_WEBENGINE
- {
-     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
- 
-@@ -49,10 +53,12 @@
- 
-         _flow2AuthWidget->startAuth(account);
-     } else {
-+#ifdef WITH_WEBENGINE
-         _webView = new WebView();
-         _containerLayout->addWidget(_webView);
- 
-         connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched);
-+#endif // WITH_WEBENGINE
-     }
- 
-     auto app = static_cast<Application *>(qApp);
-@@ -73,12 +79,14 @@
- void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) {
-     Q_UNUSED(e)
- 
-+#ifdef WITH_WEBENGINE
-     if (_webView) {
-         // Force calling WebView::~WebView() earlier so that _profile and _page are
-         // deleted in the correct order.
-         _webView->deleteLater();
-         _webView = nullptr;
-     }
-+#endif // WITH_WEBENGINE
- 
-     if (_flow2AuthWidget) {
-         _flow2AuthWidget->resetAuth();
-@@ -89,9 +97,14 @@
-     emit onClose();
- }
- 
--void WebFlowCredentialsDialog::setUrl(const QUrl &url) {
-+void WebFlowCredentialsDialog::setUrl(const QUrl &url)
-+{
-+#ifdef WITH_WEBENGINE
-     if (_webView)
-         _webView->setUrl(url);
-+#else // WITH_WEBENGINE
-+    Q_UNUSED(url);
-+#endif // WITH_WEBENGINE
- }
- 
- void WebFlowCredentialsDialog::setInfo(const QString &msg) {
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h	2021-07-07 20:26:40.618839464 +0200
-@@ -13,7 +13,9 @@
- namespace OCC {
- 
- class HeaderBanner;
-+#ifdef WITH_WEBENGINE
- class WebView;
-+#endif // WITH_WEBENGINE
- class Flow2AuthWidget;
- 
- class WebFlowCredentialsDialog : public QDialog
-@@ -50,7 +52,9 @@
-     bool _useFlow2;
- 
-     Flow2AuthWidget *_flow2AuthWidget;
-+#ifdef WITH_WEBENGINE
-     WebView *_webView;
-+#endif // WITH_WEBENGINE
- 
-     QLabel *_errorLabel;
-     QLabel *_infoLabel;
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp
---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp	2021-07-07 20:26:40.619839465 +0200
-@@ -119,21 +119,6 @@
-     _ui.leUrl->setPalette(leUrlPalette);
- }
- 
--#ifdef WITH_PROVIDERS
--void OwncloudSetupPage::slotLogin()
--{
--    _ocWizard->setRegistration(false);
--}
--void OwncloudSetupPage::slotGotoProviderList()
--{
--    _ocWizard->setRegistration(true);
--    _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
--    _authTypeKnown = true;
--    _checking = false;
--    emit completeChanged();
--}
--#endif
--
- // slot hit from textChanged of the url entry field.
- void OwncloudSetupPage::slotUrlChanged(const QString &url)
- {
-@@ -228,8 +213,10 @@
-         return WizardCommon::Page_OAuthCreds;
-     case DetermineAuthTypeJob::LoginFlowV2:
-         return WizardCommon::Page_Flow2AuthCreds;
-+#ifdef WITH_WEBENGINE
-     case DetermineAuthTypeJob::WebViewFlow:
-         return WizardCommon::Page_WebView;
-+#endif // WITH_WEBENGINE
-     }
-     return WizardCommon::Page_HttpCreds;
- }
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h
---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h	2021-07-07 20:26:40.617839462 +0200
-@@ -67,10 +67,6 @@
- protected slots:
-     void slotUrlChanged(const QString &);
-     void slotUrlEditFinished();
--#ifdef WITH_PROVIDERS
--    void slotLogin();
--    void slotGotoProviderList();
--#endif
- 
-     void setupCustomization();
- 
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h	2021-07-07 20:26:40.619839465 +0200
-@@ -46,7 +46,9 @@
-         Page_HttpCreds,
-         Page_OAuthCreds,
-         Page_Flow2AuthCreds,
-+#ifdef WITH_WEBENGINE
-         Page_WebView,
-+#endif // WITH_WEBENGINE
-         Page_AdvancedSetup,
-         Page_Result
-     };
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp	2021-07-07 20:26:40.619839465 +0200
-@@ -54,7 +54,11 @@
-     , _flow2CredsPage(new Flow2AuthCredsPage)
-     , _advancedSetupPage(new OwncloudAdvancedSetupPage(this))
-     , _resultPage(new OwncloudWizardResultPage)
-+#ifdef WITH_WEBENGINE
-     , _webViewPage(new WebViewPage(this))
-+#else // WITH_WEBENGINE
-+    , _webViewPage(nullptr)
-+#endif // WITH_WEBENGINE
- {
-     setObjectName("owncloudWizard");
- 
-@@ -66,7 +70,9 @@
-     setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
-     setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
-     setPage(WizardCommon::Page_Result, _resultPage);
-+#ifdef WITH_WEBENGINE
-     setPage(WizardCommon::Page_WebView, _webViewPage);
-+#endif // WITH_WEBENGINE
- 
-     connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
- 
-@@ -78,7 +84,9 @@
-     connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-     connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-     connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-+#ifdef WITH_WEBENGINE
-     connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-+#endif // WITH_WEBENGINE
-     connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
-         this, &OwncloudWizard::createLocalAndRemoteFolders);
-     connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
-@@ -230,9 +238,11 @@
-         _flow2CredsPage->setConnected();
-         break;
- 
-+#ifdef WITH_WEBENGINE
-     case WizardCommon::Page_WebView:
-         _webViewPage->setConnected();
-         break;
-+#endif // WITH_WEBENGINE
- 
-     case WizardCommon::Page_AdvancedSetup:
-         _advancedSetupPage->directoriesCreated();
-@@ -256,8 +266,10 @@
-         _credentialsPage = _browserCredsPage;
-     } else if (type == DetermineAuthTypeJob::LoginFlowV2) {
-         _credentialsPage = _flow2CredsPage;
-+#ifdef WITH_WEBENGINE
-     } else if (type == DetermineAuthTypeJob::WebViewFlow) {
-         _credentialsPage = _webViewPage;
-+#endif // WITH_WEBENGINE
-     } else { // try Basic auth even for "Unknown"
-         _credentialsPage = _httpCredsPage;
-     }
-@@ -281,7 +293,11 @@
-         button(QWizard::NextButton)->setHidden(true);
-         // Need to set it from here, otherwise it has no effect
-         _welcomePage->setLoginButtonDefault();
--    } else if (id == WizardCommon::Page_WebView || id == WizardCommon::Page_Flow2AuthCreds) {
-+    } else if (
-+#ifdef WITH_WEBENGINE
-+        id == WizardCommon::Page_WebView ||
-+#endif // WITH_WEBENGINE
-+        id == WizardCommon::Page_Flow2AuthCreds) {
-         setButtonLayout({ QWizard::Stretch, QWizard::BackButton });
-     } else if (id == WizardCommon::Page_AdvancedSetup) {
-         setButtonLayout({ QWizard::Stretch, QWizard::CustomButton1, QWizard::BackButton, QWizard::NextButton });
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h desktop-3.2.3/src/gui/wizard/owncloudwizard.h
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.h	2021-07-07 20:26:40.619839465 +0200
-@@ -128,7 +128,7 @@
-     OwncloudAdvancedSetupPage *_advancedSetupPage;
-     OwncloudWizardResultPage *_resultPage;
-     AbstractCredentialsWizardPage *_credentialsPage = nullptr;
--    WebViewPage *_webViewPage;
-+    WebViewPage *_webViewPage = nullptr;
- 
-     QStringList _setupLog;
- 
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp desktop-3.2.3/src/gui/wizard/welcomepage.cpp
---- desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/welcomepage.cpp	2021-07-07 20:26:40.620839467 +0200
-@@ -13,6 +13,7 @@
-  */
- 
- #include "welcomepage.h"
-+#include "guiutility.h"
- #include "theme.h"
- #include "wizard/owncloudwizard.h"
- #include "wizard/slideshow.h"
-@@ -94,11 +95,18 @@
- 
- void WelcomePage::setupCreateAccountButton()
- {
-+#ifdef WITH_WEBENGINE
-     connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
-         _ocWizard->setRegistration(true);
-         _nextPage = WizardCommon::Page_WebView;
-         _ocWizard->next();
-     });
-+#else // WITH_WEBENGINE
-+    connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
-+        _ocWizard->setRegistration(true);
-+        Utility::openBrowser(QStringLiteral("https://nextcloud.com/register"));
-+    });
-+#endif // WITH_WEBENGINE
- }
- 
- void WelcomePage::setupHostYourOwnServerLabel()
-diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.cpp desktop-3.2.3/src/libsync/networkjobs.cpp
---- desktop-3.2.3.orig/src/libsync/networkjobs.cpp	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/libsync/networkjobs.cpp	2021-07-07 20:26:40.619839465 +0200
-@@ -30,6 +30,7 @@
- #include <QCoreApplication>
- #include <QJsonDocument>
- #include <QJsonObject>
-+#include <qloggingcategory.h>
- #ifndef TOKEN_AUTH_ONLY
- #include <QPainter>
- #include <QPainterPath>
-@@ -958,7 +959,11 @@
-                 auto flow = gs.toObject().value("desktoplogin");
-                 if (flow != QJsonValue::Undefined) {
-                     if (flow.toInt() == 1) {
-+#ifdef WITH_WEBENGINE
-                         _resultOldFlow = WebViewFlow;
-+#else // WITH_WEBENGINE
-+                        qCWarning(lcDetermineAuthTypeJob) << "Server does only support flow1, but this client was compiled without support for flow1";
-+#endif // WITH_WEBENGINE
-                     }
-                 }
-             }
-@@ -985,20 +990,24 @@
- 
-     auto result = _resultPropfind;
- 
-+#ifdef WITH_WEBENGINE
-     // WebViewFlow > OAuth > Basic
-     if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
-         result = WebViewFlow;
-     }
-+#endif // WITH_WEBENGINE
- 
-     // LoginFlowV2 > WebViewFlow > OAuth > Basic
-     if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
-         result = LoginFlowV2;
-     }
- 
-+#ifdef WITH_WEBENGINE
-     // If we determined that we need the webview flow (GS for example) then we switch to that
-     if (_resultOldFlow == WebViewFlow) {
-         result = WebViewFlow;
-     }
-+#endif // WITH_WEBENGINE
- 
-     // If we determined that a simple get gave us an authentication required error
-     // then the server enforces basic auth and we got no choice but to use this
-diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.h desktop-3.2.3/src/libsync/networkjobs.h
---- desktop-3.2.3.orig/src/libsync/networkjobs.h	2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/libsync/networkjobs.h	2021-07-07 20:26:40.619839465 +0200
-@@ -444,9 +444,11 @@
- public:
-     enum AuthType {
-         NoAuthType, // used only before we got a chance to probe the server
-+#ifdef WITH_WEBENGINE
-+        WebViewFlow,
-+#endif // WITH_WEBENGINE
-         Basic, // also the catch-all fallback for backwards compatibility reasons
-         OAuth,
--        WebViewFlow,
-         LoginFlowV2
-     };
-     Q_ENUM(AuthType)