[PR PATCH] nextcloud-client: update to 2.6.5

[PR PATCH] nextcloud-client: update to 2.6.5

[yopito]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

There is a new pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages nextcloud.client.265
https://github.com/void-linux/void-packages/pull/23744

nextcloud-client: update to 2.6.5


A patch file from https://github.com/void-linux/void-packages/pull/23744.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud.client.265-23744.patch --]
[-- Type: text/x-diff, Size: 1217 bytes --]

From 2193ac5a512e96deae0b7f5f6a04f3b6f8f588ca Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 22 Jul 2020 20:27:23 +0200
Subject: [PATCH] nextcloud-client: update to 2.6.5

---
 srcpkgs/nextcloud-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index f08bf7dafe8..8cee44666d7 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=2.6.4
-revision=2
+version=2.6.5
+revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')"
@@ -17,7 +17,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=aea4dff6bf2a6bd2b783a6175ac2393ffcae2949536b15def7aae4372f0c24ef
+checksum=935385ff07174a4d85c2d4eda4d069aeb4aa8d0e68865b2cf8a24ca8cc883288
 
 build_options="dolphin shibboleth webengine"
 desc_option_dolphin="Build KDE dolphin support"

Re: [WIP] nextcloud-client: update to 2.6.5

[yopito]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/23744#issuecomment-662653318

Comment:
need some rework (`files/no-webengine.patch` fails)

Re: [PR PATCH] [Updated] [WIP] nextcloud-client: update to 2.6.5

[yopito]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages nextcloud.client.265
https://github.com/void-linux/void-packages/pull/23744

[WIP] nextcloud-client: update to 2.6.5


A patch file from https://github.com/void-linux/void-packages/pull/23744.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud.client.265-23744.patch --]
[-- Type: text/x-diff, Size: 8778 bytes --]

From 14c644c28b93a5a49ca97c356c6f2eb6f66d5615 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 22 Jul 2020 20:27:23 +0200
Subject: [PATCH] nextcloud-client: update to 2.6.5

---
 .../nextcloud-client/files/no-webengine.patch | 55 +++++++++----------
 srcpkgs/nextcloud-client/template             |  6 +-
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/nextcloud-client/files/no-webengine.patch b/srcpkgs/nextcloud-client/files/no-webengine.patch
index 2db0c18bf4d2..b74347271c07 100644
--- a/srcpkgs/nextcloud-client/files/no-webengine.patch
+++ b/srcpkgs/nextcloud-client/files/no-webengine.patch
@@ -1,4 +1,4 @@
-From b49d063c5244836cb72d5f0c96c2477af1b7532e Mon Sep 17 00:00:00 2001
+From d5a8d595bd9828935f143351f375aa29abeb367f Mon Sep 17 00:00:00 2001
 From: q66 <daniel@octaforge.org>
 Date: Tue, 21 Jan 2020 00:27:06 +0100
 Subject: [PATCH] Remove WebEngine requirement
@@ -19,7 +19,7 @@ Based on https://code.foxkit.us/adelie/packages/blob/master/user/nextcloud-clien
  11 files changed, 8 insertions(+), 102 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9f854b0..6f35463 100644
