1 |
commit: a325f31d02078b450cc1a33d3c66778409588a48 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Sun Dec 26 08:13:03 2021 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 29 11:16:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a325f31d |
7 |
|
8 |
net-misc/nextcloud-client: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/23518 |
13 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
14 |
|
15 |
.../files/nextcloud-client-3.2.3-inkscape.patch | 79 ---- |
16 |
.../files/nextcloud-client-3.2.3-webengine.patch | 419 --------------------- |
17 |
2 files changed, 498 deletions(-) |
18 |
|
19 |
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 |
20 |
deleted file mode 100644 |
21 |
index 8b02ab2a8086..000000000000 |
22 |
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch |
23 |
+++ /dev/null |
24 |
@@ -1,79 +0,0 @@ |
25 |
-diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt |
26 |
---- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200 |
27 |
-+++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-06 19:20:34.225000546 +0200 |
28 |
-@@ -241,75 +241,6 @@ |
29 |
- set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME}) |
30 |
- endif() |
31 |
- |
32 |
--# Generate png icons from svg |
33 |
--find_program(INKSCAPE |
34 |
-- NAMES inkscape inkscape.exe |
35 |
-- REQUIRED |
36 |
-- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR) |
37 |
--# REQUIRED keyword is only supported on CMake 3.18 and above |
38 |
--if (NOT INKSCAPE) |
39 |
-- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.") |
40 |
--endif() |
41 |
-- |
42 |
--function(generate_sized_png_from_svg icon_path size) |
43 |
-- get_filename_component(icon_name_dir ${icon_path} DIRECTORY) |
44 |
-- get_filename_component(icon_name_wle ${icon_path} NAME_WLE) |
45 |
-- |
46 |
-- if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png") |
47 |
-- return() |
48 |
-- endif() |
49 |
-- |
50 |
-- set(icon_output_name "${size}-${icon_name_wle}.png") |
51 |
-- message(STATUS "Generate ${icon_output_name}") |
52 |
-- execute_process(COMMAND |
53 |
-- "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" |
54 |
-- WORKING_DIRECTORY "${icon_name_dir}" |
55 |
-- RESULT_VARIABLE |
56 |
-- INKSCAPE_SIDEBAR_ERROR |
57 |
-- OUTPUT_QUIET |
58 |
-- ERROR_QUIET) |
59 |
-- |
60 |
-- if (INKSCAPE_SIDEBAR_ERROR) |
61 |
-- message(FATAL_ERROR |
62 |
-- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}") |
63 |
-- else() |
64 |
-- endif() |
65 |
--endfunction() |
66 |
-- |
67 |
--if ((APPLICATION_ICON_SET MATCHES "PNG") |
68 |
-- AND |
69 |
-- (NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")) |
70 |
-- # We may have no svg application icon in when customers use PNG |
71 |
-- # icons in brander, but theme.qrc expects a svg icon. |
72 |
-- file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") |
73 |
--endif() |
74 |
-- |
75 |
--if(APPLE) |
76 |
-- set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg") |
77 |
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16) |
78 |
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32) |
79 |
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64) |
80 |
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128) |
81 |
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256) |
82 |
--endif() |
83 |
-- |
84 |
--if(WIN32) |
85 |
-- set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg") |
86 |
-- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70) |
87 |
-- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150) |
88 |
--endif() |
89 |
-- |
90 |
--set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") |
91 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 16) |
92 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 24) |
93 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 32) |
94 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 48) |
95 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 64) |
96 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 128) |
97 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 256) |
98 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 512) |
99 |
--generate_sized_png_from_svg(${APP_ICON_SVG} 1024) |
100 |
-- |
101 |
- file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*") |
102 |
- if(APPLE) |
103 |
- file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*") |
104 |
|
105 |
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 |
106 |
deleted file mode 100644 |
107 |
index 8152528f30cb..000000000000 |
108 |
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch |
109 |
+++ /dev/null |
110 |
@@ -1,419 +0,0 @@ |
111 |
-diff -Naur desktop-3.2.3.orig/src/CMakeLists.txt desktop-3.2.3/src/CMakeLists.txt |
112 |
---- desktop-3.2.3.orig/src/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200 |
113 |
-+++ desktop-3.2.3/src/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200 |
114 |
-@@ -4,7 +4,13 @@ |
115 |
- |
116 |
- set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) |
117 |
- |
118 |
--find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED) |
119 |
-+find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED) |
120 |
-+find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine) |
121 |
-+ |
122 |
-+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) |
123 |
-+ add_compile_definitions(WITH_WEBENGINE=1) |
124 |
-+endif() |
125 |
-+ |
126 |
- get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION) |
127 |
- message(STATUS "Using Qt ${Qt5Core_VERSION} (${QT_QMAKE_EXECUTABLE})") |
128 |
- |
129 |
-diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt |
130 |
---- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200 |
131 |
-+++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200 |
132 |
-@@ -128,12 +128,17 @@ |
133 |
- wizard/owncloudwizardcommon.cpp |
134 |
- wizard/owncloudwizard.cpp |
135 |
- wizard/owncloudwizardresultpage.cpp |
136 |
-- wizard/webviewpage.cpp |
137 |
-- wizard/webview.cpp |
138 |
- wizard/slideshow.cpp |
139 |
- wizard/welcomepage.cpp |
140 |
- wizard/linklabel.cpp |
141 |
--) |
142 |
-+ ) |
143 |
-+ |
144 |
-+if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) |
145 |
-+ list(APPEND client_SRCS |
146 |
-+ wizard/webviewpage.cpp |
147 |
-+ wizard/webview.cpp |
148 |
-+ ) |
149 |
-+endif() |
150 |
- |
151 |
- IF(BUILD_UPDATER) |
152 |
- set(updater_SRCS |
153 |
-@@ -339,9 +344,12 @@ |
154 |
- Qt5::Qml |
155 |
- Qt5::Quick |
156 |
- Qt5::QuickControls2 |
157 |
-- Qt5::WebEngineWidgets |
158 |
- ${synclib_NAME} |
159 |
--) |
160 |
-+ ) |
161 |
-+ |
162 |
-+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) |
163 |
-+ target_link_libraries(nextcloudCore PUBLIC Qt5::WebEngineWidgets) |
164 |
-+endif() |
165 |
- |
166 |
- set_target_properties(nextcloudCore |
167 |
- PROPERTIES |
168 |
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp desktop-3.2.3/src/gui/creds/webflowcredentials.cpp |
169 |
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp 2021-06-24 12:04:33.000000000 +0200 |
170 |
-+++ desktop-3.2.3/src/gui/creds/webflowcredentials.cpp 2021-07-07 20:26:40.618839464 +0200 |
171 |
-@@ -16,7 +16,9 @@ |
172 |
- #include "account.h" |
173 |
- #include "configfile.h" |
174 |
- #include "theme.h" |
175 |
-+#ifdef WITH_WEBENGINE |
176 |
- #include "wizard/webview.h" |
177 |
-+#endif // WITH_WEBENGINE |
178 |
- #include "webflowcredentialsdialog.h" |
179 |
- |
180 |
- using namespace QKeychain; |
181 |
-@@ -144,8 +146,12 @@ |
182 |
- // Do a DetermineAuthTypeJob to make sure that the server is still using Flow2 |
183 |
- auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this); |
184 |
- connect(job, &DetermineAuthTypeJob::authType, [this](DetermineAuthTypeJob::AuthType type) { |
185 |
-- // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic |
186 |
-+ // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic |
187 |
-+#ifdef WITH_WEBENGINE |
188 |
- bool useFlow2 = (type != DetermineAuthTypeJob::WebViewFlow); |
189 |
-+#else // WITH_WEBENGINE |
190 |
-+ bool useFlow2 = true; |
191 |
-+#endif // WITH_WEBENGINE |
192 |
- |
193 |
- _askDialog = new WebFlowCredentialsDialog(_account, useFlow2); |
194 |
- |
195 |
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp |
196 |
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp 2021-06-24 12:04:33.000000000 +0200 |
197 |
-+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp 2021-07-07 20:26:40.618839464 +0200 |
198 |
-@@ -8,16 +8,20 @@ |
199 |
- #include "owncloudgui.h" |
200 |
- #include "headerbanner.h" |
201 |
- #include "wizard/owncloudwizardcommon.h" |
202 |
-+#ifdef WITH_WEBENGINE |
203 |
- #include "wizard/webview.h" |
204 |
-+#endif // WITH_WEBENGINE |
205 |
- #include "wizard/flow2authwidget.h" |
206 |
- |
207 |
- namespace OCC { |
208 |
- |
209 |
- WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent) |
210 |
-- : QDialog(parent), |
211 |
-- _useFlow2(useFlow2), |
212 |
-- _flow2AuthWidget(nullptr), |
213 |
-- _webView(nullptr) |
214 |
-+ : QDialog(parent) |
215 |
-+ , _useFlow2(useFlow2) |
216 |
-+ , _flow2AuthWidget(nullptr) |
217 |
-+#ifdef WITH_WEBENGINE |
218 |
-+ , _webView(nullptr) |
219 |
-+#endif // WITH_WEBENGINE |
220 |
- { |
221 |
- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
222 |
- |
223 |
-@@ -49,10 +53,12 @@ |
224 |
- |
225 |
- _flow2AuthWidget->startAuth(account); |
226 |
- } else { |
227 |
-+#ifdef WITH_WEBENGINE |
228 |
- _webView = new WebView(); |
229 |
- _containerLayout->addWidget(_webView); |
230 |
- |
231 |
- connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched); |
232 |
-+#endif // WITH_WEBENGINE |
233 |
- } |
234 |
- |
235 |
- auto app = static_cast<Application *>(qApp); |
236 |
-@@ -73,12 +79,14 @@ |
237 |
- void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) { |
238 |
- Q_UNUSED(e) |
239 |
- |
240 |
-+#ifdef WITH_WEBENGINE |
241 |
- if (_webView) { |
242 |
- // Force calling WebView::~WebView() earlier so that _profile and _page are |
243 |
- // deleted in the correct order. |
244 |
- _webView->deleteLater(); |
245 |
- _webView = nullptr; |
246 |
- } |
247 |
-+#endif // WITH_WEBENGINE |
248 |
- |
249 |
- if (_flow2AuthWidget) { |
250 |
- _flow2AuthWidget->resetAuth(); |
251 |
-@@ -89,9 +97,14 @@ |
252 |
- emit onClose(); |
253 |
- } |
254 |
- |
255 |
--void WebFlowCredentialsDialog::setUrl(const QUrl &url) { |
256 |
-+void WebFlowCredentialsDialog::setUrl(const QUrl &url) |
257 |
-+{ |
258 |
-+#ifdef WITH_WEBENGINE |
259 |
- if (_webView) |
260 |
- _webView->setUrl(url); |
261 |
-+#else // WITH_WEBENGINE |
262 |
-+ Q_UNUSED(url); |
263 |
-+#endif // WITH_WEBENGINE |
264 |
- } |
265 |
- |
266 |
- void WebFlowCredentialsDialog::setInfo(const QString &msg) { |
267 |
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h |
268 |
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h 2021-06-24 12:04:33.000000000 +0200 |
269 |
-+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h 2021-07-07 20:26:40.618839464 +0200 |
270 |
-@@ -13,7 +13,9 @@ |
271 |
- namespace OCC { |
272 |
- |
273 |
- class HeaderBanner; |
274 |
-+#ifdef WITH_WEBENGINE |
275 |
- class WebView; |
276 |
-+#endif // WITH_WEBENGINE |
277 |
- class Flow2AuthWidget; |
278 |
- |
279 |
- class WebFlowCredentialsDialog : public QDialog |
280 |
-@@ -50,7 +52,9 @@ |
281 |
- bool _useFlow2; |
282 |
- |
283 |
- Flow2AuthWidget *_flow2AuthWidget; |
284 |
-+#ifdef WITH_WEBENGINE |
285 |
- WebView *_webView; |
286 |
-+#endif // WITH_WEBENGINE |
287 |
- |
288 |
- QLabel *_errorLabel; |
289 |
- QLabel *_infoLabel; |
290 |
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp |
291 |
---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp 2021-06-24 12:04:33.000000000 +0200 |
292 |
-+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp 2021-07-07 20:26:40.619839465 +0200 |
293 |
-@@ -119,21 +119,6 @@ |
294 |
- _ui.leUrl->setPalette(leUrlPalette); |
295 |
- } |
296 |
- |
297 |
--#ifdef WITH_PROVIDERS |
298 |
--void OwncloudSetupPage::slotLogin() |
299 |
--{ |
300 |
-- _ocWizard->setRegistration(false); |
301 |
--} |
302 |
--void OwncloudSetupPage::slotGotoProviderList() |
303 |
--{ |
304 |
-- _ocWizard->setRegistration(true); |
305 |
-- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow); |
306 |
-- _authTypeKnown = true; |
307 |
-- _checking = false; |
308 |
-- emit completeChanged(); |
309 |
--} |
310 |
--#endif |
311 |
-- |
312 |
- // slot hit from textChanged of the url entry field. |
313 |
- void OwncloudSetupPage::slotUrlChanged(const QString &url) |
314 |
- { |
315 |
-@@ -228,8 +213,10 @@ |
316 |
- return WizardCommon::Page_OAuthCreds; |
317 |
- case DetermineAuthTypeJob::LoginFlowV2: |
318 |
- return WizardCommon::Page_Flow2AuthCreds; |
319 |
-+#ifdef WITH_WEBENGINE |
320 |
- case DetermineAuthTypeJob::WebViewFlow: |
321 |
- return WizardCommon::Page_WebView; |
322 |
-+#endif // WITH_WEBENGINE |
323 |
- } |
324 |
- return WizardCommon::Page_HttpCreds; |
325 |
- } |
326 |
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h |
327 |
---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h 2021-06-24 12:04:33.000000000 +0200 |
328 |
-+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h 2021-07-07 20:26:40.617839462 +0200 |
329 |
-@@ -67,10 +67,6 @@ |
330 |
- protected slots: |
331 |
- void slotUrlChanged(const QString &); |
332 |
- void slotUrlEditFinished(); |
333 |
--#ifdef WITH_PROVIDERS |
334 |
-- void slotLogin(); |
335 |
-- void slotGotoProviderList(); |
336 |
--#endif |
337 |
- |
338 |
- void setupCustomization(); |
339 |
- |
340 |
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h |
341 |
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h 2021-06-24 12:04:33.000000000 +0200 |
342 |
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h 2021-07-07 20:26:40.619839465 +0200 |
343 |
-@@ -46,7 +46,9 @@ |
344 |
- Page_HttpCreds, |
345 |
- Page_OAuthCreds, |
346 |
- Page_Flow2AuthCreds, |
347 |
-+#ifdef WITH_WEBENGINE |
348 |
- Page_WebView, |
349 |
-+#endif // WITH_WEBENGINE |
350 |
- Page_AdvancedSetup, |
351 |
- Page_Result |
352 |
- }; |
353 |
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp |
354 |
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp 2021-06-24 12:04:33.000000000 +0200 |
355 |
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp 2021-07-07 20:26:40.619839465 +0200 |
356 |
-@@ -54,7 +54,11 @@ |
357 |
- , _flow2CredsPage(new Flow2AuthCredsPage) |
358 |
- , _advancedSetupPage(new OwncloudAdvancedSetupPage(this)) |
359 |
- , _resultPage(new OwncloudWizardResultPage) |
360 |
-+#ifdef WITH_WEBENGINE |
361 |
- , _webViewPage(new WebViewPage(this)) |
362 |
-+#else // WITH_WEBENGINE |
363 |
-+ , _webViewPage(nullptr) |
364 |
-+#endif // WITH_WEBENGINE |
365 |
- { |
366 |
- setObjectName("owncloudWizard"); |
367 |
- |
368 |
-@@ -66,7 +70,9 @@ |
369 |
- setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage); |
370 |
- setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage); |
371 |
- setPage(WizardCommon::Page_Result, _resultPage); |
372 |
-+#ifdef WITH_WEBENGINE |
373 |
- setPage(WizardCommon::Page_WebView, _webViewPage); |
374 |
-+#endif // WITH_WEBENGINE |
375 |
- |
376 |
- connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished); |
377 |
- |
378 |
-@@ -78,7 +84,9 @@ |
379 |
- connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); |
380 |
- connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); |
381 |
- connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); |
382 |
-+#ifdef WITH_WEBENGINE |
383 |
- connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); |
384 |
-+#endif // WITH_WEBENGINE |
385 |
- connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders, |
386 |
- this, &OwncloudWizard::createLocalAndRemoteFolders); |
387 |
- connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration); |
388 |
-@@ -230,9 +238,11 @@ |
389 |
- _flow2CredsPage->setConnected(); |
390 |
- break; |
391 |
- |
392 |
-+#ifdef WITH_WEBENGINE |
393 |
- case WizardCommon::Page_WebView: |
394 |
- _webViewPage->setConnected(); |
395 |
- break; |
396 |
-+#endif // WITH_WEBENGINE |
397 |
- |
398 |
- case WizardCommon::Page_AdvancedSetup: |
399 |
- _advancedSetupPage->directoriesCreated(); |
400 |
-@@ -256,8 +266,10 @@ |
401 |
- _credentialsPage = _browserCredsPage; |
402 |
- } else if (type == DetermineAuthTypeJob::LoginFlowV2) { |
403 |
- _credentialsPage = _flow2CredsPage; |
404 |
-+#ifdef WITH_WEBENGINE |
405 |
- } else if (type == DetermineAuthTypeJob::WebViewFlow) { |
406 |
- _credentialsPage = _webViewPage; |
407 |
-+#endif // WITH_WEBENGINE |
408 |
- } else { // try Basic auth even for "Unknown" |
409 |
- _credentialsPage = _httpCredsPage; |
410 |
- } |
411 |
-@@ -281,7 +293,11 @@ |
412 |
- button(QWizard::NextButton)->setHidden(true); |
413 |
- // Need to set it from here, otherwise it has no effect |
414 |
- _welcomePage->setLoginButtonDefault(); |
415 |
-- } else if (id == WizardCommon::Page_WebView || id == WizardCommon::Page_Flow2AuthCreds) { |
416 |
-+ } else if ( |
417 |
-+#ifdef WITH_WEBENGINE |
418 |
-+ id == WizardCommon::Page_WebView || |
419 |
-+#endif // WITH_WEBENGINE |
420 |
-+ id == WizardCommon::Page_Flow2AuthCreds) { |
421 |
- setButtonLayout({ QWizard::Stretch, QWizard::BackButton }); |
422 |
- } else if (id == WizardCommon::Page_AdvancedSetup) { |
423 |
- setButtonLayout({ QWizard::Stretch, QWizard::CustomButton1, QWizard::BackButton, QWizard::NextButton }); |
424 |
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h desktop-3.2.3/src/gui/wizard/owncloudwizard.h |
425 |
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h 2021-06-24 12:04:33.000000000 +0200 |
426 |
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.h 2021-07-07 20:26:40.619839465 +0200 |
427 |
-@@ -128,7 +128,7 @@ |
428 |
- OwncloudAdvancedSetupPage *_advancedSetupPage; |
429 |
- OwncloudWizardResultPage *_resultPage; |
430 |
- AbstractCredentialsWizardPage *_credentialsPage = nullptr; |
431 |
-- WebViewPage *_webViewPage; |
432 |
-+ WebViewPage *_webViewPage = nullptr; |
433 |
- |
434 |
- QStringList _setupLog; |
435 |
- |
436 |
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp desktop-3.2.3/src/gui/wizard/welcomepage.cpp |
437 |
---- desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp 2021-06-24 12:04:33.000000000 +0200 |
438 |
-+++ desktop-3.2.3/src/gui/wizard/welcomepage.cpp 2021-07-07 20:26:40.620839467 +0200 |
439 |
-@@ -13,6 +13,7 @@ |
440 |
- */ |
441 |
- |
442 |
- #include "welcomepage.h" |
443 |
-+#include "guiutility.h" |
444 |
- #include "theme.h" |
445 |
- #include "wizard/owncloudwizard.h" |
446 |
- #include "wizard/slideshow.h" |
447 |
-@@ -94,11 +95,18 @@ |
448 |
- |
449 |
- void WelcomePage::setupCreateAccountButton() |
450 |
- { |
451 |
-+#ifdef WITH_WEBENGINE |
452 |
- connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) { |
453 |
- _ocWizard->setRegistration(true); |
454 |
- _nextPage = WizardCommon::Page_WebView; |
455 |
- _ocWizard->next(); |
456 |
- }); |
457 |
-+#else // WITH_WEBENGINE |
458 |
-+ connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) { |
459 |
-+ _ocWizard->setRegistration(true); |
460 |
-+ Utility::openBrowser(QStringLiteral("https://nextcloud.com/register")); |
461 |
-+ }); |
462 |
-+#endif // WITH_WEBENGINE |
463 |
- } |
464 |
- |
465 |
- void WelcomePage::setupHostYourOwnServerLabel() |
466 |
-diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.cpp desktop-3.2.3/src/libsync/networkjobs.cpp |
467 |
---- desktop-3.2.3.orig/src/libsync/networkjobs.cpp 2021-06-24 12:04:33.000000000 +0200 |
468 |
-+++ desktop-3.2.3/src/libsync/networkjobs.cpp 2021-07-07 20:26:40.619839465 +0200 |
469 |
-@@ -30,6 +30,7 @@ |
470 |
- #include <QCoreApplication> |
471 |
- #include <QJsonDocument> |
472 |
- #include <QJsonObject> |
473 |
-+#include <qloggingcategory.h> |
474 |
- #ifndef TOKEN_AUTH_ONLY |
475 |
- #include <QPainter> |
476 |
- #include <QPainterPath> |
477 |
-@@ -958,7 +959,11 @@ |
478 |
- auto flow = gs.toObject().value("desktoplogin"); |
479 |
- if (flow != QJsonValue::Undefined) { |
480 |
- if (flow.toInt() == 1) { |
481 |
-+#ifdef WITH_WEBENGINE |
482 |
- _resultOldFlow = WebViewFlow; |
483 |
-+#else // WITH_WEBENGINE |
484 |
-+ qCWarning(lcDetermineAuthTypeJob) << "Server does only support flow1, but this client was compiled without support for flow1"; |
485 |
-+#endif // WITH_WEBENGINE |
486 |
- } |
487 |
- } |
488 |
- } |
489 |
-@@ -985,20 +990,24 @@ |
490 |
- |
491 |
- auto result = _resultPropfind; |
492 |
- |
493 |
-+#ifdef WITH_WEBENGINE |
494 |
- // WebViewFlow > OAuth > Basic |
495 |
- if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) { |
496 |
- result = WebViewFlow; |
497 |
- } |
498 |
-+#endif // WITH_WEBENGINE |
499 |
- |
500 |
- // LoginFlowV2 > WebViewFlow > OAuth > Basic |
501 |
- if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) { |
502 |
- result = LoginFlowV2; |
503 |
- } |
504 |
- |
505 |
-+#ifdef WITH_WEBENGINE |
506 |
- // If we determined that we need the webview flow (GS for example) then we switch to that |
507 |
- if (_resultOldFlow == WebViewFlow) { |
508 |
- result = WebViewFlow; |
509 |
- } |
510 |
-+#endif // WITH_WEBENGINE |
511 |
- |
512 |
- // If we determined that a simple get gave us an authentication required error |
513 |
- // then the server enforces basic auth and we got no choice but to use this |
514 |
-diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.h desktop-3.2.3/src/libsync/networkjobs.h |
515 |
---- desktop-3.2.3.orig/src/libsync/networkjobs.h 2021-06-24 12:04:33.000000000 +0200 |
516 |
-+++ desktop-3.2.3/src/libsync/networkjobs.h 2021-07-07 20:26:40.619839465 +0200 |
517 |
-@@ -444,9 +444,11 @@ |
518 |
- public: |
519 |
- enum AuthType { |
520 |
- NoAuthType, // used only before we got a chance to probe the server |
521 |
-+#ifdef WITH_WEBENGINE |
522 |
-+ WebViewFlow, |
523 |
-+#endif // WITH_WEBENGINE |
524 |
- Basic, // also the catch-all fallback for backwards compatibility reasons |
525 |
- OAuth, |
526 |
-- WebViewFlow, |
527 |
- LoginFlowV2 |
528 |
- }; |
529 |
- Q_ENUM(AuthType) |