* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
@ 2018-09-24 10:13 Bernard Cafarelli
0 siblings, 0 replies; 4+ messages in thread
From: Bernard Cafarelli @ 2018-09-24 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 39141d982bd90ffa282159d38dd6492b7ced9ab6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep 23 17:20:37 2018 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 10:13:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39141d98
net-misc/nextcloud-client: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/9958
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
.../nextcloud-client-2.5.0_beta1-fix_cmake.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
deleted file mode 100644
index e160d514088..00000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2b825a1748b2ecd624a38976d1bd6601bdb198c9 Mon Sep 17 00:00:00 2001
-From: Ronny Kunze <Shinji.Ikari_de@gmx.de>
-Date: Sat, 4 Aug 2018 16:53:06 +0200
-Subject: [PATCH] rearange CMake find_package OpenSSL
-
-the command seems to be malformed . The keyword VERSION is not valid .
-And the version should follow direct after the packagename.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8b8330f2..f1d07eea2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
- endif()
- find_package(Sphinx)
- find_package(PdfLatex)
-- find_package(OpenSSL REQUIRED VERSION 1.1)
-+ find_package(OpenSSL 1.1 REQUIRED )
-
- find_package(ZLIB REQUIRED)
- find_package(GLib2)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
@ 2021-12-29 11:16 Bernard Cafarelli
0 siblings, 0 replies; 4+ messages in thread
From: Bernard Cafarelli @ 2021-12-29 11:16 UTC (permalink / raw
To: gentoo-commits
commit: a325f31d02078b450cc1a33d3c66778409588a48
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 26 08:13:03 2021 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 11:16:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a325f31d
net-misc/nextcloud-client: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23518
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../files/nextcloud-client-3.2.3-inkscape.patch | 79 ----
.../files/nextcloud-client-3.2.3-webengine.patch | 419 ---------------------
2 files changed, 498 deletions(-)
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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
@ 2023-02-22 18:27 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2023-02-22 18:27 UTC (permalink / raw
To: gentoo-commits
commit: d2a98923a8900427795ca0a950e6ade4158f371a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 22 16:45:33 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 18:27:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a98923
net-misc/nextcloud-client: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29730
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
....4-drop-dependency-on-Qt-Quick-Controls-1.patch | 59 ----------------------
1 file changed, 59 deletions(-)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch
deleted file mode 100644
index e1bb0a11e13f..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 600ad8f6003daee635093ad713f3f90cb7cc7485 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Thu, 5 Jan 2023 11:58:08 +0100
-Subject: [PATCH] Drop dependency on Qt Quick Controls 1
-
-Qt Quick Controls 1 where deprecated with Qt 5.11 [1]. Nextcloud still
-depends on Quick Controls 1 by importing QtQuick.Dialogs. Removing
-those imports will cause the QMl script to use the according API from
-Quick Controls 2, which are, fortunately largely API-comptible.
-
-This helps distribution to deprecate and remove Quick Controls 1 [2].
-
-1: https://doc.qt.io/qt-6/qtquickcontrols-changes-qt6.html#migrating-from-qt-quick-controls-1
-2: https://bugs.gentoo.org/889772
-
-Signed-off-by: Florian Schmaus <flo@geekplace.eu>
---- a/src/gui/BasicComboBox.qml
-+++ b/src/gui/BasicComboBox.qml
-@@ -13,7 +13,6 @@
- */
-
- import QtQuick 2.15
--import QtQuick.Dialogs 1.3
- import QtQuick.Layouts 1.15
- import QtQuick.Controls 2.15
- import QtGraphicalEffects 1.0
---- a/src/gui/PredefinedStatusButton.qml
-+++ b/src/gui/PredefinedStatusButton.qml
-@@ -13,7 +13,6 @@
- */
-
- import QtQuick 2.15
--import QtQuick.Dialogs 1.3
- import QtQuick.Layouts 1.15
- import QtQuick.Controls 2.15
-
---- a/src/gui/UserStatusSelector.qml
-+++ b/src/gui/UserStatusSelector.qml
-@@ -13,7 +13,6 @@
- */
-
- import QtQuick 2.6
--import QtQuick.Dialogs 1.3
- import QtQuick.Layouts 1.15
- import QtQuick.Controls 2.15
- import QtQuick.Window 2.15
---- a/src/gui/UserStatusSelectorButton.qml
-+++ b/src/gui/UserStatusSelectorButton.qml
-@@ -13,7 +13,6 @@
- */
-
- import QtQuick 2.6
--import QtQuick.Dialogs 1.3
- import QtQuick.Layouts 1.15
- import QtQuick.Controls 2.15
-
---
-2.38.2
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
@ 2024-11-23 22:23 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2024-11-23 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 572156f3d542f502f1beeac9db939ceeebcf0642
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Nov 23 16:35:34 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 22:23:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572156f3
net-misc/nextcloud-client: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../nextcloud-client-3.13.2-fix_build_kf6.patch | 38 ----------------------
1 file changed, 38 deletions(-)
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
deleted file mode 100644
index 3898dcbcef3c..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b2974a504f67e4af9c376927d1d0fd3c99de3255 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 1 Apr 2024 20:00:25 +0200
-Subject: [PATCH] Fix build with KF6
-
-Set QT_NO_CREATE_VERSIONLESS_FUNCTIONS, otherwise Qt5 and Qt6 conflict
-
-Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
----
- CMakeLists.txt | 1 +
- src/gui/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 687733588813..07d3266cb9dc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,7 @@ endif()
-
- set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED 17)
-+set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON)
-
- include(FeatureSummary)
-
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 6e4acf203d19..37f459db4384 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -58,7 +58,7 @@ set(client_UI_SRCS
- if(QUICK_COMPILER)
- qtquick_compiler_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
- else()
-- qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
-+ qt5_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
- endif()
-
- set(client_SRCS
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-23 22:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-24 10:13 [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2021-12-29 11:16 Bernard Cafarelli
2023-02-22 18:27 Florian Schmaus
2024-11-23 22:23 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox