[PR PATCH] owncloudclient: update to 5.1.0.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] owncloudclient: update to 5.1.0.
@ 2023-11-02 17:24 tornaria
  2023-11-02 21:07 ` [PR PATCH] [Updated] " tornaria
                   ` (20 more replies)
  0 siblings, 21 replies; 22+ messages in thread
From: tornaria @ 2023-11-02 17:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 281a655c2a840be2a91bb763f282f17dd9596e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..ed187d434d552 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..0761766fadf44
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,18 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON"
+hostmakedepends="qt6-tools-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 050d2235ccb7f55ba70a57e28c46ad5c345990a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 +
 .../patches/use-kwallet-dbus-def.patch        | 15 +++++++
 srcpkgs/qtkeychain-qt6/template               | 39 +++++++++++++++++++
 5 files changed, 58 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index ed187d434d552..9c2cb6d10035e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..b358ca1a98429
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt5 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..368b8ca815f12
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,39 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON"
+hostmakedepends="pkg-config kwallet"
+makedepends="libsecret-devel qt6-tools-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-host-tools qt6-tools-devel"
+fi
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 5f4f1f25927018c9aa7ed285057eb3965cde10d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..9369b355a4b28 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 0c4030f3418052a8359fb0a267cea5ca8c930708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.1.0.

---
 .../patches/skip-root-test.patch              | 26 ++++---------------
 srcpkgs/owncloudclient/template               | 26 ++++++++-----------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..41c7e10632a61 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,29 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.0
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=c76dc9e1c0515c31534755aff440ddab9679b942bc9fef2ea4be7ec5a5e0e8c3
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.0.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
@ 2023-11-02 21:07 ` tornaria
  2023-11-03  1:52 ` tornaria
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-11-02 21:07 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From cf58513f7f90e4c41da7a75a99d3fbce6593469c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..ed187d434d552 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..f23c8a5c416dc
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,19 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 8e5a501de821644a35c228c30e1ec50621ba16f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 +
 .../patches/use-kwallet-dbus-def.patch        | 15 +++++++
 srcpkgs/qtkeychain-qt6/template               | 39 +++++++++++++++++++
 5 files changed, 58 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index ed187d434d552..9c2cb6d10035e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..b358ca1a98429
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt5 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..368b8ca815f12
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,39 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON"
+hostmakedepends="pkg-config kwallet"
+makedepends="libsecret-devel qt6-tools-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-host-tools qt6-tools-devel"
+fi
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 7c0345bfea28e7bf3462203d6bc8c25561d6bc6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..9369b355a4b28 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From a042095e313c766e2977c89296bb90a64130bc72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.1.0.

---
 .../patches/skip-root-test.patch              | 26 ++++---------------
 srcpkgs/owncloudclient/template               | 26 ++++++++-----------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..41c7e10632a61 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,29 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.0
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=c76dc9e1c0515c31534755aff440ddab9679b942bc9fef2ea4be7ec5a5e0e8c3
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.0.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
  2023-11-02 21:07 ` [PR PATCH] [Updated] " tornaria
@ 2023-11-03  1:52 ` tornaria
  2023-11-03 15:08 ` tornaria
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-11-03  1:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From cf58513f7f90e4c41da7a75a99d3fbce6593469c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..ed187d434d552 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..f23c8a5c416dc
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,19 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 77918979c1ce82d8d379e998262b336f546ed5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 35 +++++++++++++++++++
 6 files changed, 68 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index ed187d434d552..8782d2a8a464e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..cf41c38f63f22
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,35 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 7184b29e4fc4e8c4e5a8c9e8531fb1df9411597a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 0abd4f8e8a624362b9014c0ac5228d32d44825f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.1.0.

---
 .../patches/skip-root-test.patch              | 26 ++++---------------
 srcpkgs/owncloudclient/template               | 26 ++++++++-----------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..2808aaf74915b 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,29 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.0
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=c76dc9e1c0515c31534755aff440ddab9679b942bc9fef2ea4be7ec5a5e0e8c3
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.0.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
  2023-11-02 21:07 ` [PR PATCH] [Updated] " tornaria
  2023-11-03  1:52 ` tornaria
@ 2023-11-03 15:08 ` tornaria
  2023-11-03 16:19 ` tornaria
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-11-03 15:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 8b47ee140d140bc6a9511521675933d1df8c776c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..ed187d434d552 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..c89a8b12442f7
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 46c5e6145dd206b41c5f1e39a33d715dfaaac696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index ed187d434d552..8782d2a8a464e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2237,6 +2237,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..211566cfe649b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From c69739b3d47132107890a1d59ccab45fbd8ddca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From f7564115b0158fdb1c2a3f876acc51aae072b0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.1.0.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..38c152faec2f8 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.0
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=c76dc9e1c0515c31534755aff440ddab9679b942bc9fef2ea4be7ec5a5e0e8c3
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: owncloudclient: update to 5.1.0.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (2 preceding siblings ...)
  2023-11-03 15:08 ` tornaria
