[PR PATCH] nextcloud-client: update to 3.7.3

[PR PATCH] nextcloud-client: update to 3.7.3

[mdkcore0]

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

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

https://github.com/mdkcore0/void-packages update-nextcloud
https://github.com/void-linux/void-packages/pull/42361

nextcloud-client: update to 3.7.3
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-lib)



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

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

From dbea7d4001d9ce05472ef44624b87ef8ca2aa4ef Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Mon, 20 Feb 2023 10:31:04 -0300
Subject: [PATCH] nextcloud-client: update to 3.7.3

---
 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 34cb388eb628..9c5d1f6cae1a 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,13 +1,13 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.6.6
+version=3.7.3
 revision=1
 build_style=cmake
 configure_args="-Wno-dev"
 hostmakedepends="pkg-config inkscape"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive
  $(vopt_if dolphin 'extra-cmake-modules kio-devel')
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="qt5-graphicaleffects"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47
+checksum=4c76a01fe3249a3b6cc8217a20dde1bb12b386ebc9af82e2623e12de2c86e808
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 

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

[mdkcore0]

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

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

https://github.com/mdkcore0/void-packages update-nextcloud
https://github.com/void-linux/void-packages/pull/42361

nextcloud-client: update to 3.7.3
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-lib)



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

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

From 9dd4905b3e546c62cc2c21082d69c722d987dd72 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Mon, 20 Feb 2023 10:31:04 -0300
Subject: [PATCH] nextcloud-client: update to 3.7.3

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

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..2da0045dd389 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,13 +1,13 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.6.6
+version=3.7.3
 revision=1
 build_style=cmake
 configure_args="-Wno-dev"
 hostmakedepends="pkg-config inkscape"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-devel
  $(vopt_if dolphin 'extra-cmake-modules kio-devel')
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="qt5-graphicaleffects"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47
+checksum=4c76a01fe3249a3b6cc8217a20dde1bb12b386ebc9af82e2623e12de2c86e808
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 
@@ -76,7 +76,6 @@ nextcloud-client-dolphin_package() {
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
 		vmove usr/lib/qt5
-		vmove usr/share/kservices5
 	}
 }
 

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

[mdkcore0]

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

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

https://github.com/mdkcore0/void-packages update-nextcloud
https://github.com/void-linux/void-packages/pull/42361

nextcloud-client: update to 3.7.3
#### Testing the changes
- I tested the changes in this PR: **yes**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-lib)
- i686-libc



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

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

From e54f38899a46a804f4ea5f800ced34491ee4ac36 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Mon, 20 Feb 2023 10:31:04 -0300
Subject: [PATCH] nextcloud-client: update to 3.7.3

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

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..2da0045dd389 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,13 +1,13 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.6.6
+version=3.7.3
 revision=1
 build_style=cmake
 configure_args="-Wno-dev"
 hostmakedepends="pkg-config inkscape"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-devel
  $(vopt_if dolphin 'extra-cmake-modules kio-devel')
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="qt5-graphicaleffects"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47
+checksum=4c76a01fe3249a3b6cc8217a20dde1bb12b386ebc9af82e2623e12de2c86e808
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 
@@ -76,7 +76,6 @@ nextcloud-client-dolphin_package() {
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
 		vmove usr/lib/qt5
-		vmove usr/share/kservices5
 	}
 }
 

Re: nextcloud-client: update to 3.7.3

[mdkcore0]

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

New comment by mdkcore0 on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1437519251

Comment:
I'm getting this error while trying to build the package on armv7l (cross):
```
-- The following REQUIRED packages have not been found:

 * Qt5WebEngineWidgets (required version >= 5.15.0), Qt5 WebEngineWidgets component.
 * Qt5WebEngine (required version >= 5.15.0), Qt5 WebEngine component.
```
It failed here on Actions as well; seems the `qt5-webengine` package is missing from the armv6l and armv7l taget architectures.

Is it a known issue? Can't find something related in the issues tab (also [the logs from the latest update are not available anymore](https://github.com/void-linux/void-packages/pull/39916/checks))

