[PR PATCH] nextcloud-client: update to 3.15.3.

[PR PATCH] nextcloud-client: update to 3.15.3.

[tornaria]

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

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

https://github.com/tornaria/void-packages nextcloud
https://github.com/void-linux/void-packages/pull/54447

nextcloud-client: update to 3.15.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From dd18cb07ed724996f97f4ab11b97c8bf49e7b323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 21 Feb 2025 12:08:06 -0300
Subject: [PATCH] nextcloud-client: update to 3.15.3.

---
 srcpkgs/nextcloud-client/template | 54 ++++++++-----------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index bf9bb259f8d153..1a72a1a3e7e8c5 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,18 +1,16 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.13.3
+version=3.15.3
 revision=1
 build_style=cmake
-configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=OFF -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 karchive-devel
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- $(vopt_if dolphin 'extra-cmake-modules kio-devel')
- $(vopt_if webengine 'qt5-webengine-devel')"
-depends="qt5-graphicaleffects kguiaddons"
-checkdepends="cmocka-devel"
+configure_args="-Wno-dev -DBUILD_UPDATER=NO -DUNIT_TESTING=1
+ $(vopt_if webengine '' -DBUILD_WITH_WEBENGINE=OFF)
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools inkscape"
+makedepends="qt6-base-private-devel qt6-qt5compat-devel qt6-declarative-devel
+ qtkeychain-qt6-devel qt6-websockets-devel qt6-svg-devel
+ $(vopt_if webengine qt6-webengine-devel)
+ kf6-karchive-devel kf6-kguiaddons-devel kf6-kio-devel cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
 short_desc="NextCloud Desktop client"
 maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
@@ -20,38 +18,14 @@ 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=4f1b0ffae207a8ab29d10f9cb6d51e107263cf45d138234bd8be1554eb12661f
+checksum=5a4b12604c84b8986f2aee7462bb9683fb01f4ae28ee9d6882068cb9cac45773
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
-make_check=ci-skip
 
-build_options="dolphin webengine"
-desc_option_dolphin="Build KDE dolphin support"
+build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
-build_options_default="dolphin"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default+=" webengine"
-	fi
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
-	# provides desktoptojson
-	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
-fi
-
-subpackages="nextcloud-client-kwallet nextcloud-client-devel"
-subpackages+=" $(vopt_if dolphin 'nextcloud-client-dolphin')"
-
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DUNIT_TESTING=1"
-	# argp.h is used only by testing and is not a requirement.
-	# 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";;
-	esac
+if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
+	build_options_default+=" webengine"
 fi
 
 nextcloud-client-kwallet_package() {
@@ -76,7 +50,7 @@ nextcloud-client-dolphin_package() {
 	depends="nextcloud-client>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
-		vmove usr/lib/qt5
+		vmove usr/lib/qt6
 	}
 }
 

Re: nextcloud-client: update to 3.15.3.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/54447#issuecomment-2676351861

Comment:
@mdkcore0 here's an update to current nextcloud-client.

There's one failing test on i686 which I don't know what to do about. it's about files > 2G and it already fails in the current version 3.13.3, but since ci test was disabled we don't know how old is this! Maybe it's a false positive but maybe it's an actual bug; this fails locally as well (did you ever tested i686 locally? since you have ci test disabled you should...)

I enabled ci testing and there are three further failures in all architectures that are possibly false positives (fail only on CI, not locally):
```
FAIL!  : TestSyncVirtualFiles::testLockFile_lockedFileReadOnly_afterSync() '!localFileLocked.isWritable()' returned FALSE. ()
FAIL!  : TestDownload::testMoveFailsInAConflict() '!fakeFolder.syncOnce()' returned FALSE. ()
FAIL!  : TestLockFile::testLockFile_lockedFileReadOnly_afterSync() '!localFileLocked.isWritable()' returned FALSE. ()
```
I should point out that the first two tests are present in `owncloudclient` and they pass, so it's possible that there are fixes to be found in there. See https://github.com/void-linux/void-packages/actions/runs/13249328574/job/36983286864?pr=54279#step:7:2675

Re: nextcloud-client: update to 3.15.3.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/54447#issuecomment-2676351861