@ 2023-11-03 16:19 ` tornaria
  2023-11-10 12:08 ` [PR PATCH] [Updated] " tornaria
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-11-03 16:19 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/47025#issuecomment-1792739787

Comment:
I wonder if `-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins` and `-DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs` should be in `common/build-style/cmake.sh` just as `-DQT_HOST_PATH=/usr` and `-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/cmake` are.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.0.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (3 preceding siblings ...)
  2023-11-03 16:19 ` tornaria
@ 2023-11-10 12:08 ` tornaria
  2023-11-10 23:52 ` [PR PATCH] [Updated] owncloudclient: update to 5.1.1 tornaria
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-11-10 12:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 56f8a384281e61e62c375c2b317ec1ce94bc7d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 36ddac17b0257..bfd52eaad6dcb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3528,6 +3528,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..c89a8b12442f7
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 367dd79bf422d1848a39f5d9b01313a3925684e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index bfd52eaad6dcb..d6325df97f12d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..211566cfe649b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 5cb6bd4dcb5bbfe457bca08b4b9e7fbefeb787c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From c5afabc118611285e0e6a9255edcda2be6b18427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.1.1.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..0346cbbdd6077 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.1
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=60c83bf03e2b50553ca5871e12d0f58743d6ab63698008b699f0e43e245bfd18
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (4 preceding siblings ...)
  2023-11-10 12:08 ` [PR PATCH] [Updated] " tornaria