Re: nextcloud-client: update to 3.7.3

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1439269100

Comment:
> Is it a known issue?

https://github.com/void-linux/void-packages/blob/master/srcpkgs/qt5-webengine/template#L56

Re: nextcloud-client: update to 3.7.3

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1439269100

Comment:
> Is it a known issue?

https://github.com/void-linux/void-packages/blob/master/srcpkgs/qt5-webengine/template#L56, but it's weird that it didn't fail successfully

Re: nextcloud-client: update to 3.7.3

[mdkcore0]

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

New comment by mdkcore0 on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1440032569

Comment:
> https://github.com/void-linux/void-packages/blob/master/srcpkgs/qt5-webengine/template#L56, but it's weird that it didn't fail successfully

yeah, this is pretty strange as it was working flawlessly in the last time I've [updated ths package](https://github.com/void-linux/void-packages/actions/runs/3968852948/jobs/6802566746); will was on IRC later today

Re: nextcloud-client: update to 3.7.3

[mdkcore0]

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

New comment by mdkcore0 on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1441889653

Comment:
they have [made WebEngine mandatory now](https://github.com/nextcloud/desktop/pull/4875), I've asked on their repo for a solution, and will try to figure out a way to remove this dependency in the meantime

Re: nextcloud-client: update to 3.7.3

[TimB87]

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

New comment by TimB87 on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1441915002

Comment:
You can revert the commit in the meantime like I did for CRUX: https://crux.nu/gitweb/?p=ports/contrib.git;a=commit;h=a3b7ed365b04b37bcbc5390e5a9b0c5c0578bbc2

not the most elegant solution, but oh well.. that wasn't the most elegant commit upstream either

hope that helps 👋 

Re: nextcloud-client: update to 3.7.3

[mdkcore0]

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

New comment by mdkcore0 on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1441994798

Comment:
> You can revert the commit in the meantime like I did for CRUX: https://crux.nu/gitweb/?p=ports/contrib.git;a=commit;h=a3b7ed365b04b37bcbc5390e5a9b0c5c0578bbc2
> 
> not the most elegant solution, but oh well.. that wasn't the most elegant commit upstream either
> 
> hope that helps wave

yeah, will do that, many thanks @TimB87!

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

[mdkcore0]

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

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

https://github.com/mdkcore0/void-packages update-nextcloud
https://github.com/void-linux/void-packages/pull/42361

nextcloud-client: update to 3.7.3
#### Testing the changes
- I tested the changes in this PR: **yes**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-lib)
- i686-libc

Also, added `karchive` as dependency following this: https://github.com/nextcloud/desktop/pull/4768

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

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

From 1875f46c4bac6a1b94a91683915593b33f5daa41 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Mon, 20 Feb 2023 10:31:04 -0300
Subject: [PATCH] nextcloud-client: update to 3.7.3

Also:
- Add karchive as dependency [1]
- Add patch to revert mandatory WebEngine dependency [2]

[1] https://github.com/nextcloud/desktop/pull/4768
[2] https://github.com/nextcloud/desktop/pull/4875
---
 .../patches/revert-mandatory-webengine.patch  | 77 +++++++++++++++++++
 srcpkgs/nextcloud-client/template             |  7 +-
 2 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch

diff --git a/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch b/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
new file mode 100644
index 000000000000..76aa42fdf54b
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
@@ -0,0 +1,77 @@
+From 02dd76cdcec49e49b60f99a98dbe241007f548d1 Mon Sep 17 00:00:00 2001
+From: Rodrigo Oliveira <mdkcore@qtrnn.io>
+Date: Thu, 23 Feb 2023 12:56:27 -0300
+Subject: [PATCH] Revert "makes Qt WebEngine optional only on macOS"
+
+This reverts commit b81cdf177d3410db45e6f97eb3575ceddabb73dd.
+---
+ src/CMakeLists.txt | 53 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 51 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a4d06844a..cd3805799 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,57 +4,8 @@ endif()
+ 
+ include(ECMEnableSanitizers)
+ 
+-set(REQUIRED_QT_VERSION "5.15.0")
+-
+-find_package(Qt5Core ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Core PROPERTIES
+-    DESCRIPTION "Qt5 Core component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5Network ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Network PROPERTIES
+-    DESCRIPTION "Qt5 Network component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5Xml ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Xml PROPERTIES
+-    DESCRIPTION "Qt5 Xml component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Concurrent PROPERTIES
+-    DESCRIPTION "Qt5 Concurrent component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-if(APPLE)
+-    set_package_properties(Qt5WebEngineWidgets PROPERTIES
+-        DESCRIPTION "Qt5 WebEngineWidgets component."
+-        TYPE RECOMMENDED
+-    )
+-else()
+-    set_package_properties(Qt5WebEngineWidgets PROPERTIES
+-        DESCRIPTION "Qt5 WebEngineWidgets component."
+-        TYPE REQUIRED
+-    )
+-endif()
+-
+-find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-if(APPLE)
+-    set_package_properties(Qt5WebEngine PROPERTIES
+-        DESCRIPTION "Qt5 WebEngine component."
+-        TYPE RECOMMENDED
+-    )
+-else()
+-    set_package_properties(Qt5WebEngine PROPERTIES
+-        DESCRIPTION "Qt5 WebEngine component."
+-        TYPE REQUIRED
+-    )
+-endif()
++find_package(Qt5 5.15 COMPONENTS Core Network Xml Concurrent REQUIRED)
++find_package(Qt5 5.15 COMPONENTS WebEngineWidgets WebEngine)
+ 
+ if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
+   add_compile_definitions(WITH_WEBENGINE=1)
+-- 
+2.39.2
+
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..2da0045dd389 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,13 +1,13 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.6.6
+version=3.7.3
 revision=1
 build_style=cmake
 configure_args="-Wno-dev"
 hostmakedepends="pkg-config inkscape"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-devel
  $(vopt_if dolphin 'extra-cmake-modules kio-devel')
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="qt5-graphicaleffects"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47
+checksum=4c76a01fe3249a3b6cc8217a20dde1bb12b386ebc9af82e2623e12de2c86e808
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 
@@ -76,7 +76,6 @@ nextcloud-client-dolphin_package() {
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
 		vmove usr/lib/qt5
-		vmove usr/share/kservices5
 	}
 }
 

Re: nextcloud-client: update to 3.7.3

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1442414057

Comment:
This probably ought to be guarded by a build option, where the default is to not revert the change and depend on `qt5-webengine`, except for those arches where we don't build that package.

Re: nextcloud-client: update to 3.7.3

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/42361#issuecomment-1442414057

Comment:
~This probably ought to be guarded by a build option, where the default is to not revert the change and depend on `qt5-webengine`, except for those arches where we don't build that package.~

Ignore me; I didn't expand the template to see that this is already the case.

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

[mdkcore0]

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

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

https://github.com/mdkcore0/void-packages update-nextcloud
https://github.com/void-linux/void-packages/pull/42361

nextcloud-client: update to 3.7.3
#### Testing the changes
- I tested the changes in this PR: **yes**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-lib)
- armv7l (crossbuild)
- i686-libc

Also:
- Add `karchive` as dependency: https://github.com/nextcloud/desktop/pull/4768
- Add patch to revert mandatory WebEngine dependency: https://github.com/nextcloud/desktop/pull/4875


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

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

From 586e7321ef1024cb0e99646761283082f4cf6046 Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Mon, 20 Feb 2023 10:31:04 -0300
Subject: [PATCH] nextcloud-client: update to 3.7.3

Also:
- Add karchive as dependency [1]
- Add patch to revert mandatory WebEngine dependency [2]

[1] https://github.com/nextcloud/desktop/pull/4768
[2] https://github.com/nextcloud/desktop/pull/4875
---
 .../patches/revert-mandatory-webengine.patch  | 77 +++++++++++++++++++
 srcpkgs/nextcloud-client/template             |  7 +-
 2 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch

