commit: 1935ca60a2c444dc867f5a004e4f0a2fc25c9920 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Thu Mar 6 14:25:21 2025 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Thu Mar 6 14:36:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1935ca60
net-misc/megasync: adjust clang build patch based on upstream feedback https://github.com/meganz/MEGAsync/issues/1055 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> net-misc/megasync/files/megasync-5.8.0.2-clang.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/net-misc/megasync/files/megasync-5.8.0.2-clang.patch b/net-misc/megasync/files/megasync-5.8.0.2-clang.patch index 6ab8f59c3..51c984b5d 100644 --- a/net-misc/megasync/files/megasync-5.8.0.2-clang.patch +++ b/net-misc/megasync/files/megasync-5.8.0.2-clang.patch @@ -1,17 +1,14 @@ https://bugs.gentoo.org/950311 https://github.com/meganz/MEGAsync/issues/1055 -Fix build with clang by removing broken and unused constructor. +Fix build with clang by mark mutex as mutable. --- a/src/MEGASync/control/ProtectedQueue.h +++ b/src/MEGASync/control/ProtectedQueue.h -@@ -13,11 +13,6 @@ public: - ProtectedQueue(){} - virtual ~ProtectedQueue(){} +@@ -107,7 +107,7 @@ public: -- ProtectedQueue(const ProtectedQueue& other) -- { -- std::lock_guard<std::mutex> guard( other.mMutex ); -- mQueue = other.mQueue; -- } + private: + std::queue<T> mQueue; +- std::mutex mMutex; ++ mutable std::mutex mMutex; + }; - ProtectedQueue& operator= (ProtectedQueue& other) - { + #endif // PROTECTED_QUEUE
