From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] owncloudclient: update to 5.2.1.
Date: Wed, 31 Jan 2024 20:31:02 +0100 [thread overview]
Message-ID: <20240131193102.BF63F29745@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47025@inbox.vuxu.org>
[-- 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() {
next prev parent reply other threads:[~2024-01-31 19:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` tornaria [this message]
2024-01-31 22:26 ` owncloudclient: update to 5.2.1 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240131193102.BF63F29745@inbox.vuxu.org \
--to=tornaria@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).