diff --git a/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch b/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
new file mode 100644
index 000000000000..76aa42fdf54b
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/revert-mandatory-webengine.patch
@@ -0,0 +1,77 @@
+From 02dd76cdcec49e49b60f99a98dbe241007f548d1 Mon Sep 17 00:00:00 2001
+From: Rodrigo Oliveira <mdkcore@qtrnn.io>
+Date: Thu, 23 Feb 2023 12:56:27 -0300
+Subject: [PATCH] Revert "makes Qt WebEngine optional only on macOS"
+
+This reverts commit b81cdf177d3410db45e6f97eb3575ceddabb73dd.
+---
+ src/CMakeLists.txt | 53 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 51 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a4d06844a..cd3805799 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,57 +4,8 @@ endif()
+ 
+ include(ECMEnableSanitizers)
+ 
+-set(REQUIRED_QT_VERSION "5.15.0")
+-
+-find_package(Qt5Core ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Core PROPERTIES
+-    DESCRIPTION "Qt5 Core component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5Network ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Network PROPERTIES
+-    DESCRIPTION "Qt5 Network component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5Xml ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Xml PROPERTIES
+-    DESCRIPTION "Qt5 Xml component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-set_package_properties(Qt5Concurrent PROPERTIES
+-    DESCRIPTION "Qt5 Concurrent component."
+-    TYPE REQUIRED
+-)
+-
+-find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-if(APPLE)
+-    set_package_properties(Qt5WebEngineWidgets PROPERTIES
+-        DESCRIPTION "Qt5 WebEngineWidgets component."
+-        TYPE RECOMMENDED
+-    )
+-else()
+-    set_package_properties(Qt5WebEngineWidgets PROPERTIES
+-        DESCRIPTION "Qt5 WebEngineWidgets component."
+-        TYPE REQUIRED
+-    )
+-endif()
+-
+-find_package(Qt5WebEngine ${REQUIRED_QT_VERSION} CONFIG QUIET)
+-if(APPLE)
+-    set_package_properties(Qt5WebEngine PROPERTIES
+-        DESCRIPTION "Qt5 WebEngine component."
+-        TYPE RECOMMENDED
+-    )
+-else()
+-    set_package_properties(Qt5WebEngine PROPERTIES
+-        DESCRIPTION "Qt5 WebEngine component."
+-        TYPE REQUIRED
+-    )
+-endif()
++find_package(Qt5 5.15 COMPONENTS Core Network Xml Concurrent REQUIRED)
++find_package(Qt5 5.15 COMPONENTS WebEngineWidgets WebEngine)
+ 
+ if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
+   add_compile_definitions(WITH_WEBENGINE=1)
+-- 
+2.39.2
+
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..2da0045dd389 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,13 +1,13 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.6.6
+version=3.7.3
 revision=1
 build_style=cmake
 configure_args="-Wno-dev"
 hostmakedepends="pkg-config inkscape"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-devel
  $(vopt_if dolphin 'extra-cmake-modules kio-devel')
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="qt5-graphicaleffects"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 changelog="https://github.com/nextcloud/desktop/releases"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=04b3be9ab62eec7b81c971dc50c4e40666ee2d76c19cb72d9ad52e5a4d2edd47
+checksum=4c76a01fe3249a3b6cc8217a20dde1bb12b386ebc9af82e2623e12de2c86e808
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
 make_check=ci-skip
 
@@ -76,7 +76,6 @@ nextcloud-client-dolphin_package() {
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
 		vmove usr/lib/qt5
-		vmove usr/share/kservices5
 	}
 }
 

Re: [PR PATCH] [Merged]: nextcloud-client: update to 3.7.3

[paper42]

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

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

nextcloud-client: update to 3.7.3
https://github.com/void-linux/void-packages/pull/42361

Description:
#### Testing the changes
- I tested the changes in this PR: **yes**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-lib)
- armv7l (crossbuild)
- i686-libc

Also:
- Add `karchive` as dependency: https://github.com/nextcloud/desktop/pull/4768
- Add patch to revert mandatory WebEngine dependency: https://github.com/nextcloud/desktop/pull/4875