[PR PATCH] owncloudclient: update to 5.3.2.

[PR PATCH] owncloudclient: update to 5.3.2.

[tornaria]

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

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

https://github.com/tornaria/void-packages owncloudclient
https://github.com/void-linux/void-packages/pull/54279

owncloudclient: update to 5.3.2.
- **qtkeychain-qt6: update to 0.15.0.**
- **owncloudclient: update to 5.3.2.**

<!-- 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/54279.patch is attached

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

From a2c8eb9b673265bd327da379d2567da61df9d013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 6 Feb 2025 15:25:45 -0300
Subject: [PATCH 1/2] qtkeychain-qt6: update to 0.15.0.

---
 srcpkgs/qtkeychain-qt6/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
index 8df8df2da81931..c13b9606422325 100644
--- a/srcpkgs/qtkeychain-qt6/template
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -1,6 +1,6 @@
 # Template file for 'qtkeychain-qt6'
 pkgname=qtkeychain-qt6
-version=0.14.3
+version=0.15.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_WITH_QT6=ON
@@ -13,7 +13,8 @@ license="BSD-2-Clause"
 homepage="https://github.com/frankosterfeld/qtkeychain"
 changelog="https://raw.githubusercontent.com/frankosterfeld/qtkeychain/main/ChangeLog"
 distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
-checksum=a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7
+checksum=f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22
+make_check=no # tests need X11 ?
 
 post_install() {
 	vlicense COPYING

From 92d17f07e873a9cb48832907e1ac4f084bf4db74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 6 Feb 2025 15:26:58 -0300
Subject: [PATCH 2/2] owncloudclient: update to 5.3.2.

---
 srcpkgs/owncloudclient/patches/11943.patch | 33 ++++++++++++++++++++++
 srcpkgs/owncloudclient/template            |  4 +--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/owncloudclient/patches/11943.patch

diff --git a/srcpkgs/owncloudclient/patches/11943.patch b/srcpkgs/owncloudclient/patches/11943.patch
new file mode 100644
index 00000000000000..d67673037cd4a6
--- /dev/null
+++ b/srcpkgs/owncloudclient/patches/11943.patch
@@ -0,0 +1,33 @@
+From 9a5721c8f3f67c2e549fb713051af92c69b30a7d Mon Sep 17 00:00:00 2001
+From: Hannah von Reth <hannah.vonreth@owncloud.com>
+Date: Fri, 18 Oct 2024 10:11:27 +0200
+Subject: [PATCH] Qt6.8 build fix
+
+---
+ test/testcredentialmanager.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/testcredentialmanager.cpp b/test/testcredentialmanager.cpp
+index 8881cb98388..90bead31e2a 100644
+--- a/test/testcredentialmanager.cpp
++++ b/test/testcredentialmanager.cpp
+@@ -112,8 +112,8 @@ private Q_SLOTS:
+         QTest::qWait(1000);
+         for (const auto s : spies) {
+             QCOMPARE(s->count(), 1);
+-            s->deleteLater();
+         }
++        qDeleteAll(spies);
+         spies.clear();
+         {
+             auto jobs = creds->clear(QStringLiteral("foo"));
+@@ -131,8 +131,8 @@ private Q_SLOTS:
+             QTest::qWait(1000);
+             for (const auto s : spies) {
+                 QCOMPARE(s->count(), 1);
+-                s->deleteLater();
+             }
++            qDeleteAll(spies);
+         }
+     }
+ };
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 84299932768c4d..fa3bb12f0cbcd2 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,6 +1,6 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=5.3.1
+version=5.3.2
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.owncloud.org"
 changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md"
 distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
