From 6f727d6d59ed244e942c6109ad31be32a0324ea0 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Tue, 15 Dec 2020 13:51:21 +0100
Subject: [PATCH] nextcloud-client: update to 3.1.0

Closes: #27168 [via git-merge-pr]
---
 .../patches/no-webengine-support.patch              | 13 ++++++++-----
 .../patches/testfolderman-within-chroot.patch       |  2 +-
 srcpkgs/nextcloud-client/template                   |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
index 824c30d4c1..0d2642870c 100644
--- a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
+++ b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
@@ -1,6 +1,9 @@
 source: https://github.com/nextcloud/desktop/pull/2204/
 *partial* pick since 2nd commit 1f577e5 is broken ("Try to preserve flow2")
 
+src/gui/CMakeLists.txt diff modified to support nextcloud client 3.1.0
+(git commit is then partially modified)
+
 From 5b6bde1c206c9b1edb0472a823776bdc91488db3 Mon Sep 17 00:00:00 2001
 From: Max Rees <maxcrees@me.com>
 Date: Sun, 23 Feb 2020 23:09:29 -0600
@@ -60,7 +63,7 @@ diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
 index 2f1e99e2b..c5be00c37 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -111,23 +111,16 @@ set(client_SRCS
+@@ -119,23 +119,16 @@
      creds/credentialsfactory.cpp
      creds/httpcredentialsgui.cpp
      creds/oauth.cpp
@@ -84,7 +87,7 @@ index 2f1e99e2b..c5be00c37 100644
      wizard/slideshow.cpp
  )
  
-@@ -148,6 +141,18 @@ IF(BUILD_UPDATER)
+@@ -156,6 +149,18 @@
      )
  endif()
  
@@ -103,12 +106,12 @@ index 2f1e99e2b..c5be00c37 100644
  IF( APPLE )
      list(APPEND client_SRCS cocoainitializer_mac.mm)
      list(APPEND client_SRCS socketapisocket_mac.mm)
-@@ -314,8 +319,11 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+@@ -328,8 +333,11 @@
  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::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
-+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
+-target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
 +IF(NOT NO_WEBENGINE)
 +    target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::WebEngineWidgets )
diff --git a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
index ab7feba8a3..b049701370 100644
--- a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
+++ b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
@@ -1,4 +1,4 @@
-is wrong if running within a chroot
+is wrong if running within a user's chroot
 
 --- test/testfolderman.cpp.ORIG	2020-09-24 14:51:48.000000000 +0200
 +++ test/testfolderman.cpp	2020-10-02 20:33:32.248359240 +0200
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index d696e58ac3..ae9d28117d 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,6 +1,6 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.0.3
+version=3.1.0
 revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
@@ -21,7 +21,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=abd021ff06ecb267221a221dbf8b4efd3bd8e418053cc49b6b6faa290717c6d8
+checksum=11b8a03ddb4f8c60ecffcd738cdcd5d6738f92686809da1f81ebeff97a99e314
 
 build_options="dolphin shibboleth webengine"
 desc_option_dolphin="Build KDE dolphin support"
@@ -46,7 +46,7 @@ subpackages="$(vopt_if dolphin 'nextcloud-client-dolphin') nextcloud-client-deve
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DUNIT_TESTING=1"
 	# argp.h is used only by testing and is not a requirement.
-	# since usable (linking fails), let's disable it instead
+	# since unusable (linking fails), let's disable it instead
 	case "$XBPS_TARGET_MACHINE" in
 		#*-musl) export LDFLAGS=-largp;;
 		*-musl) configure_args+=" -DHAVE_ARGP_H=0";;