Comment:
@mdkcore0 here's an update to current nextcloud-client.

There's one failing test on i686 which I don't know what to do about. it's about files > 2G and it already fails in the current version 3.13.3, but since ci test was disabled we don't know how old is this! Maybe it's a false positive but maybe it's an actual bug; this fails locally as well (did you ever tested i686 locally? since you have ci test disabled you should...)

I enabled ci testing and there are three further failures in all architectures that are possibly false positives (fail only on CI, not locally):
```
FAIL!  : TestSyncVirtualFiles::testLockFile_lockedFileReadOnly_afterSync() '!localFileLocked.isWritable()' returned FALSE. ()
FAIL!  : TestDownload::testMoveFailsInAConflict() '!fakeFolder.syncOnce()' returned FALSE. ()
FAIL!  : TestLockFile::testLockFile_lockedFileReadOnly_afterSync() '!localFileLocked.isWritable()' returned FALSE. ()
```
~~I should point out that the first two tests are present in `owncloudclient` and they pass, so it's possible that there are fixes to be found in there.~~ See https://github.com/void-linux/void-packages/actions/runs/13249328574/job/36983286864?pr=54279#step:7:2675

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

[tornaria]

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

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

https://github.com/tornaria/void-packages nextcloud
https://github.com/void-linux/void-packages/pull/54447

nextcloud-client: update to 3.15.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From d7d8a6b8a241387a2f375d6dd454488802d3da89 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 22 Feb 2025 15:58:23 -0500
Subject: [PATCH 1/5] tmp

---
 .github/workflows/build.yaml | 25 +++++++++++--------------
 common/travis/prepare.sh     |  7 -------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 574e6a6584c98e..40d620fea08b91 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -61,8 +61,8 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20250214R1
-      options: --platform ${{ matrix.config.platform }}
+      image: ghcr.io/void-linux/void-${{ matrix.config.libc }}:20250214R1
+      options: --platform ${{ matrix.config.platform }} --cap-add sys_admin
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'
@@ -88,24 +88,21 @@ jobs:
           # switch to repo-ci mirror
           mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
           sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
-          # Sync and upgrade once, assume error comes from xbps update
-          xbps-install -Syu || xbps-install -yu xbps
-          # Upgrade again (in case there was a xbps update)
-          xbps-install -yu
+          # install dependencies
+          xbps-install -Syu xbps && xbps-install -yu && xbps-install -y sudo bash curl git
+          # create non-root user
+          useradd -M builder
 
       - name: Clone and checkout
-        env:
-          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-          ln -s "$(pwd)" /hostrepo &&
-          common/travis/set_mirror.sh &&
-          common/travis/prepare.sh &&
-          common/travis/fetch-xtools.sh
+          pwd
+          ls -l
+          sudo -u builder common/travis/set_mirror.sh &&
+          sudo -u builder common/travis/prepare.sh &&
+          sudo -u builder common/travis/fetch-xtools.sh
       - name: Find changed templates
-        env:
-          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         run: common/travis/changed_templates.sh
 
       - name: Build and check packages
diff --git a/common/travis/prepare.sh b/common/travis/prepare.sh
index 46072e9f81ea9c..e16cdaea9c8a06 100755
--- a/common/travis/prepare.sh
+++ b/common/travis/prepare.sh
@@ -5,10 +5,3 @@
 /bin/echo -e '\x1b[32mUpdating etc/conf...\x1b[0m'
 echo XBPS_BUILD_ENVIRONMENT=void-packages-ci >> etc/conf
 echo XBPS_ALLOW_RESTRICTED=yes >> etc/conf
-
-/bin/echo -e '\x1b[32mEnabling ethereal chroot-style...\x1b[0m'
-echo XBPS_CHROOT_CMD=ethereal >> etc/conf
-echo XBPS_ALLOW_CHROOT_BREAKOUT=yes >> etc/conf
-
-/bin/echo -e '\x1b[32mLinking / to /masterdir...\x1b[0m'
-ln -s / masterdir

