From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] owncloudclient: update to 2.11.1.
Date: Sat, 29 Oct 2022 14:50:28 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40219@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages owncloudclient
https://github.com/void-linux/void-packages/pull/40219
owncloudclient: update to 2.11.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/40219.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-owncloudclient-40219.patch --]
[-- Type: text/x-diff, Size: 8179 bytes --]
From 769465e1c12476432b71f645536b06453145d809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 29 Oct 2022 09:28:30 -0300
Subject: [PATCH] owncloudclient: update to 2.11.1.
---
...a7e7cb19367d708e21f9ef881afecffe35a3.patch | 44 ----------
.../patches/nodiscard-first.patch | 83 -------------------
srcpkgs/owncloudclient/template | 4 +-
3 files changed, 2 insertions(+), 129 deletions(-)
delete mode 100644 srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch
delete mode 100644 srcpkgs/owncloudclient/patches/nodiscard-first.patch
diff --git a/srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch b/srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch
deleted file mode 100644
index dab71a91e7c9..000000000000
--- a/srcpkgs/owncloudclient/patches/d987a7e7cb19367d708e21f9ef881afecffe35a3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d987a7e7cb19367d708e21f9ef881afecffe35a3 Mon Sep 17 00:00:00 2001
-From: Hannah von Reth <hannah.vonreth@owncloud.com>
-Date: Wed, 29 Sep 2021 13:36:26 +0200
-Subject: [PATCH] Fix unit test for the root user
-
----
- test/testdownload.cpp | 4 ++++
- test/testfolderman.cpp | 8 +++++---
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/test/testdownload.cpp b/test/testdownload.cpp
-index b37cb807da..4af30ae72e 100644
---- a/test/testdownload.cpp
-+++ b/test/testdownload.cpp
-@@ -150,6 +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) {
-+ 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,9 +102,11 @@ 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());
-+ if (getuid() != 0) {
-+ // Should not have the rights
-+ QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull());
-+ QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull());
-+ }
- #endif
-
- #ifdef Q_OS_WIN // drive-letter tests
diff --git a/srcpkgs/owncloudclient/patches/nodiscard-first.patch b/srcpkgs/owncloudclient/patches/nodiscard-first.patch
deleted file mode 100644
index 472198795bba..000000000000
--- a/srcpkgs/owncloudclient/patches/nodiscard-first.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: client-2.10.1/src/common/asserts.h
-===================================================================
---- client-2.10.1.orig/src/common/asserts.h
-+++ client-2.10.1/src/common/asserts.h
-@@ -44,7 +44,7 @@
- } else { \
- }
-
--inline OC_REQUIRED_RESULT bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
-+OC_REQUIRED_RESULT inline bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info)
- {
- if (Q_UNLIKELY(!condition)) {
- OC_ASSERT_MSG("ENSURE: \"%s\" in file %s, line %d %s", cond, file, line, info);
-Index: client-2.10.1/src/common/vfs.h
-===================================================================
---- client-2.10.1.orig/src/common/vfs.h
-+++ client-2.10.1/src/common/vfs.h
-@@ -162,17 +162,17 @@ public:
- virtual bool isHydrating() const = 0;
-
- /// Create a new dehydrated placeholder. Called from PropagateDownload.
-- virtual OC_REQUIRED_RESULT Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
-+ OC_REQUIRED_RESULT virtual Result<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
-
- /** Discovery hook: even unchanged files may need UPDATE_METADATA.
- *
- * For instance cfapi vfs wants local hydrated non-placeholder files to
- * become hydrated placeholder files.
- */
-- virtual OC_REQUIRED_RESULT bool needsMetadataUpdate(const SyncFileItem &item) = 0;
-+ OC_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem &item) = 0;
-
- /// Determine whether the file at the given absolute path is a dehydrated placeholder.
-- virtual OC_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString &filePath) = 0;
-+ OC_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString &filePath) = 0;
-
- /** Similar to isDehydratedPlaceholder() but used from sync discovery.
- *
-@@ -181,7 +181,7 @@ public:
- *
- * Returning true means that type was fully determined.
- */
-- virtual OC_REQUIRED_RESULT bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
-+ OC_REQUIRED_RESULT virtual bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0;
-
- /** Sets the pin state for the item at a path.
- *
-@@ -192,7 +192,7 @@ public:
- *
- * relFilePath is relative to the sync folder. Can be "" for root folder.
- */
-- virtual OC_REQUIRED_RESULT bool setPinState(const QString &relFilePath, PinState state) = 0;
-+ OC_REQUIRED_RESULT virtual bool setPinState(const QString &relFilePath, PinState state) = 0;
-
- /** Returns the pin state of an item at a path.
- *
-@@ -203,7 +203,7 @@ public:
- *
- * Returns none on retrieval error.
- */
-- virtual OC_REQUIRED_RESULT Optional<PinState> pinState(const QString &relFilePath) = 0;
-+ OC_REQUIRED_RESULT virtual Optional<PinState> pinState(const QString &relFilePath) = 0;
-
- /** Returns availability status of an item at a path.
- *
-@@ -212,7 +212,7 @@ public:
- *
- * folderPath is relative to the sync folder. Can be "" for root folder.
- */
-- virtual OC_REQUIRED_RESULT AvailabilityResult availability(const QString &folderPath) = 0;
-+ OC_REQUIRED_RESULT virtual AvailabilityResult availability(const QString &folderPath) = 0;
-
- public slots:
- /** Update in-sync state based on SyncFileStatusTracker signal.
-@@ -240,7 +240,7 @@ protected:
- * If the remote metadata changes, the local placeholder's metadata should possibly
- * change as well.
- */
-- virtual OC_REQUIRED_RESULT Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
-+ OC_REQUIRED_RESULT virtual Result<ConvertToPlaceholderResult, QString> updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0;
-
- /** Setup the plugin for the folder.
- *
diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 3772509dcdda..62f13373408c 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,6 +1,6 @@
# Template file for 'owncloudclient'
pkgname=owncloudclient
-version=2.10.1
+version=2.11.1
revision=1
wrksrc=client-${version}
build_style=cmake
@@ -17,7 +17,7 @@ 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}.tar.gz"
-checksum=cd79c46e0c13b606ec08527f9f5f35fe295d4655c12510aa6805ccb797119c49
+checksum=72e13d90e4d1c71bdf863a2387f36bcccbc5b410aac2d93144fe3567056ba599
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-tools-devel"
next reply other threads:[~2022-10-29 12:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-29 12:50 tornaria [this message]
2022-10-29 12:54 ` tornaria
2022-10-29 19:47 ` classabbyamp
2022-10-30 10:14 ` [PR PATCH] [Updated] " tornaria
2022-10-30 10:15 ` tornaria
2022-10-30 19:27 ` [PR PATCH] [Merged]: " classabbyamp
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40219@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).