+index 6b0e6c249..c63766871 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -4,7 +4,7 @@ endif()
@@ -32,10 +32,10 @@ index 9f854b0..6f35463 100644
  message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
  endif()
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 2850579..8e61531 100644
+index 217db1180..6d4e7f0ed 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -35,14 +35,12 @@ set(client_UI_SRCS
+@@ -38,14 +38,12 @@ set(client_UI_SRCS
      addcertificatedialog.ui
      proxyauthdialog.ui
      mnemonicdialog.ui
@@ -50,12 +50,11 @@ index 2850579..8e61531 100644
  )
  
  set(client_SRCS
-@@ -108,24 +106,17 @@ set(client_SRCS
+@@ -110,23 +108,16 @@ set(client_SRCS
      creds/credentialsfactory.cpp
      creds/httpcredentialsgui.cpp
      creds/oauth.cpp
 -    creds/flow2auth.cpp
-     creds/keychainchunk.cpp
 -    creds/webflowcredentials.cpp
 -    creds/webflowcredentialsdialog.cpp
      wizard/postfixlineedit.cpp
@@ -75,17 +74,17 @@ index 2850579..8e61531 100644
      wizard/slideshow.cpp
  )
  
-@@ -298,7 +289,7 @@ else()
- endif()
- 
- add_library(updater STATIC ${updater_SRCS})
--target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
-+target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml)
- target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
+@@ -313,7 +304,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
  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::Network Qt5::Xml Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml)
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+ IF(BUILD_UPDATER)
+     target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
 diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
-index eec3751..c8ae72b 100644
+index eec375180..c8ae72bda 100644
 --- a/src/gui/accountmanager.cpp
 +++ b/src/gui/accountmanager.cpp
 @@ -253,20 +253,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
@@ -110,7 +109,7 @@ index eec3751..c8ae72b 100644
  
      acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
 diff --git a/src/gui/creds/credentialsfactory.cpp b/src/gui/creds/credentialsfactory.cpp
-index 6062f70..52e003b 100644
+index 6062f70eb..52e003b57 100644
 --- a/src/gui/creds/credentialsfactory.cpp
 +++ b/src/gui/creds/credentialsfactory.cpp
 @@ -21,7 +21,6 @@
@@ -131,10 +130,10 @@ index 6062f70..52e003b 100644
              qCWarning(lcGuiCredentials, "Unknown credentials type: %s", qPrintable(type));
              return new DummyCredentials;
 diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
-index 875dacf..65dea66 100644
+index eb80c6838..88206f8ea 100644
 --- a/src/gui/owncloudsetupwizard.cpp
 +++ b/src/gui/owncloudsetupwizard.cpp
-@@ -409,7 +409,7 @@ void OwncloudSetupWizard::slotAuthError()
+@@ -391,7 +391,7 @@ void OwncloudSetupWizard::slotAuthError()
  
      // bring wizard to top
      _ocWizard->bringToTop();
@@ -144,7 +143,7 @@ index 875dacf..65dea66 100644
      }
      _ocWizard->displayError(errorMsg, _ocWizard->currentId() == WizardCommon::Page_ServerSetup && checkDowngradeAdvised(reply));
 diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
-index 9a6ced7..101b5da 100644
+index f44f42761..b5414c15a 100644
 --- a/src/gui/wizard/owncloudsetuppage.cpp
 +++ b/src/gui/wizard/owncloudsetuppage.cpp
 @@ -144,7 +144,7 @@ void OwncloudSetupPage::slotLogin()
@@ -170,7 +169,7 @@ index 9a6ced7..101b5da 100644
      return WizardCommon::Page_HttpCreds;
  }
 diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
-index 2076136..bbac8a5 100644
+index 2076136ff..bbac8a567 100644
 --- a/src/gui/wizard/owncloudwizard.cpp
 +++ b/src/gui/wizard/owncloudwizard.cpp
 @@ -27,8 +27,6 @@
@@ -278,7 +277,7 @@ index 2076136..bbac8a5 100644
          // to re-open the browser.
          button(QWizard::BackButton)->setEnabled(false);
 diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
-index 3cbf89f..2eecbf9 100644
+index 3cbf89f71..2eecbf95a 100644
 --- a/src/gui/wizard/owncloudwizard.h
 +++ b/src/gui/wizard/owncloudwizard.h
 @@ -39,8 +39,6 @@ class OwncloudAdvancedSetupPage;
@@ -303,7 +302,7 @@ index 3cbf89f..2eecbf9 100644
      QStringList _setupLog;
  
 diff --git a/src/gui/wizard/owncloudwizardcommon.h b/src/gui/wizard/owncloudwizardcommon.h
-index d1f7c08..c55ed04 100644
+index d1f7c08be..c55ed04fd 100644
 --- a/src/gui/wizard/owncloudwizardcommon.h
 +++ b/src/gui/wizard/owncloudwizardcommon.h
 @@ -38,8 +38,6 @@ namespace WizardCommon {
@@ -316,10 +315,10 @@ index d1f7c08..c55ed04 100644
          Page_Result
      };
 diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