@ 2023-11-10 23:52 ` tornaria
  2023-11-11  3:58 ` tornaria
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-11-10 23:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From e612b8c8c3f79d1629cbced34bf861dac8443d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..b9ee9a24de288 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3528,6 +3528,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..c89a8b12442f7
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 6c25592a9534d51053bdb87d0e4f7bce02d38b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index b9ee9a24de288..acfb4dd146b2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..211566cfe649b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From c1f6eea1a264f43745cea2df357c710ff5ce7edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 6bab2c26794f800dd0f5fcfe60bc1ded76d95cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.1.1.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..0346cbbdd6077 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.1
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=60c83bf03e2b50553ca5871e12d0f58743d6ab63698008b699f0e43e245bfd18
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (5 preceding siblings ...)
  2023-11-10 23:52 ` [PR PATCH] [Updated] owncloudclient: update to 5.1.1 tornaria
@ 2023-11-11  3:58 ` tornaria
  2023-12-01 12:51 ` [PR PATCH] [Updated] owncloudclient: update to 5.1.2 tornaria
                   ` (13 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-11-11  3:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 2eef0e8a6deaab06fcf11501a4eb1b78b603784c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..b9ee9a24de288 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3528,6 +3528,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..c89a8b12442f7
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 8dce6dc3ee4ba479d2bf8bd24c425371b0a7df28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index b9ee9a24de288..acfb4dd146b2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..211566cfe649b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 1e1da282c014c0602a7f0b77a57f9832c1380e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From b7441c5e590a05fd5024f5f6ef1ba45460264aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.1.2.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..f0369c962b870 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.2
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=3eb02376e58c4e8c2852908c502825ea61771ef28722d0d47ba1a60bb4fa6ad2
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.2.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (6 preceding siblings ...)
  2023-11-11  3:58 ` tornaria
@ 2023-12-01 12:51 ` tornaria
  2023-12-01 12:52 ` tornaria
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-12-01 12:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From a48021e628b7b5c07073d1c9d6d39b541dd425b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 90018a5616f86..e898393c0935b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3527,6 +3527,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..c89a8b12442f7
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 92c51d7b0b2bb440cc5fb7dcc6584ce05f5d675a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index e898393c0935b..1f7e829e482a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,6 +2234,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..211566cfe649b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From d0f3b1ac196275da02a2d1a4f4f51c10ae628b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From ceebb985b1cd8f93da9558111cb1e68a680e1431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.0.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..f0369c962b870 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.1.2
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=3eb02376e58c4e8c2852908c502825ea61771ef28722d0d47ba1a60bb4fa6ad2
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.1.2.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (7 preceding siblings ...)
  2023-12-01 12:51 ` [PR PATCH] [Updated] owncloudclient: update to 5.1.2 tornaria
@ 2023-12-01 12:52 ` tornaria
  2023-12-22 17:49 ` [PR PATCH] [Updated] owncloudclient: update to 5.2.0 tornaria
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-12-01 12:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From a48021e628b7b5c07073d1c9d6d39b541dd425b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.0.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 90018a5616f86..e898393c0935b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3527,6 +3527,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so KDSingleApplication-1.0.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..c89a8b12442f7
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.0.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=c92355dc10f3ebd39363458458fb5bdd9662e080cf77d91f0437763c4d936520
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 92c51d7b0b2bb440cc5fb7dcc6584ce05f5d675a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.1

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index e898393c0935b..1f7e829e482a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,6 +2234,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..211566cfe649b
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From d0f3b1ac196275da02a2d1a4f4f51c10ae628b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From c2feb849746455edb3577d7da1a3c812d2a5d567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.0.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..3aa121e049c6d 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.2.0
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=4d08360282bbd1d810a566ab41d52afdb77a4dc7aad958946ef7808f60411ac6
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.2.0.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (8 preceding siblings ...)
  2023-12-01 12:52 ` tornaria
@ 2023-12-22 17:49 ` tornaria
  2024-01-04 13:50 ` tornaria
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2023-12-22 17:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 81f6e85e90784202a5c4eccc72858d618747291f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.1.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 972c52c8f3b81..88d74c9448f3b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3529,6 +3529,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so.1.1 KDSingleApplication-1.1.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..b85f869fde56a
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=31029fffa4873e2769c555668e8edaa6bd5721edbc445bff5e66cc6af3b9ed78
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 8db725d83fc686c49ecda568a8a93f25a1d2df2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.2

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index 88d74c9448f3b..1c039793fb542 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..a8f54bd3fbf43
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 618505990b1b7a02c26e25e12366c9a4c1842123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 1204c003d48dccf73fcc1556f16f14d7654c01ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.0.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..3aa121e049c6d 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.2.0
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=4d08360282bbd1d810a566ab41d52afdb77a4dc7aad958946ef7808f60411ac6
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.2.0.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (9 preceding siblings ...)
  2023-12-22 17:49 ` [PR PATCH] [Updated] owncloudclient: update to 5.2.0 tornaria
@ 2024-01-04 13:50 ` tornaria
  2024-01-31 19:31 ` [PR PATCH] [Updated] owncloudclient: update to 5.2.1 tornaria
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-01-04 13:50 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 66ef98448adc52dc7d4988b1c33d4b2e743ff366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.1.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index cc42af6682aad..60cd455c177b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3527,6 +3527,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so.1.1 KDSingleApplication-1.1.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..b85f869fde56a
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=31029fffa4873e2769c555668e8edaa6bd5721edbc445bff5e66cc6af3b9ed78
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 5899a2f19151f4e6b020e9db0539b71626d67957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.2

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index 60cd455c177b2..f46b425229015 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2233,6 +2233,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..a8f54bd3fbf43
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 1bd474731e1d5f853364a3bb4dad83a90ee91808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 68b4f353ea8d424a93a9b38b1c8713245e519b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.1.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..f94a9e6d2dc42 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.2.1
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=f73afffc08a1788abbb7e8e66a3a2c39f638d1584402b0d04594c3bb99035ef1
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (10 preceding siblings ...)
  2024-01-04 13:50 ` tornaria
@ 2024-01-31 19:31 ` tornaria
  2024-01-31 22:26 ` tornaria
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-01-31 19:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 6b018c4217065f11fa23d21f7f40a8d12469cddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.1.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 71f172740e5c6..42feec835d3e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3520,6 +3520,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so.1.1 KDSingleApplication-1.1.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..b85f869fde56a
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=31029fffa4873e2769c555668e8edaa6bd5721edbc445bff5e66cc6af3b9ed78
+
+post_install() {
+	vlicense LICENSE.txt
+}

From d23bd22884bc5acd805b1a68746fbb5b5bf37d47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.2

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index 42feec835d3e9..68082d80207ad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,6 +2226,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..a8f54bd3fbf43
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From a2d77f4b6337666eadddc6cdfa749180451bd897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 8b8e7febbbe9504e18a8a364a6b5306adec899c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.1.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..f94a9e6d2dc42 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.2.1
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=f73afffc08a1788abbb7e8e66a3a2c39f638d1584402b0d04594c3bb99035ef1
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (11 preceding siblings ...)
  2024-01-31 19:31 ` [PR PATCH] [Updated] owncloudclient: update to 5.2.1 tornaria
@ 2024-01-31 22:26 ` tornaria
  2024-01-31 22:28 ` tornaria
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-01-31 22:26 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/47025#issuecomment-1920088027

Comment:
Here:
```
--- a/src/sage/features/threejs.py
+++ b/src/sage/features/threejs.py
@@ -61,4 +61,4 @@ class Threejs(StaticFile):
 
 
 def all_features():
-    return [Threejs()]
+    return []
```

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (12 preceding siblings ...)
  2024-01-31 22:26 ` tornaria
@ 2024-01-31 22:28 ` tornaria
  2024-02-02 17:58 ` [PR PATCH] [Updated] " tornaria
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-01-31 22:28 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/47025#issuecomment-1920088027

Comment:
Here:
```
--- a/src/sage/features/threejs.py
+++ b/src/sage/features/threejs.py
@@ -61,4 +61,4 @@ class Threejs(StaticFile):
 
 
 def all_features():
-    return [Threejs()]
+    return []
```

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (13 preceding siblings ...)
  2024-01-31 22:28 ` tornaria
@ 2024-02-02 17:58 ` tornaria
  2024-03-26 13:49 ` tornaria
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-02-02 17:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 01c2ad1e7373f7f83de848709f00041d6300d8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.1.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 71f172740e5c6..42feec835d3e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3520,6 +3520,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so.1.1 KDSingleApplication-1.1.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 0000000000000..b85f869fde56a
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=31029fffa4873e2769c555668e8edaa6bd5721edbc445bff5e66cc6af3b9ed78
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 16ed3b7484175b2efdd484e3728060123d879484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.2

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index 42feec835d3e9..68082d80207ad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,6 +2226,7 @@ libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 0000000000000..189f5693ff61e
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 0000000000000..f3cdf6594ae99
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 0000000000000..8f24b3dd686c0
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 0000000000000..44368a4d89190
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 0000000000000..a8f54bd3fbf43
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 6f6e4b0d4ac9c23346b23454f9ba80e6af001cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e4..7af38bf8cdc26 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 253c036a8f7956245f03296c4f35ef9051b1d142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.1.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd470..aa3270a0bf19f 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa..cec890edfb1cb 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.2.1
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-plugin-tls-openssl qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=f73afffc08a1788abbb7e8e66a3a2c39f638d1584402b0d04594c3bb99035ef1
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (14 preceding siblings ...)
  2024-02-02 17:58 ` [PR PATCH] [Updated] " tornaria
@ 2024-03-26 13:49 ` tornaria
  2024-04-03 13:10 ` [PR REVIEW] " ahesford
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-03-26 13:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From a4d99029b68157044b137fee777b65f250b6392e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.1.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index a60c03a1473078..f78d3032e515f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so.1.1 KDSingleApplication-1.1.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 00000000000000..b85f869fde56ac
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=31029fffa4873e2769c555668e8edaa6bd5721edbc445bff5e66cc6af3b9ed78
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 1f4c7bd5cdb541e58224a38b49ae2b674710dfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.2

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index f78d3032e515f8..a6e23814960439 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2234,6 +2234,7 @@ libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqca-qt6.so.2 qca-qt6-2.3.8_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libphonon4qt6.so.4 phonon-4.12.0_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 00000000000000..189f5693ff61eb
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 00000000000000..f3cdf6594ae990
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 00000000000000..8f24b3dd686c0c
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 00000000000000..44368a4d891902
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 00000000000000..a8f54bd3fbf437
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-tools-devel pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From 723d313cbac2c58c618decd1128f39fe5e1f2107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e41..7af38bf8cdc269 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From d6cc0561ecf3beb529534b06571433baefb905a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.1.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd4705..aa3270a0bf19fe 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa0..cec890edfb1cb7 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.2.1
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-tools-devel"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-plugin-tls-openssl qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=f73afffc08a1788abbb7e8e66a3a2c39f638d1584402b0d04594c3bb99035ef1
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (16 preceding siblings ...)
  2024-04-03 13:10 ` [PR REVIEW] " ahesford
@ 2024-04-03 13:10 ` ahesford
  2024-04-03 22:54 ` [PR PATCH] [Updated] " tornaria
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ahesford @ 2024-04-03 13:10 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/47025#discussion_r1549709138

Comment:
Please reconcile with b0a4ed8d2158

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (15 preceding siblings ...)
  2024-03-26 13:49 ` tornaria
@ 2024-04-03 13:10 ` ahesford
  2024-04-03 13:10 ` ahesford
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ahesford @ 2024-04-03 13:10 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/47025#discussion_r1549708062

Comment:
Please reconcile with b0a4ed8d2158

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (17 preceding siblings ...)
  2024-04-03 13:10 ` ahesford
@ 2024-04-03 22:54 ` tornaria
  2024-04-03 23:03 ` tornaria
  2024-04-05 11:23 ` [PR PATCH] [Merged]: " ahesford
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-04-03 22:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages owncloud
https://github.com/void-linux/void-packages/pull/47025

owncloudclient: update to 5.2.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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

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

From 0b4f17ae35891995cf1276f9152291c1ae673080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:23:53 -0300
Subject: [PATCH 1/4] New package: KDSingleApplication-1.1.0

---
 common/shlibs                        |  1 +
 srcpkgs/KDSingleApplication/template | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/KDSingleApplication/template

diff --git a/common/shlibs b/common/shlibs
index 041ca865b19f4c..760a012b6bbb15 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3533,6 +3533,7 @@ libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
+libkdsingleapplication-qt6.so.1.1 KDSingleApplication-1.1.0_1
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
diff --git a/srcpkgs/KDSingleApplication/template b/srcpkgs/KDSingleApplication/template
new file mode 100644
index 00000000000000..5ce04e71ad3a81
--- /dev/null
+++ b/srcpkgs/KDSingleApplication/template
@@ -0,0 +1,20 @@
+# Template file for 'KDSingleApplication'
+pkgname=KDSingleApplication
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DKDSingleApplication_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-base"
+makedepends="qt6-base-devel"
+short_desc="KDAB's helper class for single-instance policy applications"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/KDAB/KDSingleApplication"
+changelog="https://github.com/KDAB/KDSingleApplication/releases"
+distfiles="https://github.com/KDAB/KDSingleApplication/releases/download/v${version}/kdsingleapplication-${version}.tar.gz"
+checksum=31029fffa4873e2769c555668e8edaa6bd5721edbc445bff5e66cc6af3b9ed78
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 103a41cd65fe98e973c8fa7877f0e6c2306901e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:25:14 -0300
Subject: [PATCH 2/4] New package: qtkeychain-qt6-0.14.2

---
 common/shlibs                                 |  1 +
 srcpkgs/qtkeychain-qt6-devel                  |  1 +
 srcpkgs/qtkeychain-qt6/files/README.voidlinux |  2 ++
 .../patches/fix-cross-qt6.patch               | 14 ++++++++
 .../patches/use-kwallet-dbus-def.patch        | 15 ++++++++
 srcpkgs/qtkeychain-qt6/template               | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 120000 srcpkgs/qtkeychain-qt6-devel
 create mode 100644 srcpkgs/qtkeychain-qt6/files/README.voidlinux
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
 create mode 100644 srcpkgs/qtkeychain-qt6/template

diff --git a/common/shlibs b/common/shlibs
index 760a012b6bbb15..aa9b771de29f86 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2235,6 +2235,7 @@ libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqca-qt6.so.2 qca-qt6-2.3.8_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
+libqt6keychain.so.1 qtkeychain-qt6-0.14.1_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libphonon4qt6.so.4 phonon-4.12.0_1
diff --git a/srcpkgs/qtkeychain-qt6-devel b/srcpkgs/qtkeychain-qt6-devel
new file mode 120000
index 00000000000000..189f5693ff61eb
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6-devel
@@ -0,0 +1 @@
+qtkeychain-qt6
\ No newline at end of file
diff --git a/srcpkgs/qtkeychain-qt6/files/README.voidlinux b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
new file mode 100644
index 00000000000000..f3cdf6594ae990
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/files/README.voidlinux
@@ -0,0 +1,2 @@
+To actually use qtkeychain-qt6 you need to either have kwallet or
+gnome-keyring installed.
diff --git a/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
new file mode 100644
index 00000000000000..8f24b3dd686c0c
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/fix-cross-qt6.patch
@@ -0,0 +1,14 @@
+Cross build with Qt6 is broken without this, since host tools are not
+found (tries to use binaries from target dir instead)
+
+--- a/CMakeLists.txt	2023-06-01 08:38:35.000000000 -0300
++++ b/CMakeLists.txt	2023-11-02 22:41:50.717285646 -0300
+@@ -10,6 +10,8 @@
+ 
+ include(FindPkgConfig)
+ 
++find_package(Qt6 COMPONENTS Core REQUIRED)
++
+ ###
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
diff --git a/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
new file mode 100644
index 00000000000000..44368a4d891902
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/patches/use-kwallet-dbus-def.patch
@@ -0,0 +1,15 @@
+Use kwallet interface definition from the kwallet package,
+instead of using the out-of-date provided in qtkeychain package
+see https://github.com/frankosterfeld/qtkeychain/issues/172
+
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+@@ -169,7 +169,7 @@
+ 
+     add_definitions(-DKEYCHAIN_DBUS=1)
+     list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
+-    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
++    qt_add_dbus_interface(qtkeychain_SOURCES /usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml kwallet_interface KWalletInterface)
+     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
+ endif()
+ 
diff --git a/srcpkgs/qtkeychain-qt6/template b/srcpkgs/qtkeychain-qt6/template
new file mode 100644
index 00000000000000..66dfc6836ac346
--- /dev/null
+++ b/srcpkgs/qtkeychain-qt6/template
@@ -0,0 +1,36 @@
+# Template file for 'qtkeychain-qt6'
+pkgname=qtkeychain-qt6
+version=0.14.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_WITH_QT6=ON
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs"
+hostmakedepends="qt6-base qt6-tools pkg-config kwallet"
+makedepends="qt6-base-devel libsecret-devel"
+short_desc="Platform-independent Qt6 API for storing passwords securely"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-2-Clause"
+homepage="https://github.com/frankosterfeld/qtkeychain"
+distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/${version}.tar.gz"
+checksum=cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
+
+post_patch() {
+	# ensure it's not used (see dedicated patch)
+	rm org.kde.KWallet.xml
+}
+
+post_install() {
+	vlicense COPYING
+	vdoc "${FILESDIR}/README.voidlinux"
+}
+
+qtkeychain-qt6-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/*.so
+		vmove usr/lib/qt6/mkspecs
+	}
+}

From c2ea77a0cb254a322e55cc96a392c7194716eec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 18:26:37 -0300
Subject: [PATCH 3/4] libre-graph-api-cpp-qt-client: rebuild with qt6.

---
 srcpkgs/libre-graph-api-cpp-qt-client/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libre-graph-api-cpp-qt-client/template b/srcpkgs/libre-graph-api-cpp-qt-client/template
index 735e0190a68e41..50c6d61da9f4c3 100644
--- a/srcpkgs/libre-graph-api-cpp-qt-client/template
+++ b/srcpkgs/libre-graph-api-cpp-qt-client/template
@@ -1,11 +1,11 @@
 # Template file for 'libre-graph-api-cpp-qt-client'
 pkgname=libre-graph-api-cpp-qt-client
 version=1.0.4
-revision=1
+revision=2
 build_wrksrc=client
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+hostmakedepends="qt6-base"
+makedepends="qt6-base-devel"
 short_desc="Libre Graph API for owncloudclient"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="Apache-2.0"

From 36948d5740532414f3674b7a93febf47ac7a4dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 8 Oct 2023 19:37:41 -0300
Subject: [PATCH 4/4] owncloudclient: update to 5.2.1.

---
 .../patches/skip-root-test.patch              | 26 ++++-------------
 srcpkgs/owncloudclient/template               | 29 +++++++++----------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch
index 50aa32e2cd4705..aa3270a0bf19fe 100644
--- a/srcpkgs/owncloudclient/patches/skip-root-test.patch
+++ b/srcpkgs/owncloudclient/patches/skip-root-test.patch
@@ -1,35 +1,19 @@
 Hardcode `getuid()` as `0` in tests, since inside xbps-src the
 filesystem is not restricted.
 
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,10 +150,10 @@ private slots:
-     void testMoveFailsInAConflict() {
- #ifdef Q_OS_WIN
-         QSKIP("Not run on windows because permission on directory does not do what is expected");
- #else
--        if (getuid() == 0) {
-+        if (0 == 0) {
-             QSKIP("The permissions have no effect on the root user");
-         }
- #endif
-         // Test for https://github.com/owncloud/client/issues/7015
-         // We want to test the case in which the renaming of the original to the conflict file succeeds,
 diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
 index 8fc2cc2627..47213ed6b9 100644
 --- a/test/testfolderman.cpp
 +++ b/test/testfolderman.cpp
-@@ -102,11 +102,11 @@ private slots:
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull());
-         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull());
+@@ -109,11 +109,11 @@ private slots:
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1/subfolder")).isNull());
+         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link2/free/subfolder")).isNull());
  
 -        if (getuid() != 0) {
 +        if (0 != 0) {
              // Should not have the rights
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-             QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/")).isNull());
+             QVERIFY(!folderman->checkPathValidityForNewFolder(QStringLiteral("/usr/bin/somefolder")).isNull());
          }
  #endif
  
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 8908d6119a1fa0..d862be15ea63bf 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,33 +1,30 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=4.2.0
+version=5.2.1
 revision=1
 build_style=cmake
-configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
- kcoreaddons"
-makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel kio-devel
- qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
- qt5-plugin-sqlite libre-graph-api-cpp-qt-client libcloudproviders-devel"
-depends="qt5-plugin-sqlite qt5-svg"
+configure_args="-Wno-dev -DWITH_AUTO_UPDATER=OFF
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
+hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools"
+makedepends="qt6-base-devel qtkeychain-qt6-devel libre-graph-api-cpp-qt-client
+ KDSingleApplication"
+depends="qt6-plugin-sqlite qt6-plugin-tls-openssl qt6-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 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/.rc/-rc}.tar.gz"
-checksum=e31402a922c63dd94975cb3d8b0a0952374891024daf8e08ce4442cfba0729b1
-subpackages="owncloudclient-kde5 owncloudclient-devel"
+distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
+checksum=f73afffc08a1788abbb7e8e66a3a2c39f638d1584402b0d04594c3bb99035ef1
 
 owncloudclient-kde5_package() {
+	# kde5 integration has been moved to:
+	# https://github.com/owncloud/client-desktop-shell-integration-dolphin
+	build_style=meta
 	short_desc+=" - KDE 5 integration"
 	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/lib/*dolphin*"
-		vmove "usr/lib/qt5/plugins/*dolphin*"
-		vmove "usr/lib/qt5/plugins/kf5"
-	}
+	short_desc+=" (transitional dummy package)"
 }
 
 owncloudclient-devel_package() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (18 preceding siblings ...)
  2024-04-03 22:54 ` [PR PATCH] [Updated] " tornaria
@ 2024-04-03 23:03 ` tornaria
  2024-04-05 11:23 ` [PR PATCH] [Merged]: " ahesford
  20 siblings, 0 replies; 22+ messages in thread
From: tornaria @ 2024-04-03 23:03 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/47025#issuecomment-2035760269

Comment:
@ahesford it makes a lot of sense, sorry I missed that. I did it in the four templates. I tested locally the cross-build on aarch64 to make sure I got the `hostmakedepends` right (sometimes `qt6-base` suffices, other times `qt6-tools` is also necessary).

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Merged]: owncloudclient: update to 5.2.1.
  2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
                   ` (19 preceding siblings ...)
  2024-04-03 23:03 ` tornaria
@ 2024-04-05 11:23 ` ahesford
  20 siblings, 0 replies; 22+ messages in thread
From: ahesford @ 2024-04-05 11:23 UTC (permalink / raw)
  To: ml

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

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

owncloudclient: update to 5.2.1.
https://github.com/void-linux/void-packages/pull/47025

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

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

I've been using 5.0.0 for a while, and now updated to 5.1.0.

Note that kde integration (#45352) has been removed.
There is an external project: https://github.com/owncloud/client-desktop-shell-integration-dolphin but I don't use kde and I wouldn't be able to test at all.

It was necessary to build `qtkeychain-qt6` which I copied with obvious changes from `qtkeychain-qt5`. Should this new pkg keep @yopito as maintainer?

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


^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2024-04-05 11:23 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-02 17:24 [PR PATCH] owncloudclient: update to 5.1.0 tornaria
2023-11-02 21:07 ` [PR PATCH] [Updated] " tornaria
2023-11-03  1:52 ` tornaria
2023-11-03 15:08 ` tornaria
2023-11-03 16:19 ` tornaria
2023-11-10 12:08 ` [PR PATCH] [Updated] " tornaria
2023-11-10 23:52 ` [PR PATCH] [Updated] owncloudclient: update to 5.1.1 tornaria
2023-11-11  3:58 ` tornaria
2023-12-01 12:51 ` [PR PATCH] [Updated] owncloudclient: update to 5.1.2 tornaria
2023-12-01 12:52 ` tornaria
2023-12-22 17:49 ` [PR PATCH] [Updated] owncloudclient: update to 5.2.0 tornaria
2024-01-04 13:50 ` tornaria
2024-01-31 19:31 ` [PR PATCH] [Updated] owncloudclient: update to 5.2.1 tornaria
2024-01-31 22:26 ` tornaria
2024-01-31 22:28 ` tornaria
2024-02-02 17:58 ` [PR PATCH] [Updated] " tornaria
2024-03-26 13:49 ` tornaria
2024-04-03 13:10 ` [PR REVIEW] " ahesford
2024-04-03 13:10 ` ahesford
2024-04-03 22:54 ` [PR PATCH] [Updated] " tornaria
2024-04-03 23:03 ` tornaria
2024-04-05 11:23 ` [PR PATCH] [Merged]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).