Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package owncloud-client for openSUSE:Factory
checked in at 2022-05-20 17:51:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old)
and /work/SRC/openSUSE:Factory/.owncloud-client.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "owncloud-client"
Fri May 20 17:51:13 2022 rev:35 rq:978284 version:2.10.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes
2022-04-08 00:28:18.445925848 +0200
+++
/work/SRC/openSUSE:Factory/.owncloud-client.new.1538/owncloud-client.changes
2022-05-20 17:52:13.087307500 +0200
@@ -1,0 +2,5 @@
+Fri May 20 14:06:42 UTC 2022 - Klaas Freitag <[email protected]>
+
+- Add upstream patch fix-gcc12-build.patch to fix build with gcc12
+
+-------------------------------------------------------------------
New:
----
fix-gcc12-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ owncloud-client.spec ++++++
--- /var/tmp/diff_new_pack.rvNkVE/_old 2022-05-20 17:52:13.771308122 +0200
+++ /var/tmp/diff_new_pack.rvNkVE/_new 2022-05-20 17:52:13.775308126 +0200
@@ -33,6 +33,8 @@
# PATCH-FIX-UPSTREAM fix position of systray menu
https://github.com/owncloud/client/issues/5968
# for all except tumbleweed and ongoing, as the Qt bug is fixed in there.
Patch0: fix-systray-menu-pos.patch
+# PATCH-FIX-UPSTREAM fix compilation with gcc12
+Patch1: fix-gcc12-build.patch
%define cmake_args -DSYSCONF_INSTALL_DIR=%{_sysconfdir}
@@ -204,6 +206,7 @@
%if 0%{?suse_version} <= 1500
%patch0 -p1
%endif
+%patch1 -p1
%build
++++++ fix-gcc12-build.patch ++++++
diff --git a/src/common/asserts.h b/src/common/asserts.h
index 9f43c532a6d..5fa4b4da3e5 100644
--- a/src/common/asserts.h
+++ b/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);
diff --git a/src/common/vfs.h b/src/common/vfs.h
index 983c999106c..da04d7ed97d 100644
--- a/src/common/vfs.h
+++ b/src/common/vfs.h
@@ -162,17 +162,17 @@ class OCSYNC_EXPORT Vfs : public QObject
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 @@ class OCSYNC_EXPORT Vfs : public QObject
*
* 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 @@ class OCSYNC_EXPORT Vfs : public QObject
*
* 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 @@ class OCSYNC_EXPORT Vfs : public QObject
*
* 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 @@ class OCSYNC_EXPORT Vfs : public QObject
*
* 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 @@ public slots:
* 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.
*