-index 76789a8..7256f60 100644
+index db7dc2c1e..2cb16a9f2 100644
 --- a/src/libsync/networkjobs.cpp
 +++ b/src/libsync/networkjobs.cpp
-@@ -881,15 +881,10 @@ void DetermineAuthTypeJob::start()
+@@ -882,15 +882,10 @@ void DetermineAuthTypeJob::start()
      // 2. checks the HTTP auth method.
      auto propfind = _account->sendRequest("PROPFIND", _account->davUrl(), req);
  
@@ -335,7 +334,7 @@ index 76789a8..7256f60 100644
  
      connect(get, &AbstractNetworkJob::redirected, this, [this, get](QNetworkReply *, const QUrl &target, int) {
  #ifndef NO_SHIBBOLETH
-@@ -919,32 +914,12 @@ void DetermineAuthTypeJob::start()
+@@ -920,32 +915,12 @@ void DetermineAuthTypeJob::start()
          _propfindDone = true;
          checkAllDone();
      });
@@ -369,7 +368,7 @@ index 76789a8..7256f60 100644
          return;
      }
  
-@@ -955,17 +930,12 @@ void DetermineAuthTypeJob::checkAllDone()
+@@ -956,17 +931,12 @@ void DetermineAuthTypeJob::checkAllDone()
  
      // WebViewFlow > OAuth > Shib > Basic
      if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
@@ -390,7 +389,7 @@ index 76789a8..7256f60 100644
  
      qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
 diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h
-index 765204c..f3ab853 100644
+index 27c81fdb6..689f72726 100644
 --- a/src/libsync/networkjobs.h
 +++ b/src/libsync/networkjobs.h
 @@ -412,8 +412,6 @@ public:
