gentoo auto-resync : 22:07:2022 - 02:45:47

3 files changed, 97 insertions, 1 deletions

diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index fe82906ba664..8b5b1021b5f5 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,6 @@
+AUX owncloud-client-2.10.1.7389-gcc12.patch 4473 BLAKE2B 37f9cab6489618a2d6ae7d65e01a342b2996e7d4a1b6f534bffd8b12a309923c8ed9caec34448bf355f499f116831319d69dd0d8736d637fdce2fd54486f1465 SHA512 cc1fce953fd3cc25f9214701f172b34708668b993ae5678af9e8281d487e4bd67fdcb8937c51609bdb4343c1ee77677f58efed2f8dee8a34a4a16a40d9fdc330
 DIST ownCloud-2.10.0.6519.tar.xz 5791912 BLAKE2B 3cf02ef89a6af249ab8f9d1b0a4cc899fbb11f49bf47ffb0ce042442da984d8dbf49619cf3344cf1837f1f3437e70f6e6d302f4e4c67a7df5f547368be4252ba SHA512 ab1e8aebefa049a73c436325b3b6e1d03e9a74f93ab6e090adbc71ccdd1cf56297898f004b12312ebba82158f5c2e299d9d0b13c14e291b855dcf267bac490f2
 DIST ownCloud-2.10.1.7389.tar.xz 5598044 BLAKE2B 8558a8a7b7bd4b8a0685b703f0882d6b5619c4902217d40feb4cf5587555b9a85363c7f61834e4c85a84789142fca8c73910fce66544f491ec5968818c816605 SHA512 2a0893d48786b88f8210966a2b6b48f5bdada82818d4115e68ecc6c0c926ba62bc74df03c4ab35eb271aef2f3a43b36b1a6a115585efe3739fd4a6164f9c45a1
 EBUILD owncloud-client-2.10.0.6519.ebuild 1500 BLAKE2B b2c5646495e909e5598066e1fcdaf87a86b7e7ebf6bc35c0591f0c1ffbc995234ddee3fbe032f3dc8c583898071be8bcfa476c2ef258bb421a9db72c27d2076e SHA512 bd55ab513cfb309094dfdcba9308341ebd010b80ffe8ddcea45d7895cb34c10e26675ac00e3ced04075f9ef6f740d7bb439db0d5eaaae42863e1da65876cb1af
-EBUILD owncloud-client-2.10.1.7389.ebuild 1500 BLAKE2B b2c5646495e909e5598066e1fcdaf87a86b7e7ebf6bc35c0591f0c1ffbc995234ddee3fbe032f3dc8c583898071be8bcfa476c2ef258bb421a9db72c27d2076e SHA512 bd55ab513cfb309094dfdcba9308341ebd010b80ffe8ddcea45d7895cb34c10e26675ac00e3ced04075f9ef6f740d7bb439db0d5eaaae42863e1da65876cb1af
+EBUILD owncloud-client-2.10.1.7389.ebuild 1544 BLAKE2B 3ca7d0c1e11b19d3d592e90b69825aedbd9f5ea9d8053c9eae553eacd8148af7fb653010a0457ab12ea30894d0faa8144bd63209e4c5485e5626e086e603d059 SHA512 b6334f0cc9e4b0df712c2931f8bafa5f5f29ef55056cd2fc02e8d712b6dc53affefa31e5476684d623fde30cc5f41d93c5f2d3bc1b01f59bbb44e583a127c871
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch b/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
new file mode 100644
index 000000000000..31981415f887
--- /dev/null
+++ b/net-misc/owncloud-client/files/owncloud-client-2.10.1.7389-gcc12.patch
@@ -0,0 +1,93 @@
+From c1e3bb8457d77619a1c31217716789e76fd06500 Mon Sep 17 00:00:00 2001
+From: Hannah von Reth <hannah.vonreth@owncloud.com>
+Date: Fri, 20 May 2022 11:19:59 +0200
+Subject: [PATCH] Fix build with gcc12
+
+---
+ src/common/asserts.h |  2 +-
+ src/common/vfs.h     | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+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.
+      *
diff --git a/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
index e75c66fabf69..cff04f395855 100644
--- a/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
@@ -45,6 +45,8 @@ RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
+PATCHES=( "${FILESDIR}"/${P}-gcc12.patch )
+
 src_prepare() {
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die