From 2181be1e879f52fe13b1b95859e531b26d1b49bf Mon Sep 17 00:00:00 2001 From: Nick Hahn Date: Wed, 21 Apr 2021 23:58:09 +0200 Subject: [PATCH] nextcloud-client: update to 3.2.0. --- .../nextcloud-client/patches/test-check_vio.patch | 15 --------------- .../patches/testfolderman-within-chroot.patch | 13 ++++++------- srcpkgs/nextcloud-client/template | 5 ++--- 3 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/nextcloud-client/patches/test-check_vio.patch diff --git a/srcpkgs/nextcloud-client/patches/test-check_vio.patch b/srcpkgs/nextcloud-client/patches/test-check_vio.patch deleted file mode 100644 index 82d78843b966..000000000000 --- a/srcpkgs/nextcloud-client/patches/test-check_vio.patch +++ /dev/null @@ -1,15 +0,0 @@ -fails if runned from within a github actions, so disable it. -NB: works fine on regular personnal xbps-src usage. - ---- test/csync/vio_tests/check_vio.cpp.ORIG 2020-12-22 10:54:32.000000000 +0100 -+++ test/csync/vio_tests/check_vio.cpp 2020-12-26 15:16:07.118993372 +0100 -@@ -122,9 +122,6 @@ - rc = _tmkdir(dir, (S_IWUSR|S_IXUSR)); - assert_int_equal(rc, 0); - -- dh = csync_vio_opendir(csync, CSYNC_TEST_DIR); -- assert_null(dh); -- assert_int_equal(errno, EACCES); - - _tchmod(dir, MKDIR_MASK); - c_free_locale_string(dir); diff --git a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch index b049701370ef..25af2585fdb2 100644 --- a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch +++ b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch @@ -1,15 +1,14 @@ is wrong if running within a user's chroot ---- test/testfolderman.cpp.ORIG 2020-09-24 14:51:48.000000000 +0200 -+++ test/testfolderman.cpp 2020-10-02 20:33:32.248359240 +0200 -@@ -119,10 +119,6 @@ - // Subfolder of links +--- test/testfolderman.cpp.ORIG 2021-04-21 23:33:49.296779423 +0200 ++++ test/testfolderman.cpp 2021-04-21 23:34:03.289770264 +0200 +@@ -122,9 +122,6 @@ private slots: QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull()); QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull()); -- + - // Should not have the rights - QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull()); - QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull()); #endif - - // Invalid paths + + #ifdef Q_OS_WIN // drive-letter tests diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index 2382d7d337f9..1905debb555e 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,6 +1,6 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client -version=3.1.2 +version=3.2.0 revision=2 wrksrc="desktop-${version}" build_style=cmake @@ -19,7 +19,7 @@ maintainer="yopito " license="GPL-2.0-or-later" homepage="https://nextcloud.com/clients/" distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" -checksum=2fb2c18f479be2a04cf999f037def705c4be0087816af727038f0c71cb2c6189 +checksum=da1195b31fec0970121c1567f3cdaf3b9083d46727277116a98e5cd27f57aa60 build_options="dolphin" desc_option_dolphin="Build KDE dolphin support" @@ -77,6 +77,5 @@ nextcloud-client-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/libnextcloudsync.so - vmove "usr/lib/nextcloud/*.so" } }