diff --git a/srcpkgs/owncloudclient/patches/skip-root-test.patch b/srcpkgs/owncloudclient/patches/skip-root-test.patch index 50aa32e2cd4..aa3270a0bf1 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 8908d6119a1..d862be15ea6 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 " 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() {