From 07d6621058666c28c749a2cc0e594d7e8d9013de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 22 Feb 2025 15:58:34 -0500
Subject: [PATCH 2/5] chezmoi: test

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 7beffb518416eb..edd47422ebbff0 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.59.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From 7f02ce483259be5971a6ef0d64b29a2e3d40d245 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 22 Feb 2025 16:02:44 -0500
Subject: [PATCH 3/5] fixup! tmp

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 40d620fea08b91..843d0bc96e0c59 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -61,7 +61,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: ghcr.io/void-linux/void-${{ matrix.config.libc }}:20250214R1
+      image: ghcr.io/void-linux/void-${{ matrix.config.libc }}-full:20250214R1
       options: --platform ${{ matrix.config.platform }} --cap-add sys_admin
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'

From 9c88a90ff1588c41da8a73e26ce85f53728a909e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 22 Feb 2025 16:05:06 -0500
Subject: [PATCH 4/5] fixup! fixup! tmp

---
 .github/workflows/build.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 843d0bc96e0c59..98a74bbd878636 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -97,8 +97,7 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-          pwd
-          ls -l
+          chown -R builder:builder . &&
           sudo -u builder common/travis/set_mirror.sh &&
           sudo -u builder common/travis/prepare.sh &&
           sudo -u builder common/travis/fetch-xtools.sh

From f564d209067291ee84313230f8c0f59140555748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 21 Feb 2025 12:08:06 -0300
Subject: [PATCH 5/5] nextcloud-client: update to 3.15.3.

---
 srcpkgs/nextcloud-client/template | 54 ++++++++-----------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index bf9bb259f8d153..1a72a1a3e7e8c5 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,18 +1,16 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.13.3
+version=3.15.3
 revision=1
 build_style=cmake
-configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=OFF -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 karchive-devel
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- $(vopt_if dolphin 'extra-cmake-modules kio-devel')
- $(vopt_if webengine 'qt5-webengine-devel')"
-depends="qt5-graphicaleffects kguiaddons"
-checkdepends="cmocka-devel"
+configure_args="-Wno-dev -DBUILD_UPDATER=NO -DUNIT_TESTING=1
+ $(vopt_if webengine '' -DBUILD_WITH_WEBENGINE=OFF)
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools inkscape"
+makedepends="qt6-base-private-devel qt6-qt5compat-devel qt6-declarative-devel
+ qtkeychain-qt6-devel qt6-websockets-devel qt6-svg-devel
+ $(vopt_if webengine qt6-webengine-devel)
+ kf6-karchive-devel kf6-kguiaddons-devel kf6-kio-devel cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
 short_desc="NextCloud Desktop client"
 maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
@@ -20,38 +18,14 @@ 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=4f1b0ffae207a8ab29d10f9cb6d51e107263cf45d138234bd8be1554eb12661f
+checksum=5a4b12604c84b8986f2aee7462bb9683fb01f4ae28ee9d6882068cb9cac45773
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
-make_check=ci-skip
 
-build_options="dolphin webengine"
-desc_option_dolphin="Build KDE dolphin support"
+build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
-build_options_default="dolphin"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default+=" webengine"
-	fi
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
-	# provides desktoptojson
-	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
-fi
-
-subpackages="nextcloud-client-kwallet nextcloud-client-devel"
-subpackages+=" $(vopt_if dolphin 'nextcloud-client-dolphin')"
-
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DUNIT_TESTING=1"
-	# argp.h is used only by testing and is not a requirement.
-	# 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";;
-	esac
+if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
+	build_options_default+=" webengine"
 fi
 
 nextcloud-client-kwallet_package() {
@@ -76,7 +50,7 @@ nextcloud-client-dolphin_package() {
 	depends="nextcloud-client>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
-		vmove usr/lib/qt5
+		vmove usr/lib/qt6
 	}
 }
 

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

[tornaria]

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

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

https://github.com/tornaria/void-packages nextcloud
https://github.com/void-linux/void-packages/pull/54447

nextcloud-client: update to 3.15.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 0aa09bdf52f474d266ffac4d1957113176bf9de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 21 Feb 2025 12:08:06 -0300
Subject: [PATCH] nextcloud-client: update to 3.15.3.

---
 srcpkgs/nextcloud-client/template | 54 ++++++++-----------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index bf9bb259f8d153..1a72a1a3e7e8c5 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,18 +1,16 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.13.3
+version=3.15.3
 revision=1
 build_style=cmake
-configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=OFF -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 karchive-devel
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- $(vopt_if dolphin 'extra-cmake-modules kio-devel')
- $(vopt_if webengine 'qt5-webengine-devel')"
-depends="qt5-graphicaleffects kguiaddons"
-checkdepends="cmocka-devel"
+configure_args="-Wno-dev -DBUILD_UPDATER=NO -DUNIT_TESTING=1
+ $(vopt_if webengine '' -DBUILD_WITH_WEBENGINE=OFF)
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools inkscape"
+makedepends="qt6-base-private-devel qt6-qt5compat-devel qt6-declarative-devel
+ qtkeychain-qt6-devel qt6-websockets-devel qt6-svg-devel
+ $(vopt_if webengine qt6-webengine-devel)
+ kf6-karchive-devel kf6-kguiaddons-devel kf6-kio-devel cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
 short_desc="NextCloud Desktop client"
 maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
@@ -20,38 +18,14 @@ 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=4f1b0ffae207a8ab29d10f9cb6d51e107263cf45d138234bd8be1554eb12661f
+checksum=5a4b12604c84b8986f2aee7462bb9683fb01f4ae28ee9d6882068cb9cac45773
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
-make_check=ci-skip
 
-build_options="dolphin webengine"
-desc_option_dolphin="Build KDE dolphin support"
+build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
-build_options_default="dolphin"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default+=" webengine"
-	fi
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
-	# provides desktoptojson
-	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
-fi
-
-subpackages="nextcloud-client-kwallet nextcloud-client-devel"
-subpackages+=" $(vopt_if dolphin 'nextcloud-client-dolphin')"
-
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DUNIT_TESTING=1"
-	# argp.h is used only by testing and is not a requirement.
-	# 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";;
-	esac
+if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
+	build_options_default+=" webengine"
 fi
 
 nextcloud-client-kwallet_package() {
@@ -76,7 +50,7 @@ nextcloud-client-dolphin_package() {
 	depends="nextcloud-client>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
-		vmove usr/lib/qt5
+		vmove usr/lib/qt6
 	}
 }
 

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

[tornaria]

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

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

https://github.com/tornaria/void-packages nextcloud
https://github.com/void-linux/void-packages/pull/54447

nextcloud-client: update to 3.15.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 2a916dffe942331d283f8ff2dd96b0ea4169a273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 21 Feb 2025 12:08:06 -0300
Subject: [PATCH] nextcloud-client: update to 3.15.3.

---
 .../patches/fix-test-as-root.patch            | 35 ++++++++++++
 srcpkgs/nextcloud-client/template             | 54 +++++--------------
 2 files changed, 49 insertions(+), 40 deletions(-)
 create mode 100644 srcpkgs/nextcloud-client/patches/fix-test-as-root.patch

diff --git a/srcpkgs/nextcloud-client/patches/fix-test-as-root.patch b/srcpkgs/nextcloud-client/patches/fix-test-as-root.patch
new file mode 100644
index 00000000000000..704b07ecc2e8bd
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/fix-test-as-root.patch
@@ -0,0 +1,35 @@
+--- a/test/testlockfile.cpp
++++ b/test/testlockfile.cpp
+@@ -766,7 +766,8 @@
+         QCOMPARE(fakeFolder.currentRemoteState(), expectedState);
+ 
+         const auto localFileLocked = QFileInfo{fakeFolder.localPath() + u"A/a1"};
+-        QVERIFY(!localFileLocked.isWritable());
++        if (getuid() != 0)
++            QVERIFY(!localFileLocked.isWritable());
+     }
+ 
+     void testLockFile_lockFile_detect_newly_uploaded()
+--- a/test/testdownload.cpp
++++ b/test/testdownload.cpp
+@@ -155,6 +155,8 @@
+     }
+ 
+     void testMoveFailsInAConflict() {
++        if (getuid() == 0)
++            QSKIP("Not run on root because permissions are not enforced");
+ #ifdef Q_OS_WIN
+         QSKIP("Not run on windows because permission on directory does not do what is expected");
+ #endif
+--- a/test/testsyncvirtualfiles.cpp
++++ b/test/testsyncvirtualfiles.cpp
+@@ -1979,7 +1979,8 @@
+         QVERIFY(fileRecordLocked._lockstate._locked);
+ 
+         const auto localFileLocked = QFileInfo{fakeFolder.localPath() + u"A/a1" + DVSUFFIX};
+-        QVERIFY(!localFileLocked.isWritable());
++        if (getuid() != 0)
++            QVERIFY(!localFileLocked.isWritable());
+     }
+ };
+ 
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index bf9bb259f8d153..1a72a1a3e7e8c5 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,18 +1,16 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.13.3
+version=3.15.3
 revision=1
 build_style=cmake
-configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=OFF -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 karchive-devel
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- $(vopt_if dolphin 'extra-cmake-modules kio-devel')
- $(vopt_if webengine 'qt5-webengine-devel')"
-depends="qt5-graphicaleffects kguiaddons"
-checkdepends="cmocka-devel"
+configure_args="-Wno-dev -DBUILD_UPDATER=NO -DUNIT_TESTING=1
+ $(vopt_if webengine '' -DBUILD_WITH_WEBENGINE=OFF)
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools inkscape"
+makedepends="qt6-base-private-devel qt6-qt5compat-devel qt6-declarative-devel
+ qtkeychain-qt6-devel qt6-websockets-devel qt6-svg-devel
+ $(vopt_if webengine qt6-webengine-devel)
+ kf6-karchive-devel kf6-kguiaddons-devel kf6-kio-devel cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
 short_desc="NextCloud Desktop client"
 maintainer="Rodrigo Oliveira <mdkcore@qtrnn.io>"
@@ -20,38 +18,14 @@ 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=4f1b0ffae207a8ab29d10f9cb6d51e107263cf45d138234bd8be1554eb12661f
+checksum=5a4b12604c84b8986f2aee7462bb9683fb01f4ae28ee9d6882068cb9cac45773
 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
-make_check=ci-skip
 
-build_options="dolphin webengine"
-desc_option_dolphin="Build KDE dolphin support"
+build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
-build_options_default="dolphin"
 
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default+=" webengine"
-	fi
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
-	# provides desktoptojson
-	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
-fi
-
-subpackages="nextcloud-client-kwallet nextcloud-client-devel"
-subpackages+=" $(vopt_if dolphin 'nextcloud-client-dolphin')"
-
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DUNIT_TESTING=1"
-	# argp.h is used only by testing and is not a requirement.
-	# 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";;
-	esac
+if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
+	build_options_default+=" webengine"
 fi
 
 nextcloud-client-kwallet_package() {
@@ -76,7 +50,7 @@ nextcloud-client-dolphin_package() {
 	depends="nextcloud-client>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/libnextclouddolphinpluginhelper.so
-		vmove usr/lib/qt5
+		vmove usr/lib/qt6
 	}
 }
 

Re: nextcloud-client: update to 3.15.3.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/54447#issuecomment-2676433583

Comment:
Fixed CI by skipping some tests when `getuid() == 0`. This could be upstreamed.

The i686 failure remains *but it's not new*.

Re: nextcloud-client: update to 3.15.3.

[mdkcore0]

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

New comment by mdkcore0 on void-packages repository

https://github.com/void-linux/void-packages/pull/54447#issuecomment-2678523352

Comment:
hey, thanks for it! I will try to build your branch here (maybe tommorrow), and check how we can manage to get it merged asap :D

Re: nextcloud-client: update to 3.15.3.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/54447#issuecomment-2846037845

Comment:
@mdkcore0 in the end, I didn't like this client and I'll stick to `owncloudclient`, so I'm not working on this anymore.

Feel free to work on this starting with the changes here. There's now a new version of `nextcloud-client` (3.16.4), it needs some `libp11` which is not available in void, you will need to package that.

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

[tornaria]

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

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

nextcloud-client: update to 3.15.3.
https://github.com/void-linux/void-packages/pull/54447

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: nextcloud-client: update to 3.15.3.

[mdkcore0]

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

New comment by mdkcore0 on void-packages repository

https://github.com/void-linux/void-packages/pull/54447#issuecomment-2963972429

Comment:
hi @tornaria, sorry for not being able to answer before; finally I will have some time after next week, so I'll try to update it following what you achieved, many thanks!!