-checksum=457faec63a3a90cfe333d751cf325b827a82bdfefe3037728175bc361eb27564
+checksum=3663a168bd0a8cbc0539ef98c6a0acd9035dafee17fba7de8e797cf12805952e
 
 owncloudclient-kde5_package() {
 	# kde5 integration has been moved to:

Re: [PR REVIEW] owncloudclient: update to 5.3.2.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54279#discussion_r1958998186

Comment:
try `make_check_pre="xvfb-run"

Re: [PR REVIEW] owncloudclient: update to 5.3.2.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54279#discussion_r1958998186

Comment:
try `make_check_pre="xvfb-run"` and adding `xvfb-run` to `checkdepends`

Re: [PR REVIEW] owncloudclient: update to 5.3.2.

[tornaria]

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

New review comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/54279#discussion_r1959730942

Comment:
Also needs a keyring, and it still doesn't seem to work. Note that this is not a test that broke: there were no tests in the previous version.

Here's my attempt (to try, rebase for gnome-keyring):
```diff
--- a/srcpkgs/qtkeychain-qt6/template
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -14,7 +14,8 @@ homepage="https://github.com/frankosterfeld/qtkeychain"
 changelog="https://raw.githubusercontent.com/frankosterfeld/qtkeychain/main/ChangeLog"
 distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
 checksum=f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22
-make_check=no # tests need X11 ?
+checkdepends="xvfb-run dbus-x11 dbus gnome-keyring"
+make_check_pre="xvfb-run"
 
 post_install() {
        vlicense COPYING
```

But
```
=> qtkeychain-qt6-0.15.0_1: running do_check ...
[0/1] Running tests...
Test project /builddir/qtkeychain-qt6-0.15.0/build
    Start 1: basic
1/1 Test #1: basic ............................***Failed   29.92 sec
********* Start testing of BasicTest *********
Config: Using QtTest library 6.8.1, Qt 6.8.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 13.2.0), void unknown
PASS   : BasicTest::initTestCase()
QDEBUG : BasicTest::test(normal password) ""
FAIL!  : BasicTest::test(normal password) Compared values are not the same
   Actual   (readJob.error())   : 1
   Expected (QKeychain::NoError): 0
   Loc: [/builddir/qtkeychain-qt6-0.15.0/autotest/basic.cpp(58)]
QDEBUG : BasicTest::test(1000) ""
FAIL!  : BasicTest::test(1000) Compared values are not the same
   Actual   (readJob.error())   : 1
   Expected (QKeychain::NoError): 0
   Loc: [/builddir/qtkeychain-qt6-0.15.0/autotest/basic.cpp(58)]
QDEBUG : BasicTest::test(2000) ""
FAIL!  : BasicTest::test(2000) Compared values are not the same
   Actual   (readJob.error())   : 1
   Expected (QKeychain::NoError): 0
   Loc: [/builddir/qtkeychain-qt6-0.15.0/autotest/basic.cpp(58)]
QDEBUG : BasicTest::test(3000) ""
FAIL!  : BasicTest::test(3000) Compared values are not the same
   Actual   (readJob.error())   : 1
   Expected (QKeychain::NoError): 0
   Loc: [/builddir/qtkeychain-qt6-0.15.0/autotest/basic.cpp(58)]
QDEBUG : BasicTest::test(10000) ""
FAIL!  : BasicTest::test(10000) Compared values are not the same
   Actual   (readJob.error())   : 1
   Expected (QKeychain::NoError): 0
   Loc: [/builddir/qtkeychain-qt6-0.15.0/autotest/basic.cpp(58)]
QDEBUG : BasicTest::test(18944) ""
FAIL!  : BasicTest::test(18944) Compared values are not the same
   Actual   (readJob.error())   : 1
   Expected (QKeychain::NoError): 0
   Loc: [/builddir/qtkeychain-qt6-0.15.0/autotest/basic.cpp(58)]
PASS   : BasicTest::cleanupTestCase()
Totals: 2 passed, 6 failed, 0 skipped, 0 blacklisted, 29916ms
********* Finished testing of BasicTest *********


0% tests passed, 1 tests failed out of 1

Total Test time (real) =  29.92 sec

The following tests FAILED:
	  1 - basic (Failed)
Errors while running CTest
FAILED: CMakeFiles/test.util 
cd /builddir/qtkeychain-qt6-0.15.0/build && /usr/libexec/xbps-src/bin/ctest --force-new-ctest-process
ninja: build stopped: subcommand failed.
=> ERROR: qtkeychain-qt6-0.15.0_1: do_check: '${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}' exited with 1
=> ERROR:   in do_check() at common/build-style/cmake.sh:129
```
The long time suggests the keyring is refusing to do its job (maybe it's a prompt to create the keyring, perhaps asking for a master password).

Re: [PR PATCH] [Merged]: owncloudclient: update to 5.3.2.

[classabbyamp]

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

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

owncloudclient: update to 5.3.2.
https://github.com/void-linux/void-packages/pull/54279

Description:
- **qtkeychain-qt6: update to 0.15.0.**
- **owncloudclient: update to 5.3.2.**

<!-- 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
-->