@@ -414,5 +413,5 @@ index 765204c..f3ab853 100644
  
  /**
 -- 
-2.25.0
+2.27.0
 
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index f08bf7dafe8d..8cee44666d78 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=2.6.4
-revision=2
+version=2.6.5
+revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')"
@@ -17,7 +17,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=aea4dff6bf2a6bd2b783a6175ac2393ffcae2949536b15def7aae4372f0c24ef
+checksum=935385ff07174a4d85c2d4eda4d069aeb4aa8d0e68865b2cf8a24ca8cc883288
 
 build_options="dolphin shibboleth webengine"
 desc_option_dolphin="Build KDE dolphin support"

Re: [PR PATCH] [Updated] [WIP] nextcloud-client: update to 2.6.5

[yopito]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

There is an updated pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages nextcloud.client.265
https://github.com/void-linux/void-packages/pull/23744

[WIP] nextcloud-client: update to 2.6.5


A patch file from https://github.com/void-linux/void-packages/pull/23744.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud.client.265-23744.patch --]
[-- Type: text/x-diff, Size: 8774 bytes --]

From 5bce62b107c7445ae6d264771f4d8cae7cdc671e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 22 Jul 2020 20:27:23 +0200
Subject: [PATCH] nextcloud-client: update to 2.6.5

---
 .../nextcloud-client/files/no-webengine.patch | 55 +++++++++----------
 srcpkgs/nextcloud-client/template             |  6 +-
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/nextcloud-client/files/no-webengine.patch b/srcpkgs/nextcloud-client/files/no-webengine.patch
index 2db0c18bf4d..b74347271c0 100644
--- a/srcpkgs/nextcloud-client/files/no-webengine.patch
+++ b/srcpkgs/nextcloud-client/files/no-webengine.patch
@@ -1,4 +1,4 @@
-From b49d063c5244836cb72d5f0c96c2477af1b7532e Mon Sep 17 00:00:00 2001
+From d5a8d595bd9828935f143351f375aa29abeb367f Mon Sep 17 00:00:00 2001
 From: q66 <daniel@octaforge.org>
 Date: Tue, 21 Jan 2020 00:27:06 +0100
 Subject: [PATCH] Remove WebEngine requirement
@@ -19,7 +19,7 @@ Based on https://code.foxkit.us/adelie/packages/blob/master/user/nextcloud-clien
  11 files changed, 8 insertions(+), 102 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9f854b0..6f35463 100644
+index 6b0e6c249..c63766871 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -4,7 +4,7 @@ endif()
@@ -32,10 +32,10 @@ index 9f854b0..6f35463 100644
  message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
  endif()
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 2850579..8e61531 100644
+index 217db1180..6d4e7f0ed 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -35,14 +35,12 @@ set(client_UI_SRCS
+@@ -38,14 +38,12 @@ set(client_UI_SRCS
      addcertificatedialog.ui
      proxyauthdialog.ui
      mnemonicdialog.ui
@@ -50,12 +50,11 @@ index 2850579..8e61531 100644
  )
  
  set(client_SRCS
-@@ -108,24 +106,17 @@ set(client_SRCS
+@@ -110,23 +108,16 @@ set(client_SRCS
      creds/credentialsfactory.cpp
      creds/httpcredentialsgui.cpp
      creds/oauth.cpp
 -    creds/flow2auth.cpp
-     creds/keychainchunk.cpp
 -    creds/webflowcredentials.cpp
 -    creds/webflowcredentialsdialog.cpp
      wizard/postfixlineedit.cpp
@@ -75,17 +74,17 @@ index 2850579..8e61531 100644
      wizard/slideshow.cpp
  )
  
-@@ -298,7 +289,7 @@ else()
- endif()
- 
- add_library(updater STATIC ${updater_SRCS})
--target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
-+target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml)
- target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
+@@ -313,7 +304,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
  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::Network Qt5::Xml Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml)
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+ IF(BUILD_UPDATER)
+     target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
 diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
-index eec3751..c8ae72b 100644
+index eec375180..c8ae72bda 100644
 --- a/src/gui/accountmanager.cpp
 +++ b/src/gui/accountmanager.cpp
 @@ -253,20 +253,6 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
@@ -110,7 +109,7 @@ index eec3751..c8ae72b 100644
  
      acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
 diff --git a/src/gui/creds/credentialsfactory.cpp b/src/gui/creds/credentialsfactory.cpp
-index 6062f70..52e003b 100644
+index 6062f70eb..52e003b57 100644
 --- a/src/gui/creds/credentialsfactory.cpp
 +++ b/src/gui/creds/credentialsfactory.cpp
 @@ -21,7 +21,6 @@
@@ -131,10 +130,10 @@ index 6062f70..52e003b 100644
              qCWarning(lcGuiCredentials, "Unknown credentials type: %s", qPrintable(type));
              return new DummyCredentials;
 diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
-index 875dacf..65dea66 100644
+index eb80c6838..88206f8ea 100644
 --- a/src/gui/owncloudsetupwizard.cpp
 +++ b/src/gui/owncloudsetupwizard.cpp
-@@ -409,7 +409,7 @@ void OwncloudSetupWizard::slotAuthError()
+@@ -391,7 +391,7 @@ void OwncloudSetupWizard::slotAuthError()
  
      // bring wizard to top
      _ocWizard->bringToTop();
@@ -144,7 +143,7 @@ index 875dacf..65dea66 100644
      }
      _ocWizard->displayError(errorMsg, _ocWizard->currentId() == WizardCommon::Page_ServerSetup && checkDowngradeAdvised(reply));
 diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
-index 9a6ced7..101b5da 100644
+index f44f42761..b5414c15a 100644
 --- a/src/gui/wizard/owncloudsetuppage.cpp
 +++ b/src/gui/wizard/owncloudsetuppage.cpp
 @@ -144,7 +144,7 @@ void OwncloudSetupPage::slotLogin()
@@ -170,7 +169,7 @@ index 9a6ced7..101b5da 100644
      return WizardCommon::Page_HttpCreds;
  }
 diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
-index 2076136..bbac8a5 100644
+index 2076136ff..bbac8a567 100644
 --- a/src/gui/wizard/owncloudwizard.cpp
 +++ b/src/gui/wizard/owncloudwizard.cpp
 @@ -27,8 +27,6 @@
@@ -278,7 +277,7 @@ index 2076136..bbac8a5 100644
          // to re-open the browser.
          button(QWizard::BackButton)->setEnabled(false);
 diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
-index 3cbf89f..2eecbf9 100644
+index 3cbf89f71..2eecbf95a 100644
 --- a/src/gui/wizard/owncloudwizard.h
 +++ b/src/gui/wizard/owncloudwizard.h
 @@ -39,8 +39,6 @@ class OwncloudAdvancedSetupPage;
@@ -303,7 +302,7 @@ index 3cbf89f..2eecbf9 100644
      QStringList _setupLog;
  
 diff --git a/src/gui/wizard/owncloudwizardcommon.h b/src/gui/wizard/owncloudwizardcommon.h
-index d1f7c08..c55ed04 100644
+index d1f7c08be..c55ed04fd 100644
 --- a/src/gui/wizard/owncloudwizardcommon.h
 +++ b/src/gui/wizard/owncloudwizardcommon.h
 @@ -38,8 +38,6 @@ namespace WizardCommon {
@@ -316,10 +315,10 @@ index d1f7c08..c55ed04 100644
          Page_Result
      };
 diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
-index 76789a8..7256f60 100644
+index db7dc2c1e..2cb16a9f2 100644
 --- a/src/libsync/networkjobs.cpp
 +++ b/src/libsync/networkjobs.cpp
-@@ -881,15 +881,10 @@ void DetermineAuthTypeJob::start()
+@@ -882,15 +882,10 @@ void DetermineAuthTypeJob::start()
      // 2. checks the HTTP auth method.
      auto propfind = _account->sendRequest("PROPFIND", _account->davUrl(), req);
  
@@ -335,7 +334,7 @@ index 76789a8..7256f60 100644
  
      connect(get, &AbstractNetworkJob::redirected, this, [this, get](QNetworkReply *, const QUrl &target, int) {
  #ifndef NO_SHIBBOLETH
-@@ -919,32 +914,12 @@ void DetermineAuthTypeJob::start()
+@@ -920,32 +915,12 @@ void DetermineAuthTypeJob::start()
          _propfindDone = true;
          checkAllDone();
      });
@@ -369,7 +368,7 @@ index 76789a8..7256f60 100644
          return;
      }
  
-@@ -955,17 +930,12 @@ void DetermineAuthTypeJob::checkAllDone()
+@@ -956,17 +931,12 @@ void DetermineAuthTypeJob::checkAllDone()
  
      // WebViewFlow > OAuth > Shib > Basic
      if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
@@ -390,7 +389,7 @@ index 76789a8..7256f60 100644
  
      qCInfo(lcDetermineAuthTypeJob) << "Auth type for" << _account->davUrl() << "is" << result;
 diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h
-index 765204c..f3ab853 100644
+index 27c81fdb6..689f72726 100644
 --- a/src/libsync/networkjobs.h
 +++ b/src/libsync/networkjobs.h
 @@ -412,8 +412,6 @@ public:
@@ -414,5 +413,5 @@ index 765204c..f3ab853 100644
  
  /**
 -- 
-2.25.0
+2.27.0
 
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index f08bf7dafe8..8cee44666d7 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=2.6.4
-revision=2
+version=2.6.5
+revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')"
@@ -17,7 +17,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=aea4dff6bf2a6bd2b783a6175ac2393ffcae2949536b15def7aae4372f0c24ef
+checksum=935385ff07174a4d85c2d4eda4d069aeb4aa8d0e68865b2cf8a24ca8cc883288
 
 build_options="dolphin shibboleth webengine"
 desc_option_dolphin="Build KDE dolphin support"

Re: nextcloud-client: update to 2.6.5

[yopito]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/23744#issuecomment-678666257

Comment:
superseeded by #24421

Re: [PR PATCH] [Closed]: nextcloud-client: update to 2.6.5

[yopito]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

There's a closed pull request on the void-packages repository

nextcloud-client: update to 2.6.5
https://github.com/void-linux/void-packages/pull/23744

Description: