From 2a916dffe942331d283f8ff2dd96b0ea4169a273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Fri, 21 Feb 2025 12:08:06 -0300 Subject: [PATCH] nextcloud-client: update to 3.15.3. --- .../patches/fix-test-as-root.patch | 35 ++++++++++++ srcpkgs/nextcloud-client/template | 54 +++++-------------- 2 files changed, 49 insertions(+), 40 deletions(-) create mode 100644 srcpkgs/nextcloud-client/patches/fix-test-as-root.patch diff --git a/srcpkgs/nextcloud-client/patches/fix-test-as-root.patch b/srcpkgs/nextcloud-client/patches/fix-test-as-root.patch new file mode 100644 index 00000000000000..704b07ecc2e8bd --- /dev/null +++ b/srcpkgs/nextcloud-client/patches/fix-test-as-root.patch @@ -0,0 +1,35 @@ +--- a/test/testlockfile.cpp ++++ b/test/testlockfile.cpp +@@ -766,7 +766,8 @@ + QCOMPARE(fakeFolder.currentRemoteState(), expectedState); + + const auto localFileLocked = QFileInfo{fakeFolder.localPath() + u"A/a1"}; +- QVERIFY(!localFileLocked.isWritable()); ++ if (getuid() != 0) ++ QVERIFY(!localFileLocked.isWritable()); + } + + void testLockFile_lockFile_detect_newly_uploaded() +--- a/test/testdownload.cpp ++++ b/test/testdownload.cpp +@@ -155,6 +155,8 @@ + } + + void testMoveFailsInAConflict() { ++ if (getuid() == 0) ++ QSKIP("Not run on root because permissions are not enforced"); + #ifdef Q_OS_WIN + QSKIP("Not run on windows because permission on directory does not do what is expected"); + #endif +--- a/test/testsyncvirtualfiles.cpp ++++ b/test/testsyncvirtualfiles.cpp +@@ -1979,7 +1979,8 @@ + QVERIFY(fileRecordLocked._lockstate._locked); + + const auto localFileLocked = QFileInfo{fakeFolder.localPath() + u"A/a1" + DVSUFFIX}; +- QVERIFY(!localFileLocked.isWritable()); ++ if (getuid() != 0) ++ QVERIFY(!localFileLocked.isWritable()); + } + }; + diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index bf9bb259f8d153..1a72a1a3e7e8c5 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,18 +1,16 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client -version=3.13.3 +version=3.15.3 revision=1 build_style=cmake -configure_args="-DBUILD_UPDATER=NO -DBUILD_WITH_WEBENGINE=OFF -Wno-dev" -hostmakedepends="pkg-config inkscape" -makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel - qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel - qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel karchive-devel - qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds - $(vopt_if dolphin 'extra-cmake-modules kio-devel') - $(vopt_if webengine 'qt5-webengine-devel')" -depends="qt5-graphicaleffects kguiaddons" -checkdepends="cmocka-devel" +configure_args="-Wno-dev -DBUILD_UPDATER=NO -DUNIT_TESTING=1 + $(vopt_if webengine '' -DBUILD_WITH_WEBENGINE=OFF) + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" +hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools inkscape" +makedepends="qt6-base-private-devel qt6-qt5compat-devel qt6-declarative-devel + qtkeychain-qt6-devel qt6-websockets-devel qt6-svg-devel + $(vopt_if webengine qt6-webengine-devel) + kf6-karchive-devel kf6-kguiaddons-devel kf6-kio-devel cmocka-devel" conf_files="/etc/Nextcloud/sync-exclude.lst" short_desc="NextCloud Desktop client" maintainer="Rodrigo Oliveira " @@ -20,38 +18,14 @@ license="GPL-2.0-or-later" homepage="https://nextcloud.com/clients/" changelog="https://github.com/nextcloud/desktop/releases" distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" -checksum=4f1b0ffae207a8ab29d10f9cb6d51e107263cf45d138234bd8be1554eb12661f +checksum=5a4b12604c84b8986f2aee7462bb9683fb01f4ae28ee9d6882068cb9cac45773 # https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549 -make_check=ci-skip -build_options="dolphin webengine" -desc_option_dolphin="Build KDE dolphin support" +build_options="webengine" desc_option_webengine="Build Qt5 WebEngine support" -build_options_default="dolphin" -if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then - if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then - build_options_default+=" webengine" - fi -fi - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools" - # provides desktoptojson - hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')" -fi - -subpackages="nextcloud-client-kwallet nextcloud-client-devel" -subpackages+=" $(vopt_if dolphin 'nextcloud-client-dolphin')" - -if [ "$XBPS_CHECK_PKGS" ]; then - configure_args+=" -DUNIT_TESTING=1" - # argp.h is used only by testing and is not a requirement. - # since unusable (linking fails), let's disable it instead - case "$XBPS_TARGET_MACHINE" in - #*-musl) export LDFLAGS=-largp;; - *-musl) configure_args+=" -DHAVE_ARGP_H=0";; - esac +if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then + build_options_default+=" webengine" fi nextcloud-client-kwallet_package() { @@ -76,7 +50,7 @@ nextcloud-client-dolphin_package() { depends="nextcloud-client>=${version}_${revision}" pkg_install() { vmove usr/lib/libnextclouddolphinpluginhelper.so - vmove usr/lib/qt5 + vmove usr/lib/qt6 } }